Cleanup test usage style, rename misnamed class, more code cleanup on tests

src/test/java/com/ibatis/common/beans/BadBeanTest.java

@@ -26,7 +26,7 @@
 
 import badbeans.*;
 
-public class BadBeanTest {
+class BadBeanTest {
 
   private static final String PROPNAME = "value";
   private static final Object STRING_VALUE = "1";
@@ -36,7 +36,7 @@ public class BadBeanTest {
   private static final Object[] INT_PARAMS = new Object[] { INT_VALUE };
 
   @Test
-  public void testShouldSuccessfullyGetAndSetValueOnGoodBean() throws Exception {
+  void testShouldSuccessfullyGetAndSetValueOnGoodBean() throws Exception {
     GoodBean bean = new GoodBean();
     ClassInfo info = ClassInfo.getInstance(GoodBean.class);
     info.getSetter(PROPNAME).invoke(bean, STRING_PARAMS);
@@ -46,7 +46,7 @@ public void testShouldSuccessfullyGetAndSetValueOnGoodBean() throws Exception {
   }
 
   @Test
-  public void testShouldSuccessfullyGetAndSetValueOnBeanWithDifferentTypeGetterSetter() throws Exception {
+  void testShouldSuccessfullyGetAndSetValueOnBeanWithDifferentTypeGetterSetter() throws Exception {
     BeanWithDifferentTypeGetterSetter bean = new BeanWithDifferentTypeGetterSetter();
     ClassInfo info = ClassInfo.getInstance(BeanWithDifferentTypeGetterSetter.class);
     info.getSetter(PROPNAME).invoke(bean, INT_PARAMS);
@@ -56,7 +56,7 @@ public void testShouldSuccessfullyGetAndSetValueOnBeanWithDifferentTypeGetterSet
   }
 
   @Test
-  public void testShouldSuccessfullyGetAndSetValueOnBeanWithOverloadedSetter() throws Exception {
+  void testShouldSuccessfullyGetAndSetValueOnBeanWithOverloadedSetter() throws Exception {
     BeanWithOverloadedSetter bean = new BeanWithOverloadedSetter();
     ClassInfo info = ClassInfo.getInstance(BeanWithOverloadedSetter.class);
     info.getSetter(PROPNAME).invoke(bean, STRING_PARAMS);
@@ -66,7 +66,7 @@ public void testShouldSuccessfullyGetAndSetValueOnBeanWithOverloadedSetter() thr
   }
 
   @Test
-  public void testShouldFailInitializingClassInfoForBeanWithNoGetterOverloadedSetter() {
+  void testShouldFailInitializingClassInfoForBeanWithNoGetterOverloadedSetter() {
     try {
       try {
         ClassInfo.getInstance(BeanWithNoGetterOverloadedSetters.class);
@@ -81,7 +81,7 @@ public void testShouldFailInitializingClassInfoForBeanWithNoGetterOverloadedSett
   }
 
   @Test
-  public void testShouldFailInitializingClassInfoForBeanWithDifferentTypeOverloadedSetter() {
+  void testShouldFailInitializingClassInfoForBeanWithDifferentTypeOverloadedSetter() {
     try {
       try {
         ClassInfo.getInstance(BeanWithDifferentTypeOverloadedSetter.class);
@@ -96,7 +96,7 @@ public void testShouldFailInitializingClassInfoForBeanWithDifferentTypeOverloade
   }
 
   @Test
-  public void testUnwrapThrowable() {
+  void testUnwrapThrowable() {
     SQLException cause = new SQLException("test");
     UndeclaredThrowableException e = new UndeclaredThrowableException(cause);
     assertEquals(cause, ClassInfo.unwrapThrowable(e));

src/test/java/com/ibatis/common/beans/ComplexBeanProbeTest.java

@@ -21,10 +21,10 @@
 
 import org.junit.jupiter.api.Test;
 
-public class ComplexBeanProbeTest {
+class ComplexBeanProbeTest {
 
   @Test
-  public void testSetObject() {
+  void testSetObject() {
     SimpleClass mySimpleClass = new SimpleClass();
     Probe probe = ProbeFactory.getProbe(mySimpleClass);
     probe.setObject(mySimpleClass, "myInt", Integer.valueOf(1));

src/test/java/com/ibatis/common/beans/JavaBeanProbeTest.java

@@ -21,42 +21,42 @@
 
 import org.junit.jupiter.api.Test;
 
-public class JavaBeanProbeTest {
+class JavaBeanProbeTest {
 
   @Test
-  public void testGetPropertyTypeForSetterObjectString() {
+  void testGetPropertyTypeForSetterObjectString() {
     TestBean b = getBean();
     Probe p = getProbe(b);
     assertTrue(p.getPropertyTypeForSetter(b, "testBean").equals(TestBean.class));
     assertTrue(p.getPropertyTypeForSetter(b, "testBean.testBean").equals(TestBean.class));
   }
 
   @Test
-  public void testGetPropertyTypeForGetterObjectString() {
+  void testGetPropertyTypeForGetterObjectString() {
     TestBean b = getBean();
     Probe p = getProbe(b);
     assertTrue(p.getPropertyTypeForGetter(b, "testBean").equals(TestBean.class));
     assertTrue(p.getPropertyTypeForGetter(b, "testBean.testBean").equals(TestBean.class));
   }
 
   @Test
-  public void testHasWritableProperty() {
+  void testHasWritableProperty() {
     TestBean b = getBean();
     Probe p = getProbe(b);
     assertTrue(p.hasWritableProperty(b, "testBean"));
     assertTrue(p.hasWritableProperty(b, "testBean.testBean"));
   }
 
   @Test
-  public void testHasReadableProperty() {
+  void testHasReadableProperty() {
     TestBean b = getBean();
     Probe p = getProbe(b);
     assertTrue(p.hasReadableProperty(b, "testBean"));
     assertTrue(p.hasReadableProperty(b, "testBean.testBean"));
   }
 
   @Test
-  public void testSetAndGetObject() {
+  void testSetAndGetObject() {
     TestBean b = getBean();
     Probe p = getProbe(b);
     float f[] = new float[3];

src/test/java/com/ibatis/common/beans/PropertyAccessPlanTest.java

@@ -26,7 +26,7 @@
 
 import testdomain.Order;
 
-public class PropertyAccessPlanTest {
+class PropertyAccessPlanTest {
 
   private static final String[] properties = { "id", "id", "account.firstName", "account.lastName",
       "account.emailAddress", "cardType", "cardNumber", "cardExpiry", "favouriteLineItem.itemCode",
@@ -36,7 +36,7 @@ public class PropertyAccessPlanTest {
       "clinton@ibatis.com", "VISA", "1234567890", "05/06", "M100", Integer.valueOf(3), new BigDecimal(150) };
 
   @Test
-  public void testSetAndGetProperties() {
+  void testSetAndGetProperties() {
 
     AccessPlan plan = AccessPlanFactory.getAccessPlan(Order.class, properties);
 

src/test/java/com/ibatis/common/resources/ResourcesTest.java

@@ -39,11 +39,11 @@
  * To change the template for this generated type comment go to Window - Preferences - Java - Code Generation - Code and
  * Comments
  */
-public class ResourcesTest {
+class ResourcesTest {
   private boolean isUsingPrivateClassloader = false;
 
   @Test
-  public void testSetDefaultClassLoader() {
+  void testSetDefaultClassLoader() {
     ClassLoader classLoader = new TestCL(this.getClass().getClassLoader());
     ClassLoader tmp = Resources.getDefaultClassLoader();
     Resources.setDefaultClassLoader(classLoader);
@@ -56,7 +56,7 @@ public void testSetDefaultClassLoader() {
    * Class to test for URL getResourceURL(String)
    */
   @Test
-  public void testGetResourceURLString() {
+  void testGetResourceURLString() {
     String resourceName;
     URL url;
 
@@ -85,7 +85,7 @@ public void testGetResourceURLString() {
    * Class to test for URL getResourceURL(ClassLoader, String)
    */
   @Test
-  public void testGetResourceURLClassLoaderString() {
+  void testGetResourceURLClassLoaderString() {
     String resourceName;
     URL url;
     ClassLoader classLoader;
@@ -122,7 +122,7 @@ public void testGetResourceURLClassLoaderString() {
    * Class to test for InputStream getResourceAsStream(String)
    */
   @Test
-  public void testGetResourceAsStreamString() {
+  void testGetResourceAsStreamString() {
     InputStream inputStream;
     String resourceName;
 
@@ -150,7 +150,7 @@ public void testGetResourceAsStreamString() {
    * Class to test for InputStream getResourceAsStream(ClassLoader, String)
    */
   @Test
-  public void testGetResourceAsStreamClassLoaderString() {
+  void testGetResourceAsStreamClassLoaderString() {
     InputStream inputStream;
     String resourceName;
     ClassLoader classLoader;
@@ -186,7 +186,7 @@ public void testGetResourceAsStreamClassLoaderString() {
    * Class to test for Properties getResourceAsProperties(String)
    */
   @Test
-  public void testGetResourceAsPropertiesString() {
+  void testGetResourceAsPropertiesString() {
     String resourceName;
     String testProp = "name";
     String testPropValue = "value";
@@ -220,7 +220,7 @@ public void testGetResourceAsPropertiesString() {
    * Class to test for Properties getResourceAsProperties(ClassLoader, String)
    */
   @Test
-  public void testGetResourceAsPropertiesClassLoaderString() {
+  void testGetResourceAsPropertiesClassLoaderString() {
     String resourceName;
     String testProp = "name";
     String testPropValue = "value";
@@ -261,58 +261,58 @@ public void testGetResourceAsPropertiesClassLoaderString() {
    * Class to test for Reader getResourceAsReader(String)
    */
   @Test
-  public void testGetResourceAsReaderString() {
+  void testGetResourceAsReaderString() {
   }
 
   /*
    * Class to test for Reader getResourceAsReader(ClassLoader, String)
    */
   @Test
-  public void testGetResourceAsReaderClassLoaderString() {
+  void testGetResourceAsReaderClassLoaderString() {
   }
 
   /*
    * Class to test for File getResourceAsFile(String)
    */
   @Test
-  public void testGetResourceAsFileString() {
+  void testGetResourceAsFileString() {
   }
 
   /*
    * Class to test for File getResourceAsFile(ClassLoader, String)
    */
   @Test
-  public void testGetResourceAsFileClassLoaderString() {
+  void testGetResourceAsFileClassLoaderString() {
   }
 
   @Test
-  public void testGetUrlAsStream() {
+  void testGetUrlAsStream() {
   }
 
   @Test
-  public void testGetUrlAsReader() {
+  void testGetUrlAsReader() {
   }
 
   @Test
-  public void testGetUrlAsProperties() {
+  void testGetUrlAsProperties() {
   }
 
   @Test
-  public void testClassForName() {
+  void testClassForName() {
   }
 
   /*
    * Class to test for Object instantiate(String)
    */
   @Test
-  public void testInstantiateString() {
+  void testInstantiateString() {
   }
 
   /*
    * Class to test for Object instantiate(Class)
    */
   @Test
-  public void testInstantiateClass() {
+  void testInstantiateClass() {
   }
 
   /*

src/test/java/com/ibatis/common/util/PaginatedArrayListTest.java

@@ -22,14 +22,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class PaginatedArrayListTest {
+class PaginatedArrayListTest {
 
   private PaginatedArrayList smallPageList;
   private PaginatedArrayList oddPageList;
   private PaginatedArrayList evenPageList;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     smallPageList = new PaginatedArrayList(5);
     smallPageList.add(Integer.valueOf(0));
     smallPageList.add(Integer.valueOf(1));
@@ -75,7 +75,7 @@ public void setUp() {
   }
 
   @Test
-  public void testOddPaginatedIterator() {
+  void testOddPaginatedIterator() {
 
     assertEquals(true, oddPageList.isFirstPage());
     assertEquals(false, oddPageList.isPreviousPageAvailable());
@@ -145,7 +145,7 @@ public void testOddPaginatedIterator() {
   }
 
   @Test
-  public void testEvenPaginatedIterator() {
+  void testEvenPaginatedIterator() {
 
     assertEquals(true, evenPageList.isFirstPage());
     assertEquals(false, evenPageList.isPreviousPageAvailable());
@@ -205,7 +205,7 @@ public void testEvenPaginatedIterator() {
   }
 
   @Test
-  public void testSmallPaginatedIterator() {
+  void testSmallPaginatedIterator() {
 
     assertEquals(true, smallPageList.isFirstPage());
     assertEquals(true, smallPageList.isLastPage());

src/test/java/com/ibatis/common/xml/NodeletUtilsTest.java

@@ -22,13 +22,13 @@
 
 import org.junit.jupiter.api.Test;
 
-public class NodeletUtilsTest {
+class NodeletUtilsTest {
 
   /**
    * Test for getting of a boolean argument.
    */
   @Test
-  public void testGetBooleanAttribute() {
+  void testGetBooleanAttribute() {
 
     Properties props = new Properties();
     props.setProperty("boolean1", "true");
@@ -49,7 +49,7 @@ public void testGetBooleanAttribute() {
    * Test for getting of a integer argument.
    */
   @Test
-  public void testGetIntAttribute() {
+  void testGetIntAttribute() {
 
     Properties props = new Properties();
     props.setProperty("int1", "0");
@@ -79,7 +79,7 @@ public void testGetIntAttribute() {
    * Test for getting of a boolean argument.
    */
   @Test
-  public void testParsePropertyTokens() {
+  void testParsePropertyTokens() {
 
     Properties props = new Properties();
     props.setProperty("key1", "0");

src/test/java/com/ibatis/sqlmap/BaseSqlMapTest.java → src/test/java/com/ibatis/sqlmap/BaseSqlMap.java

@@ -29,14 +29,12 @@
 
 import javax.sql.DataSource;
 
-import org.junit.jupiter.api.Test;
-
 import testdomain.Account;
 import testdomain.FieldAccount;
 import testdomain.Order;
 import testdomain.PrivateAccount;
 
-public class BaseSqlMapTest {
+public class BaseSqlMap {
 
   protected static SqlMapClient sqlMap;
 
@@ -169,9 +167,4 @@ protected void assertOrder1(Map<?, ?> order) {
     assertEquals("C4B 4F4", order.get("postalCode"));
   }
 
-  @Test
-  public void testDummy() {
-    // just to avoid warnings when running all tests.
-  }
-
 }