Updated documentation.

Refactored some converters to use generic methods.
Updated unit tests that asserts exceptions to JUnit 4 syntax.

Author: SethFalco

src/main/java/org/apache/commons/beanutils2/converters/CharacterConverter.java

@@ -16,8 +16,6 @@
  */
 package org.apache.commons.beanutils2.converters;
 
-import java.util.Objects;
-
 /**
  * {@link org.apache.commons.beanutils2.Converter} implementation that handles conversion
  * to and from <b>java.lang.Character</b> objects.
@@ -37,7 +35,7 @@
  */
 public final class CharacterConverter extends AbstractConverter {
 
-    /** This prefix allows us to determine an input is a hexadecimal {@link String}. */
+    /** Determines if an input is a hexadecimal {@link String}. */
     private static final String HEX_PREFIX = "0x";
 
     /**
@@ -96,8 +94,7 @@ protected String convertToString(final Object value) {
     @Override
     protected <T> T convertToType(final Class<T> type, final Object value) throws Exception {
         if (Character.class.equals(type) || Character.TYPE.equals(type)) {
-            Objects.requireNonNull(value, "Value can't be null.");
-            final String stringValue = value.toString();
+            final String stringValue = toString(value);
 
             if (stringValue.isEmpty()) {
                 throw new IllegalArgumentException("Value can't be empty.");

src/main/java/org/apache/commons/beanutils2/converters/DurationConverter.java

@@ -19,7 +19,6 @@
 import java.time.Duration;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoUnit;
-import java.util.Objects;
 
 /**
  * {@link org.apache.commons.beanutils2.Converter} implementation that handles conversion
@@ -85,8 +84,7 @@ protected Class<?> getDefaultType() {
     @Override
     protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
         if (Duration.class.equals(type)) {
-            Objects.requireNonNull(value, "Value can't be null.");
-            final String stringValue = value.toString();
+            final String stringValue = toString(value);
 
             try {
                 return type.cast(Duration.parse(stringValue));

src/main/java/org/apache/commons/beanutils2/converters/EnumConverter.java

@@ -16,7 +16,6 @@
  */
 package org.apache.commons.beanutils2.converters;
 
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -82,8 +81,7 @@ protected Class<?> getDefaultType() {
     @Override
     protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
         if (Enum.class.isAssignableFrom(type)) {
-            Objects.requireNonNull(value, "Value can't be null.");
-            final String stringValue = value.toString();
+            final String stringValue = toString(value);
 
             try {
                 return type.cast((Enum)Enum.valueOf((Class)type, stringValue));

src/main/java/org/apache/commons/beanutils2/converters/PeriodConverter.java

@@ -18,7 +18,6 @@
 
 import java.time.Period;
 import java.time.format.DateTimeParseException;
-import java.util.Objects;
 
 /**
  * {@link org.apache.commons.beanutils2.Converter} implementation that handles conversion
@@ -88,8 +87,7 @@ protected Class<?> getDefaultType() {
     @Override
     protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
         if (Period.class.equals(type)) {
-            Objects.requireNonNull(value, "Value can't be null.");
-            final String stringValue = value.toString();
+            final String stringValue = toString(value);
 
             try {
                 return type.cast(Period.parse(stringValue));

src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java

@@ -24,7 +24,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
 
 /**
  * Test Case for the CharacterConverter class.
@@ -60,14 +59,9 @@ public void testConvertToCharacter() {
      * Tests a conversion to character for null input if no default value is
      * provided.
      */
-    @Test
+    @Test(expected = ConversionException.class)
     public void testConvertToCharacterNullNoDefault() {
-        try {
-            converter.convert(Character.class, null);
-            fail("Expected a ConversionException for null value");
-        } catch (final Exception e) {
-            // expected result
-        }
+        converter.convert(Character.class, null);
     }
 
     /**
@@ -84,14 +78,9 @@ public void testConvertToString() {
     /**
      * Tries a conversion to an unsupported type.
      */
-    @Test
+    @Test(expected = ConversionException.class)
     public void testConvertToUnsupportedType() {
-        try {
-            converter.convert(Integer.class, "Test");
-            fail("Could convert to unsupported type!");
-        } catch (final ConversionException cex) {
-            // expected result
-        }
+        converter.convert(Integer.class, "Test");
     }
 
     /**

src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java

@@ -25,7 +25,6 @@
 import java.time.Duration;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 /**
  * Test Case for the DurationConverter class.
@@ -78,14 +77,9 @@ public void testSimpleConversion() throws Exception {
     /**
      * Tests a conversion to an unsupported type.
      */
-    @Test
+    @Test(expected = ConversionException.class)
     public void testUnsupportedType() {
-        try {
-            converter.convert(Integer.class, "http://www.apache.org");
-            fail("Unsupported type could be converted!");
-        } catch (final ConversionException cex) {
-            // expected result
-        }
+        converter.convert(Integer.class, "http://www.apache.org");
     }
 
     @Test
@@ -98,27 +92,17 @@ public void testConvertingDefault() {
 
     /**
      * As this is meant to be for technical usage, such as developers, or administrators
-     * of software, we don't allow localized {@link Number}s such as <code>1,000</code>. Only programatically
+     * of software, we don't allow localized {@link Number}s such as <code>1,000</code>. Only programmatically
      * correct values like <code>1000</code>.
      */
-    @Test
+    @Test(expected = ConversionException.class)
     public void testConvertingInvalidNumbers() {
-        try {
-            converter.convert(Duration.class, "1,000");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Duration.class, "1,000");
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testConvertingWords() {
-        try {
-            converter.convert(Duration.class, "Hello, world!");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Duration.class, "Hello, world!");
     }
 }
 

src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 /**
  * Test Case for the EnumConverter class.
@@ -77,14 +76,9 @@ public void testSimpleConversion() throws Exception {
     /**
      * Tests a conversion to an unsupported type.
      */
-    @Test
+    @Test(expected = ConversionException.class)
     public void testUnsupportedType() {
-        try {
-            converter.convert(Integer.class, "http://www.apache.org");
-            fail("Unsupported type could be converted!");
-        } catch (final ConversionException cex) {
-            // expected result
-        }
+        converter.convert(Integer.class, "http://www.apache.org");
     }
 
     public enum PizzaStatus {
@@ -110,44 +104,24 @@ public void testConvertDayOfWeek() {
         Assert.assertEquals(expected, actual);
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testConvertWrongEnumType() {
-        try {
-            converter.convert(TimeUnit.class, "java.time.DayOfWeek#MONDAY");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(TimeUnit.class, "java.time.DayOfWeek#MONDAY");
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testBrokenNamingConvention() {
-        try {
-            converter.convert(Enum.class, "JAVA-TIME-DAYOFWEEK#MONDAY");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Enum.class, "JAVA-TIME-DAYOFWEEK#MONDAY");
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testNonEnumClasses() {
-        try {
-            converter.convert(Enum.class, "java.lang.String#MONDAY");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Enum.class, "java.lang.String#MONDAY");
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testNonExistingClasses() {
-        try {
-            converter.convert(Enum.class, "java.lang.does.not.exist#MONDAY");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Enum.class, "java.lang.does.not.exist#MONDAY");
     }
 }
 

src/test/java/org/apache/commons/beanutils2/converters/InstantConverterTestCase.java

@@ -48,23 +48,13 @@ public void testConvertingInstantString() {
         Assert.assertEquals(expected, actual);
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testText() {
-        try {
-            converter.convert(Instant.class, "Hello, world!");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Instant.class, "Hello, world!");
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testLocalizedNumber() {
-        try {
-            converter.convert(Instant.class, "200,000,000,000");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Instant.class, "200,000,000,000");
     }
 }

src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java

@@ -25,7 +25,6 @@
 import java.time.Period;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 /**
  * Test Case for the PeriodConverter class.
@@ -78,14 +77,9 @@ public void testSimpleConversion() throws Exception {
     /**
      * Tests a conversion to an unsupported type.
      */
-    @Test
+    @Test(expected = ConversionException.class)
     public void testUnsupportedType() {
-        try {
-            converter.convert(Integer.class, "http://www.apache.org");
-            fail("Unsupported type could be converted!");
-        } catch (final ConversionException cex) {
-            // expected result
-        }
+        converter.convert(Integer.class, "http://www.apache.org");
     }
 
     @Test
@@ -99,26 +93,16 @@ public void testConvertingDefault() {
     /**
      * As this is meant to be for technical usage, such as developers, or administrators
      * of software, we don't allow localized {@link Number}s such as <code>1,000</code>.
-     * Only programatically correct values like <code>1000</code>.
+     * Only programmatically correct values like <code>1000</code>.
      */
-    @Test
+    @Test(expected = ConversionException.class)
     public void testLocalizedNumber() {
-        try {
-            converter.convert(Period.class, "1,000");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Period.class, "1,000");
     }
 
-    @Test
+    @Test(expected = ConversionException.class)
     public void testLetter() {
-        try {
-            converter.convert(Period.class, "Z");
-            Assert.fail();
-        } catch (ConversionException ex) {
-            // Do nothing
-        }
+        converter.convert(Period.class, "Z");
     }
 }