Merge pull request #148 from kazuki43zoo/polishing-test-on-autoconfigure-test

Polishing test for mybatis-spring-boot-test-autoconfigure

Author: kazuki43zoo

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 {
 
 }

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

@@ -0,0 +1,33 @@
+/**
+ *    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 org.mybatis.spring.boot.test.autoconfigure;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Example component that annotated {@link Service @Service} used with {@link MybatisTest} tests.
+ *
+ * @author Kazuki Shimizu
+ * @since 1.2.1
+ */
+@Service
+public class ExampleService {
+
+  public String getMessage() {
+    return "Goodbye!";
+  }
+
+}

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

@@ -0,0 +1,58 @@
+/**
+ *    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 org.mybatis.spring.boot.test.autoconfigure;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration test with custom filter for {@link MybatisTest}.
+ *
+ * @author Kazuki Shimizu
+ * @since 1.2.1
+ */
+@RunWith(SpringRunner.class)
+@MybatisTest(includeFilters = @ComponentScan.Filter(Component.class), excludeFilters = @ComponentScan.Filter(Service.class))
+@TestPropertySource(properties = {
+  "mybatis.type-aliases-package=org.mybatis.spring.boot.test.autoconfigure"
+})
+public class MybatisTestCustomFilterIntegrationTest {
+
+  @Autowired
+  private ExampleComponent component;
+
+  @Autowired(required = false)
+  private ExampleService service;
+
+  @Test
+  public void testIncludeFilter() {
+    assertThat(component.getMessage()).isEqualTo("Hello!");
+  }
+
+  @Test
+  public void testExcludeFilter() {
+    assertThat(service).isNull();
+  }
+
+}

mybatis-spring-boot-test-autoconfigure/src/test/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTestIntegrationTests.java renamed to mybatis-spring-boot-test-autoconfigure/src/test/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTestIntegrationTest.java

@@ -1,19 +1,18 @@
 /**
- * Copyright 2015-2017 the original author or authors.
- * <p>
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
+ *    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 org.mybatis.spring.boot.test.autoconfigure;
 
 import java.util.HashMap;
@@ -27,9 +26,15 @@
 
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.context.ApplicationContext;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.interceptor.TransactionInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -43,10 +48,10 @@
 @MybatisTest
 @TestPropertySource(properties = {
   "mybatis.type-aliases-package=org.mybatis.spring.boot.test.autoconfigure",
-  "mybatis.mapper-locations=org/mybatis/spring/boot/test/autoconfigure/*.xml",
+  "logging.level.org.springframework.jdbc=debug",
   "spring.datasource.schema=classpath:org/mybatis/spring/boot/test/autoconfigure/schema.sql"
 })
-public class MybatisTestIntegrationTests {
+public class MybatisTestIntegrationTest {
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -60,16 +65,6 @@ public class MybatisTestIntegrationTests {
   @Autowired
   private ApplicationContext applicationContext;
 
-  @Test
-  public void sqlSessionIsNotNullTest() {
-    assertThat(sqlSession).isNotNull();
-  }
-
-  @Test
-  public void mapperIsNotNullTest() {
-    assertThat(sampleMapper).isNotNull();
-  }
-
   @Test
   public void testSqlSession() {
     Map<String, Object> parameters = new HashMap<String, Object>();
@@ -87,11 +82,23 @@ public void testMapper() {
     parameters.put("id", 1);
     parameters.put("name", "wonwoo");
     sqlSession.insert("saveSample", parameters);
-    Sample sample = sampleMapper.findByname("wonwoo");
+    Sample sample = sampleMapper.findByName("wonwoo");
     assertThat(sample.getId()).isNotNull().isEqualTo(1L);
     assertThat(sample.getName()).isNotNull().isEqualTo("wonwoo");
   }
 
+  @Test
+  public void testAutoConfigureComponents() {
+    // @AutoConfigureMybatis
+    this.applicationContext.getBean(JdbcTemplate.class);
+    this.applicationContext.getBean(NamedParameterJdbcTemplate.class);
+    this.applicationContext.getBean(DataSourceTransactionManager.class);
+    this.applicationContext.getBean(TransactionInterceptor.class);
+    // @AutoConfigureCache
+    this.applicationContext.getBean(CacheManager.class);
+    this.applicationContext.getBean(CacheInterceptor.class);
+  }
+
   @Test
   public void didNotInjectExampleComponent() {
     this.thrown.expect(NoSuchBeanDefinitionException.class);

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

@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.mybatis.spring.boot.test.autoconfigure;
 
 /**

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

@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.mybatis.spring.boot.test.autoconfigure;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -27,6 +26,6 @@
 @Mapper
 public interface SampleMapper {
 
-  Sample findByname(String name);
+  Sample findByName(String name);
 
 }

mybatis-spring-boot-test-autoconfigure/src/test/resources/org/mybatis/spring/boot/test/autoconfigure/SampleMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+       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.
+
+-->
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.mybatis.spring.boot.test.autoconfigure.SampleMapper">
+    <select id="findSample" resultType="Sample">
+        select * from sample where id = #{id}
+    </select>
+
+    <select id="findByName" resultType="Sample">
+        select * from sample where name = #{name}
+    </select>
+
+    <insert id="saveSample">
+        insert into sample values(#{id}, #{name})
+    </insert>
+</mapper>

mybatis-spring-boot-test-autoconfigure/src/test/resources/org/mybatis/spring/boot/test/autoconfigure/sample.xml

@@ -1 +1,17 @@
+--
+--    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.
+--
+
 create table sample (id int, name varchar);