Use JUnit 5 convention for @test method visibility

Author: garydgregory

src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTest.java

@@ -135,7 +135,7 @@ public void tearDown() {
      * Corner cases on getDynaProperty invalid arguments.
      */
     @Test
-    public void testGetDescriptorArguments() {
+    void testGetDescriptorArguments() {
         assertNull(bean.getDynaClass().getDynaProperty("unknown"));
         assertThrows(NullPointerException.class, () -> bean.getDynaClass().getDynaProperty(null));
     }
@@ -156,47 +156,47 @@ protected void testGetDescriptorBase(final String name, final Class<?> type) {
      * Positive getDynaProperty on property {@code booleanProperty}.
      */
     @Test
-    public void testGetDescriptorBoolean() {
+    void testGetDescriptorBoolean() {
         testGetDescriptorBase("booleanProperty", Boolean.TYPE);
     }
 
     /**
      * Positive getDynaProperty on property {@code doubleProperty}.
      */
     @Test
-    public void testGetDescriptorDouble() {
+    void testGetDescriptorDouble() {
         testGetDescriptorBase("doubleProperty", Double.TYPE);
     }
 
     /**
      * Positive getDynaProperty on property {@code floatProperty}.
      */
     @Test
-    public void testGetDescriptorFloat() {
+    void testGetDescriptorFloat() {
         testGetDescriptorBase("floatProperty", Float.TYPE);
     }
 
     /**
      * Positive getDynaProperty on property {@code intProperty}.
      */
     @Test
-    public void testGetDescriptorInt() {
+    void testGetDescriptorInt() {
         testGetDescriptorBase("intProperty", Integer.TYPE);
     }
 
     /**
      * Positive getDynaProperty on property {@code longProperty}.
      */
     @Test
-    public void testGetDescriptorLong() {
+    void testGetDescriptorLong() {
         testGetDescriptorBase("longProperty", Long.TYPE);
     }
 
     /**
      * Positive test for getDynaProperties(). Each property name listed in {@code properties} should be returned exactly once.
      */
     @Test
-    public void testGetDescriptors() {
+    void testGetDescriptors() {
         final DynaProperty[] pd = bean.getDynaClass().getDynaProperties();
         assertNotNull(pd, "Got descriptors");
         final int[] count = new int[properties.length];
@@ -221,39 +221,39 @@ public void testGetDescriptors() {
      * Positive getDynaProperty on property {@code booleanSecond} that uses an "is" method as the getter.
      */
     @Test
-    public void testGetDescriptorSecond() {
+    void testGetDescriptorSecond() {
         testGetDescriptorBase("booleanSecond", Boolean.TYPE);
     }
 
     /**
      * Positive getDynaProperty on property {@code shortProperty}.
      */
     @Test
-    public void testGetDescriptorShort() {
+    void testGetDescriptorShort() {
         testGetDescriptorBase("shortProperty", Short.TYPE);
     }
 
     /**
      * Positive getDynaProperty on property {@code stringProperty}.
      */
     @Test
-    public void testGetDescriptorString() {
+    void testGetDescriptorString() {
         testGetDescriptorBase("stringProperty", String.class);
     }
 
     /**
      * Corner cases on getIndexedProperty invalid arguments.
      */
     @Test
-    public void testGetIndexedArguments() {
+    void testGetIndexedArguments() {
         assertThrows(IndexOutOfBoundsException.class, () -> bean.get("intArray", -1));
     }
 
     /**
      * Positive and negative tests on getIndexedProperty valid arguments.
      */
     @Test
-    public void testGetIndexedValues() {
+    void testGetIndexedValues() {
         Object value = null;
         for (int i = 0; i < 5; i++) {
             value = bean.get("intArray", i);
@@ -283,7 +283,7 @@ public void testGetIndexedValues() {
      * Corner cases on getMappedProperty invalid arguments.
      */
     @Test
-    public void testGetMappedArguments() {
+    void testGetMappedArguments() {
         final Object value = bean.get("mappedProperty", "unknown");
         assertNull(value, "Should not return a value");
     }
@@ -292,7 +292,7 @@ public void testGetMappedArguments() {
      * Positive and negative tests on getMappedProperty valid arguments.
      */
     @Test
-    public void testGetMappedValues() {
+    void testGetMappedValues() {
         Object value = null;
         value = bean.get("mappedProperty", "First Key");
         assertEquals("First Value", value, "Can find first value");
@@ -306,15 +306,15 @@ public void testGetMappedValues() {
      * Corner cases on getSimpleProperty invalid arguments.
      */
     @Test
-    public void testGetSimpleArguments() {
+    void testGetSimpleArguments() {
         assertThrows(NullPointerException.class, () -> bean.get(null));
     }
 
     /**
      * Test getSimpleProperty on a boolean property.
      */
     @Test
-    public void testGetSimpleBoolean() {
+    void testGetSimpleBoolean() {
         final Object value = bean.get("booleanProperty");
         assertNotNull(value, "Got a value");
         assertInstanceOf(Boolean.class, value, "Got correct type");
@@ -325,7 +325,7 @@ public void testGetSimpleBoolean() {
      * Test getSimpleProperty on a double property.
      */
     @Test
-    public void testGetSimpleDouble() {
+    void testGetSimpleDouble() {
         final Object value = bean.get("doubleProperty");
         assertNotNull(value, "Got a value");
         assertInstanceOf(Double.class, value, "Got correct type");
@@ -336,7 +336,7 @@ public void testGetSimpleDouble() {
      * Test getSimpleProperty on a float property.
      */
     @Test
-    public void testGetSimpleFloat() {
+    void testGetSimpleFloat() {
         final Object value = bean.get("floatProperty");
         assertNotNull(value, "Got a value");
         assertInstanceOf(Float.class, value, "Got correct type");
@@ -347,7 +347,7 @@ public void testGetSimpleFloat() {
      * Test getSimpleProperty on a int property.
      */
     @Test
-    public void testGetSimpleInt() {
+    void testGetSimpleInt() {
         final Object value = bean.get("intProperty");
         assertNotNull(value, "Got a value");
         assertInstanceOf(Integer.class, value, "Got correct type");
@@ -358,7 +358,7 @@ public void testGetSimpleInt() {
      * Test getSimpleProperty on a long property.
      */
     @Test
-    public void testGetSimpleLong() {
+    void testGetSimpleLong() {
         final Object value = bean.get("longProperty");
         assertNotNull(value, "Got a value");
         assertInstanceOf(Long.class, value, "Got correct type");
@@ -369,7 +369,7 @@ public void testGetSimpleLong() {
      * Test getSimpleProperty on a short property.
      */
     @Test
-    public void testGetSimpleShort() {
+    void testGetSimpleShort() {
         final Object value = bean.get("shortProperty");
         assertNotNull(value, "Got a value");
         assertInstanceOf(Short.class, value, "Got correct type");
@@ -380,7 +380,7 @@ public void testGetSimpleShort() {
      * Test getSimpleProperty on a String property.
      */
     @Test
-    public void testGetSimpleString() {
+    void testGetSimpleString() {
         final Object value = bean.get("stringProperty");
         assertNotNull(value, "Got a value");
         assertInstanceOf(String.class, value, "Got correct type");
@@ -391,7 +391,7 @@ public void testGetSimpleString() {
      * Test {@code contains()} method for mapped properties.
      */
     @Test
-    public void testMappedContains() {
+    void testMappedContains() {
         assertTrue(bean.contains("mappedProperty", "First Key"), "Can see first key");
         assertFalse(bean.contains("mappedProperty", "Unknown Key"), "Can not see unknown key");
     }
@@ -400,7 +400,7 @@ public void testMappedContains() {
      * Test {@code remove()} method for mapped properties.
      */
     @Test
-    public void testMappedRemove() {
+    void testMappedRemove() {
         assertTrue(bean.contains("mappedProperty", "First Key"), "Can see first key");
         bean.remove("mappedProperty", "First Key");
         assertFalse(bean.contains("mappedProperty", "First Key"), "Can not see first key");
@@ -413,7 +413,7 @@ public void testMappedRemove() {
      * Test serialization and deserialization.
      */
     @Test
-    public void testNotSerializableException() throws Exception {
+    void testNotSerializableException() throws Exception {
         // Serialize the test bean
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
@@ -433,15 +433,15 @@ public void testNotSerializableException() throws Exception {
      * Corner cases on setIndexedProperty invalid arguments.
      */
     @Test
-    public void testSetIndexedArguments() {
+    void testSetIndexedArguments() {
         assertThrows(IndexOutOfBoundsException.class, () -> bean.set("intArray", -1, Integer.valueOf(0)));
     }
 
     /**
      * Positive and negative tests on setIndexedProperty valid arguments.
      */
     @Test
-    public void testSetIndexedValues() {
+    void testSetIndexedValues() {
         Object value = null;
         bean.set("intArray", 0, Integer.valueOf(1));
         value = bean.get("intArray", 0);
@@ -474,7 +474,7 @@ public void testSetIndexedValues() {
      * Positive and negative tests on setMappedProperty valid arguments.
      */
     @Test
-    public void testSetMappedValues() {
+    void testSetMappedValues() {
         bean.set("mappedProperty", "First Key", "New First Value");
         assertEquals("New First Value", (String) bean.get("mappedProperty", "First Key"), "Can replace old value");
         bean.set("mappedProperty", "Fourth Key", "Fourth Value");
@@ -485,7 +485,7 @@ public void testSetMappedValues() {
      * Test setSimpleProperty on a boolean property.
      */
     @Test
-    public void testSetSimpleBoolean() {
+    void testSetSimpleBoolean() {
         final boolean oldValue = ((Boolean) bean.get("booleanProperty")).booleanValue();
         final boolean newValue = !oldValue;
         bean.set("booleanProperty", Boolean.valueOf(newValue));
@@ -496,7 +496,7 @@ public void testSetSimpleBoolean() {
      * Test setSimpleProperty on a double property.
      */
     @Test
-    public void testSetSimpleDouble() {
+    void testSetSimpleDouble() {
         final double oldValue = ((Double) bean.get("doubleProperty")).doubleValue();
         final double newValue = oldValue + 1.0;
         bean.set("doubleProperty", Double.valueOf(newValue));
@@ -507,7 +507,7 @@ public void testSetSimpleDouble() {
      * Test setSimpleProperty on a float property.
      */
     @Test
-    public void testSetSimpleFloat() {
+    void testSetSimpleFloat() {
         final float oldValue = ((Float) bean.get("floatProperty")).floatValue();
         final float newValue = oldValue + (float) 1.0;
         bean.set("floatProperty", Float.valueOf(newValue));
@@ -518,7 +518,7 @@ public void testSetSimpleFloat() {
      * Test setSimpleProperty on a int property.
      */
     @Test
-    public void testSetSimpleInt() {
+    void testSetSimpleInt() {
         final int oldValue = ((Integer) bean.get("intProperty")).intValue();
         final int newValue = oldValue + 1;
         bean.set("intProperty", Integer.valueOf(newValue));
@@ -529,7 +529,7 @@ public void testSetSimpleInt() {
      * Test setSimpleProperty on a long property.
      */
     @Test
-    public void testSetSimpleLong() {
+    void testSetSimpleLong() {
         final long oldValue = ((Long) bean.get("longProperty")).longValue();
         final long newValue = oldValue + 1;
         bean.set("longProperty", Long.valueOf(newValue));
@@ -540,7 +540,7 @@ public void testSetSimpleLong() {
      * Test setSimpleProperty on a short property.
      */
     @Test
-    public void testSetSimpleShort() {
+    void testSetSimpleShort() {
         final short oldValue = ((Short) bean.get("shortProperty")).shortValue();
         final short newValue = (short) (oldValue + 1);
         bean.set("shortProperty", Short.valueOf(newValue));
@@ -551,7 +551,7 @@ public void testSetSimpleShort() {
      * Test setSimpleProperty on a String property.
      */
     @Test
-    public void testSetSimpleString() {
+    void testSetSimpleString() {
         final String oldValue = (String) bean.get("stringProperty");
         final String newValue = oldValue + " Extra Value";
         bean.set("stringProperty", newValue);

src/test/java/org/apache/commons/beanutils2/BeanComparatorTest.java

@@ -62,7 +62,7 @@ public void tearDown() {
      * Tests comparing one bean against itself.
      */
     @Test
-    public void testCompareBeanAgainstSelf() {
+    void testCompareBeanAgainstSelf() {
         final BeanComparator<AlphaBean, String> beanComparator = new BeanComparator<>("name");
         final int result = beanComparator.compare(alphaBean1, alphaBean1);
         assertEquals(0, result, () -> "Comparator did not sort properly.  Result:" + result);
@@ -72,7 +72,7 @@ public void testCompareBeanAgainstSelf() {
      * Tests comparing two beans via their name using the default Comparator where they have the same value.
      */
     @Test
-    public void testCompareIdentical() {
+    void testCompareIdentical() {
         alphaBean1 = new AlphaBean("alphabean");
         alphaBean2 = new AlphaBean("alphabean");
         final BeanComparator<AlphaBean, String> beanComparator = new BeanComparator<>("name");
@@ -84,7 +84,7 @@ public void testCompareIdentical() {
      * Tests comparing two beans on a boolean property, which is not possible.
      */
     @Test
-    public void testCompareOnBooleanProperty() {
+    void testCompareOnBooleanProperty() {
         try {
             final TestBean testBeanA = new TestBean();
             final TestBean testBeanB = new TestBean();
@@ -108,7 +108,7 @@ public void testCompareOnBooleanProperty() {
      * Tests comparing two beans who don't have a property
      */
     @Test
-    public void testCompareOnMissingProperty() {
+    void testCompareOnMissingProperty() {
         final BeanComparator<AlphaBean, String> beanComparator = new BeanComparator<>("bogusName");
         final Exception e = assertThrows(RuntimeException.class, () -> beanComparator.compare(alphaBean2, alphaBean1));
         assertTrue(e.toString().contains("Unknown property"), () -> "Wrong exception was thrown: " + e);
@@ -118,7 +118,7 @@ public void testCompareOnMissingProperty() {
      * Tests comparing two beans via their name using the default Comparator, but with one of the beans being null.
      */
     @Test
-    public void testCompareWithNulls() {
+    void testCompareWithNulls() {
         final BeanComparator<AlphaBean, String> beanComparator = new BeanComparator<>("name");
         assertThrows(NullPointerException.class, () -> beanComparator.compare(alphaBean2, null));
     }
@@ -127,7 +127,7 @@ public void testCompareWithNulls() {
      * Tests comparing two beans on a boolean property, then changing the property and testing/
      */
     @Test
-    public void testSetProperty() {
+    void testSetProperty() {
         final TestBean testBeanA = new TestBean();
         final TestBean testBeanB = new TestBean();
 
@@ -153,7 +153,7 @@ public void testSetProperty() {
      * Tests comparing two beans via their name using the default Comparator
      */
     @Test
-    public void testSimpleCompare() {
+    void testSimpleCompare() {
         final BeanComparator<AlphaBean, String> beanComparator = new BeanComparator<>("name");
         final int result = beanComparator.compare(alphaBean1, alphaBean2);
         assertEquals(-1, result, () -> "Comparator did not sort properly.  Result:" + result);
@@ -163,7 +163,7 @@ public void testSimpleCompare() {
      * Tests comparing two beans via their name using the default Comparator, but the inverse
      */
     @Test
-    public void testSimpleCompareInverse() {
+    void testSimpleCompareInverse() {
         final BeanComparator<AlphaBean, String> beanComparator = new BeanComparator<>("name");
         final int result = beanComparator.compare(alphaBean2, alphaBean1);
         assertEquals(1, result, () -> "Comparator did not sort properly.  Result:" + result);