Merge pull request #3343 from hazendaz/pom-cleanup

Cleanup tests with open rewrite help

Author: hazendaz

pom.xml

@@ -232,6 +232,14 @@
       <artifactId>junit-jupiter</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
+      <!--Only Mysqlcontainer is allowed to use junit 4: Uncomment to test
+      <exclusions>
+          <exclusion>
+              <groupId>junit</groupId>
+              <artifactId>junit</artifactId>
+          </exclusion>
+      </exclusions>
+      -->
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.

src/test/java/org/apache/ibatis/binding/WrongMapperTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.
@@ -24,9 +24,7 @@ class WrongMapperTest {
   @Test
   void shouldFailForBothOneAndMany() {
     Configuration configuration = new Configuration();
-    Assertions.assertThrows(RuntimeException.class, () -> {
-      configuration.addMapper(MapperWithOneAndMany.class);
-    });
+    Assertions.assertThrows(RuntimeException.class, () -> configuration.addMapper(MapperWithOneAndMany.class));
   }
 
 }

src/test/java/org/apache/ibatis/binding/WrongNamespacesTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 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.

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 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.

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 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.
@@ -22,7 +22,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class SqlSourceBuilderTest {
+class SqlSourceBuilderTest {
 
   private static Configuration configuration;
   private static SqlSourceBuilder sqlSourceBuilder;
@@ -36,15 +36,15 @@ void setUp() {
   }
 
   @Test
-  void testShrinkWhitespacesInSqlIsFalse() {
+  void shrinkWhitespacesInSqlIsFalse() {
     SqlSource sqlSource = sqlSourceBuilder.parse(sqlFromXml, null, null);
     BoundSql boundSql = sqlSource.getBoundSql(null);
     String actual = boundSql.getSql();
     Assertions.assertEquals(sqlFromXml, actual);
   }
 
   @Test
-  void testShrinkWhitespacesInSqlIsTrue() {
+  void shrinkWhitespacesInSqlIsTrue() {
     configuration.setShrinkWhitespacesInSql(true);
     SqlSource sqlSource = sqlSourceBuilder.parse(sqlFromXml, null, null);
     BoundSql boundSql = sqlSource.getBoundSql(null);

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.

src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.

src/test/java/org/apache/ibatis/cache/CacheKeyTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.
@@ -112,9 +112,7 @@ void shouldDemonstrateClonedNullCacheKeysAreEqual() throws Exception {
   void serializationExceptionTest() {
     CacheKey cacheKey = new CacheKey();
     cacheKey.update(new Object());
-    assertThrows(NotSerializableException.class, () -> {
-      serialize(cacheKey);
-    });
+    assertThrows(NotSerializableException.class, () -> serialize(cacheKey));
   }
 
   @Test