Merge pull request #3364 from hazendaz/pom-cleanup

Various test cleanup
mybatis · Dec 31, 2024 · aaa5927 · aaa5927
2 parents 753591a + b244382
commit aaa5927
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java b/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.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.
@@ -75,7 +75,7 @@ void shouldFlushAllItemsOnDemand() {
   @Test
   void shouldDemonstrateIdIsNull() {
     Cache cache = new PerpetualCache(null);
-    assertThrows(CacheException.class, () -> cache.hashCode());
+    assertThrows(CacheException.class, cache::hashCode);
     assertThrows(CacheException.class, () -> cache.equals(new Object()));
   }
 }
diff --git a/src/test/java/org/apache/ibatis/io/ClassLoaderWrapperTest.java b/src/test/java/org/apache/ibatis/io/ClassLoaderWrapperTest.java
@@ -27,9 +27,9 @@ class ClassLoaderWrapperTest extends BaseDataTest {
 
   private ClassLoaderWrapper wrapper;
   private ClassLoader loader;
-  private final String RESOURCE_NOT_FOUND = "some_resource_that_does_not_exist.properties";
-  private final String CLASS_NOT_FOUND = "some.random.class.that.does.not.Exist";
-  private final String CLASS_FOUND = "java.lang.Object";
+  private static final String RESOURCE_NOT_FOUND = "some_resource_that_does_not_exist.properties";
+  private static final String CLASS_NOT_FOUND = "some.random.class.that.does.not.Exist";
+  private static final String CLASS_FOUND = "java.lang.Object";
 
   @BeforeEach
   void beforeClassLoaderWrapperTest() {

diff --git a/src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java b/src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java
@@ -15,6 +15,7 @@
  */
 package org.apache.ibatis.io;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -49,11 +50,9 @@ void setUp() throws Exception {
 
   @Test
   void testcopyExternalResource() {
-
-    try {
+    assertDoesNotThrow(() -> {
       ExternalResources.copyExternalResource(sourceFile, destFile);
-    } catch (IOException e) {
-    }
+    });
 
   }
 

diff --git a/src/test/java/org/apache/ibatis/reflection/ReflectorTest.java b/src/test/java/org/apache/ibatis/reflection/ReflectorTest.java
@@ -59,7 +59,7 @@ interface Entity<T> {
     void setId(T id);
   }
 
-  static abstract class AbstractEntity implements Entity<Long> {
+  abstract static class AbstractEntity implements Entity<Long> {
 
     private Long id;
 
@@ -137,7 +137,7 @@ void shouldResolveArrayGetterType() {
     assertEquals(String.class, clazz.getComponentType());
   }
 
-  static abstract class Parent<T extends Serializable> {
+  abstract static class Parent<T extends Serializable> {
     protected T id;
     protected List<T> list;
     protected T[] array;

diff --git a/src/test/java/org/apache/ibatis/scripting/LanguageDriverRegistryTest.java b/src/test/java/org/apache/ibatis/scripting/LanguageDriverRegistryTest.java
@@ -100,7 +100,7 @@ void setDefaultDriverClass() {
     assertThat(registry.getDefaultDriver()).isInstanceOf(RawLanguageDriver.class);
   }
 
-  static private class PrivateLanguageDriver implements LanguageDriver {
+  private static class PrivateLanguageDriver implements LanguageDriver {
 
     @Override
     public ParameterHandler createParameterHandler(MappedStatement mappedStatement, Object parameterObject,

diff --git a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
@@ -64,7 +64,7 @@ void ancestorSelf() {
   }
 
   @Test
-  void testGrandParent() {
+  void grandParent() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
       Person expectedParent = personMapper.selectById(2);

diff --git a/src/test/java/org/apache/ibatis/submitted/null_associations/FooMapperTest.java b/src/test/java/org/apache/ibatis/submitted/null_associations/FooMapperTest.java
@@ -31,7 +31,7 @@
 
 class FooMapperTest {
 
-  private final static String SQL_MAP_CONFIG = "org/apache/ibatis/submitted/null_associations/sqlmap.xml";
+  private static final String SQL_MAP_CONFIG = "org/apache/ibatis/submitted/null_associations/sqlmap.xml";
   private static SqlSession session;
   private static Connection conn;
 

diff --git a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/FooMapperTest.java b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/FooMapperTest.java
@@ -33,7 +33,7 @@
  */
 class FooMapperTest {
 
-  private final static String SQL_MAP_CONFIG = "org/apache/ibatis/submitted/overwritingproperties/sqlmap.xml";
+  private static final String SQL_MAP_CONFIG = "org/apache/ibatis/submitted/overwritingproperties/sqlmap.xml";
   private static SqlSession session;
   private static Connection conn;