Merge pull request #3363 from hazendaz/pom-cleanup

tests: Use assertDoesNotThrow to complete assertions where exceptions…

Author: hazendaz

src/test/java/org/apache/ibatis/builder/XmlMapperBuilderTest.java

@@ -19,6 +19,7 @@
 import static com.googlecode.catchexception.apis.BDDCatchException.when;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.BDDAssertions.then;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 import java.io.InputStream;
 import java.util.regex.Pattern;
@@ -36,14 +37,16 @@
 class XmlMapperBuilderTest {
 
   @Test
-  void shouldSuccessfullyLoadXMLMapperFile() throws Exception {
-    Configuration configuration = new Configuration();
-    String resource = "org/apache/ibatis/builder/AuthorMapper.xml";
-    try (InputStream inputStream = Resources.getResourceAsStream(resource)) {
-      XMLMapperBuilder builder = new XMLMapperBuilder(inputStream, configuration, resource,
-          configuration.getSqlFragments());
-      builder.parse();
-    }
+  void shouldSuccessfullyLoadXMLMapperFile() {
+    assertDoesNotThrow(() -> {
+      Configuration configuration = new Configuration();
+      String resource = "org/apache/ibatis/builder/AuthorMapper.xml";
+      try (InputStream inputStream = Resources.getResourceAsStream(resource)) {
+        XMLMapperBuilder builder = new XMLMapperBuilder(inputStream, configuration, resource,
+            configuration.getSqlFragments());
+        builder.parse();
+      }
+    });
   }
 
   @Test

src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java

@@ -15,6 +15,7 @@
  */
 package org.apache.ibatis.executor;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -452,29 +453,31 @@ void shouldMapConstructorResults() throws Exception {
   }
 
   @Test
-  void shouldClearDeferredLoads() throws Exception {
-
-    Executor executor = createExecutor(new JdbcTransaction(ds, null, false));
-    try {
-      MappedStatement selectBlog = ExecutorTestHelper.prepareComplexSelectBlogMappedStatement(config);
-      MappedStatement selectPosts = ExecutorTestHelper.prepareSelectPostsForBlogMappedStatement(config);
-      config.addMappedStatement(selectBlog);
-      config.addMappedStatement(selectPosts);
-      MappedStatement selectAuthor = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
-      MappedStatement insertAuthor = ExecutorTestHelper.prepareInsertAuthorMappedStatement(config);
-
-      // generate DeferredLoads
-      executor.query(selectPosts, 1, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
-
-      Author author = new Author(-1, "someone", "******", "[email protected]", null, Section.NEWS);
-      executor.update(insertAuthor, author);
-      executor.query(selectAuthor, -1, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
-      executor.flushStatements();
-      executor.rollback(true);
-    } finally {
-      executor.rollback(true);
-      executor.close(false);
-    }
+  void shouldClearDeferredLoads() {
+    assertDoesNotThrow(() -> {
+
+      Executor executor = createExecutor(new JdbcTransaction(ds, null, false));
+      try {
+        MappedStatement selectBlog = ExecutorTestHelper.prepareComplexSelectBlogMappedStatement(config);
+        MappedStatement selectPosts = ExecutorTestHelper.prepareSelectPostsForBlogMappedStatement(config);
+        config.addMappedStatement(selectBlog);
+        config.addMappedStatement(selectPosts);
+        MappedStatement selectAuthor = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
+        MappedStatement insertAuthor = ExecutorTestHelper.prepareInsertAuthorMappedStatement(config);
+
+        // generate DeferredLoads
+        executor.query(selectPosts, 1, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
+
+        Author author = new Author(-1, "someone", "******", "[email protected]", null, Section.NEWS);
+        executor.update(insertAuthor, author);
+        executor.query(selectAuthor, -1, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
+        executor.flushStatements();
+        executor.rollback(true);
+      } finally {
+        executor.rollback(true);
+        executor.close(false);
+      }
+    });
   }
 
   @Test

src/test/java/org/apache/ibatis/executor/ReuseExecutorTest.java

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.executor;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import org.apache.ibatis.transaction.Transaction;
 import org.junit.jupiter.api.Test;
 
@@ -26,8 +28,8 @@ void dummy() {
 
   @Override
   @Test
-  public void shouldFetchPostWithBlogWithCompositeKey() throws Exception {
-    super.shouldFetchPostWithBlogWithCompositeKey();
+  public void shouldFetchPostWithBlogWithCompositeKey() {
+    assertDoesNotThrow(super::shouldFetchPostWithBlogWithCompositeKey);
   }
 
   @Override

src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java

@@ -15,6 +15,7 @@
  */
 package org.apache.ibatis.jdbc;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -72,19 +73,23 @@ void shouldProperlyMaintainPoolOf3ActiveAnd2IdleConnections() throws Exception {
   }
 
   @Test
-  void shouldNotFailCallingToStringOverAnInvalidConnection() throws Exception {
-    PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
-    Connection c = ds.getConnection();
-    c.close();
-    c.toString();
+  void shouldNotFailCallingToStringOverAnInvalidConnection() {
+    assertDoesNotThrow(() -> {
+      PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
+      Connection c = ds.getConnection();
+      c.close();
+      c.toString();
+    });
   }
 
   @Test
-  void ShouldReturnRealConnection() throws Exception {
-    PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
-    Connection c = ds.getConnection();
-    PooledDataSource.unwrapConnection(c);
-    c.close();
+  void ShouldReturnRealConnection() {
+    assertDoesNotThrow(() -> {
+      PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
+      Connection c = ds.getConnection();
+      PooledDataSource.unwrapConnection(c);
+      c.close();
+    });
   }
 
 }

src/test/java/org/apache/ibatis/submitted/integer_enum/IntegerEnumTest.java

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.integer_enum;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import java.io.Reader;
 
 import org.apache.ibatis.BaseDataTest;
@@ -25,11 +27,13 @@
 class IntegerEnumTest extends BaseDataTest {
 
   @Test
-  void shouldParseMapWithIntegerJdbcType() throws Exception {
-    String resource = "org/apache/ibatis/submitted/integer_enum/MapperConfig.xml";
-    Reader reader = Resources.getResourceAsReader(resource);
-    SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
-    builder.build(reader);
+  void shouldParseMapWithIntegerJdbcType() {
+    assertDoesNotThrow(() -> {
+      String resource = "org/apache/ibatis/submitted/integer_enum/MapperConfig.xml";
+      Reader reader = Resources.getResourceAsReader(resource);
+      SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
+      builder.build(reader);
+    });
   }
 
 }

src/test/java/org/apache/ibatis/submitted/map_class_name_conflict/MapperNameTest.java

@@ -15,7 +15,8 @@
  */
 package org.apache.ibatis.submitted.map_class_name_conflict;
 
-import java.io.IOException;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import java.io.Reader;
 
 import org.apache.ibatis.io.Resources;
@@ -25,9 +26,11 @@
 class MapperNameTest {
 
   @Test
-  void initDatabase() throws IOException {
-    String resource = "org/apache/ibatis/submitted/map_class_name_conflict/ibatisConfig.xml";
-    Reader reader = Resources.getResourceAsReader(resource);
-    new SqlSessionFactoryBuilder().build(reader);
+  void initDatabase() {
+    assertDoesNotThrow(() -> {
+      String resource = "org/apache/ibatis/submitted/map_class_name_conflict/ibatisConfig.xml";
+      Reader reader = Resources.getResourceAsReader(resource);
+      new SqlSessionFactoryBuilder().build(reader);
+    });
   }
 }

src/test/java/org/apache/ibatis/submitted/refid_resolution/ExternalRefidResolutionTest.java

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.refid_resolution;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import java.io.Reader;
 
 import org.apache.ibatis.io.Resources;
@@ -27,12 +29,14 @@
  */
 class ExternalRefidResolutionTest {
   @Test
-  void externalRefAfterSelectKey() throws Exception {
-    String resource = "org/apache/ibatis/submitted/refid_resolution/ExternalMapperConfig.xml";
-    try (Reader reader = Resources.getResourceAsReader(resource)) {
-      SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
-      SqlSessionFactory sqlSessionFactory = builder.build(reader);
-      sqlSessionFactory.getConfiguration().getMappedStatementNames();
-    }
+  void externalRefAfterSelectKey() {
+    assertDoesNotThrow(() -> {
+      String resource = "org/apache/ibatis/submitted/refid_resolution/ExternalMapperConfig.xml";
+      try (Reader reader = Resources.getResourceAsReader(resource)) {
+        SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
+        SqlSessionFactory sqlSessionFactory = builder.build(reader);
+        sqlSessionFactory.getConfiguration().getMappedStatementNames();
+      }
+    });
   }
 }

src/test/java/org/apache/ibatis/submitted/serializecircular/SerializeCircularTest.java

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.serializecircular;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import java.io.Reader;
 
 import org.apache.ibatis.BaseDataTest;
@@ -27,32 +29,40 @@
 class SerializeCircularTest {
 
   @Test
-  void serializeAndDeserializeObjectsWithAggressiveLazyLoadingWithoutPreloadingAttribute() throws Exception {
-    try (SqlSession sqlSession = createSessionWithAggressiveLazyLoading()) {
-      testSerializeWithoutPreloadingAttribute(sqlSession);
-    }
+  void serializeAndDeserializeObjectsWithAggressiveLazyLoadingWithoutPreloadingAttribute() {
+    assertDoesNotThrow(() -> {
+      try (SqlSession sqlSession = createSessionWithAggressiveLazyLoading()) {
+        testSerializeWithoutPreloadingAttribute(sqlSession);
+      }
+    });
   }
 
   @Test
-  void serializeAndDeserializeObjectsWithAggressiveLazyLoadingWithPreloadingAttribute() throws Exception {
-    try (SqlSession sqlSession = createSessionWithAggressiveLazyLoading()) {
-      testSerializeWithPreloadingAttribute(sqlSession);
-    }
+  void serializeAndDeserializeObjectsWithAggressiveLazyLoadingWithPreloadingAttribute() {
+    assertDoesNotThrow(() -> {
+      try (SqlSession sqlSession = createSessionWithAggressiveLazyLoading()) {
+        testSerializeWithPreloadingAttribute(sqlSession);
+      }
+    });
   }
 
   @Test
-  void serializeAndDeserializeObjectsWithoutAggressiveLazyLoadingWithoutPreloadingAttribute() throws Exception {
-    try (SqlSession sqlSession = createSessionWithoutAggressiveLazyLoading()) {
-      // expected problem with deserializing
-      testSerializeWithoutPreloadingAttribute(sqlSession);
-    }
+  void serializeAndDeserializeObjectsWithoutAggressiveLazyLoadingWithoutPreloadingAttribute() {
+    assertDoesNotThrow(() -> {
+      try (SqlSession sqlSession = createSessionWithoutAggressiveLazyLoading()) {
+        // expected problem with deserializing
+        testSerializeWithoutPreloadingAttribute(sqlSession);
+      }
+    });
   }
 
   @Test
-  void serializeAndDeserializeObjectsWithoutAggressiveLazyLoadingWithPreloadingAttribute() throws Exception {
-    try (SqlSession sqlSession = createSessionWithoutAggressiveLazyLoading()) {
-      testSerializeWithPreloadingAttribute(sqlSession);
-    }
+  void serializeAndDeserializeObjectsWithoutAggressiveLazyLoadingWithPreloadingAttribute() {
+    assertDoesNotThrow(() -> {
+      try (SqlSession sqlSession = createSessionWithoutAggressiveLazyLoading()) {
+        testSerializeWithPreloadingAttribute(sqlSession);
+      }
+    });
   }
 
   private SqlSession createSessionWithoutAggressiveLazyLoading() throws Exception {

src/test/java/org/apache/ibatis/submitted/xml_references/EnumWithOgnlTest.java

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.xml_references;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import java.io.Reader;
 import java.util.Properties;
 
@@ -48,10 +50,13 @@ void configuration() {
   }
 
   @Test
-  void mixedConfiguration() throws Exception {
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/xml_references/ibatisConfig.xml")) {
-      SqlSessionFactory sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
-      sqlSessionFactory.getConfiguration().addMapper(PersonMapper2.class);
-    }
+  void mixedConfiguration() {
+    assertDoesNotThrow(() -> {
+      try (Reader reader = Resources
+          .getResourceAsReader("org/apache/ibatis/submitted/xml_references/ibatisConfig.xml")) {
+        SqlSessionFactory sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+        sqlSessionFactory.getConfiguration().addMapper(PersonMapper2.class);
+      }
+    });
   }
 }