Merge branch '1.2.x'

Author: kazuki43zoo

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/SampleMapperApplication.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/SampleMybatisApplication.java

@@ -22,15 +22,15 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleMapperApplication implements CommandLineRunner {
+public class SampleMybatisApplication implements CommandLineRunner {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SampleMapperApplication.class, args);
+		SpringApplication.run(SampleMybatisApplication.class, args);
 	}
 
 	final private CityMapper cityMapper;
 
-	public SampleMapperApplication(CityMapper cityMapper) {
+	public SampleMybatisApplication(CityMapper cityMapper) {
 		this.cityMapper = cityMapper;
 	}
 

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMapperTest.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/CityMapperTest.java

@@ -13,41 +13,36 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.mapper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import sample.mybatis.domain.City;
-import sample.mybatis.mapper.CityMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- *
+ * Tests for {@link CityMapper}.
  * @author wonwoo
  * @since 1.2.1
  */
 @RunWith(SpringRunner.class)
 @MybatisTest
-public class SampleMapperTest {
+public class CityMapperTest {
 
   @Autowired
   private CityMapper cityMapper;
 
-  @Test
-  public void mapperIsNotNullTest() {
-    assertThat(cityMapper).isNotNull();
-  }
-
   @Test
   public void findByStateTest() {
     City city = cityMapper.findByState("CA");
     assertThat(city.getName()).isEqualTo("San Francisco");
     assertThat(city.getState()).isEqualTo("CA");
     assertThat(city.getCountry()).isEqualTo("US");
   }
+
 }

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/MapperTestApplication.java

@@ -0,0 +1,32 @@
+/**
+ *    Copyright 2015-2017 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package sample.mybatis.mapper;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
+ * <p>
+ * This class has role for prevent to run the {@link sample.mybatis.SampleMybatisApplication}.
+ * For more detail information, please refer <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
+ *
+ * @author Kazuki Shimizu
+ * @since 1.2.1
+ */
+@SpringBootApplication
+public class MapperTestApplication {
+
+}

mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/SampleXmlApplication.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/SampleMybatisApplication.java

@@ -23,17 +23,17 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleXmlApplication implements CommandLineRunner {
+public class SampleMybatisApplication implements CommandLineRunner {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SampleXmlApplication.class, args);
+		SpringApplication.run(SampleMybatisApplication.class, args);
 	}
 
 	private final CityDao cityDao;
 
 	private final HotelMapper hotelMapper;
 
-	public SampleXmlApplication(CityDao cityDao, HotelMapper hotelMapper) {
+	public SampleMybatisApplication(CityDao cityDao, HotelMapper hotelMapper) {
 		this.cityDao = cityDao;
 		this.hotelMapper = hotelMapper;
 	}

mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/SampleSqlSessionTest.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/CityDaoTest.java

@@ -14,50 +14,37 @@
  *    limitations under the License.
  */
 
-package sample.mybatis;
+package sample.mybatis.dao;
 
-import org.apache.ibatis.session.SqlSession;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringRunner;
-import sample.mybatis.dao.CityDao;
 import sample.mybatis.domain.City;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
+ * Tests for {@link CityDao}.
  * @author wonwoo
  * @since 1.2.1
  */
 @RunWith(SpringRunner.class)
 @MybatisTest
-public class SampleSqlSessionTest {
+@Import(CityDao.class)
+public class CityDaoTest {
 
   @Autowired
-  private SqlSession sqlSession;
-
-  @Test
-  public void sqlSessionIsNotNullTest() {
-    assertThat(sqlSession).isNotNull();
-  }
+  private CityDao cityDao;
 
   @Test
   public void selectCityByIdTest() {
-    City city = sqlSession.selectOne("selectCityById", 1);
+    City city = cityDao.selectCityById(1);
     assertThat(city.getName()).isEqualTo("San Francisco");
     assertThat(city.getState()).isEqualTo("CA");
     assertThat(city.getCountry()).isEqualTo("US");
   }
 
-  @TestConfiguration
-  public static class Config {
-    @Bean
-    public CityDao cityDao(SqlSession sqlSession) {
-      return new CityDao(sqlSession);
-    }
-  }
 }

mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/DaoTestApplication.java

@@ -0,0 +1,32 @@
+/**
+ *    Copyright 2015-2017 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package sample.mybatis.dao;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
+ * <p>
+ * This class has role for prevent to run the {@link sample.mybatis.SampleMybatisApplication}.
+ * For more detail information, please refer <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
+ *
+ * @author Kazuki Shimizu
+ * @since 1.2.1
+ */
+@SpringBootApplication
+public class DaoTestApplication {
+
+}

mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/HotelMapperTest.java

@@ -0,0 +1,47 @@
+/**
+ *    Copyright 2015-2017 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package sample.mybatis.mapper;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.junit4.SpringRunner;
+import sample.mybatis.domain.Hotel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link HotelMapper}.
+ * @author wonwoo
+ * @since 1.2.1
+ */
+@RunWith(SpringRunner.class)
+@MybatisTest
+public class HotelMapperTest {
+
+  @Autowired
+  private HotelMapper hotelMapper;
+
+  @Test
+  public void selectByCityIdTest() {
+    Hotel hotel = hotelMapper.selectByCityId(1);
+    assertThat(hotel.getName()).isEqualTo("Conrad Treasury Place");
+    assertThat(hotel.getAddress()).isEqualTo("William & George Streets");
+    assertThat(hotel.getZip()).isEqualTo("4001");
+  }
+
+}

mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/MapperTestApplication.java

@@ -0,0 +1,32 @@
+/**
+ *    Copyright 2015-2017 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package sample.mybatis.mapper;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
+ * <p>
+ * This class has role for prevent to run the {@link sample.mybatis.SampleMybatisApplication}.
+ * For more detail information, please refer <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
+ *
+ * @author Kazuki Shimizu
+ * @since 1.2.1
+ */
+@SpringBootApplication
+public class MapperTestApplication {
+
+}

mybatis-spring-boot-test-autoconfigure/src/test/java/org/mybatis/spring/boot/test/autoconfigure/ExampleComponent.java

@@ -13,18 +13,21 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.mybatis.spring.boot.test.autoconfigure;
 
 import org.springframework.stereotype.Component;
 
 /**
- * Example component used with {@link MybatisTest} tests.
+ * Example component that annotated {@link Component @Component} used with {@link MybatisTest} tests.
  *
  * @author wonwoo
  * @since 1.2.1
  */
 @Component
 public class ExampleComponent {
 
+  public String getMessage() {
+    return "Hello!";
+  }
+
 }

mybatis-spring-boot-test-autoconfigure/src/test/java/org/mybatis/spring/boot/test/autoconfigure/ExampleMybatisApplication.java

@@ -13,10 +13,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.mybatis.spring.boot.test.autoconfigure;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 
 /**
  * Example {@link SpringBootApplication} used with {@link MybatisTest} tests.
@@ -25,6 +25,7 @@
  * @since 1.2.1
  */
 @SpringBootApplication
+@EnableCaching
 class ExampleMybatisApplication {
 
 }