Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -44,7 +44,7 @@ public class BooleanArrayConverterTestCa }; - public BooleanArrayConverterTestCase(String name) { + public BooleanArrayConverterTestCase(final String name) { super(name); } @@ -53,15 +53,15 @@ public class BooleanArrayConverterTestCa * values gets converted nicely. */ public void testStandardStringArrayConversion() { - String[] values = { + final String[] values = { "true", "false", "yes", "no", "y", "n", "1", "0", }; - BooleanArrayConverter converter = new BooleanArrayConverter(); - boolean[] results = (boolean[]) converter.convert(null, values); + final BooleanArrayConverter converter = new BooleanArrayConverter(); + final boolean[] results = (boolean[]) converter.convert(null, values); assertNotNull(results); assertEquals(8, results.length); @@ -80,9 +80,9 @@ public class BooleanArrayConverterTestCa * values gets converted nicely. */ public void testStandardStringConversion() { - BooleanArrayConverter converter = new BooleanArrayConverter(); + final BooleanArrayConverter converter = new BooleanArrayConverter(); - StringBuilder input = new StringBuilder(); + final StringBuilder input = new StringBuilder(); boolean[] results; // string has {} @@ -151,14 +151,14 @@ public class BooleanArrayConverterTestCa * providing a customised BooleanConverter. */ public void testAdditionalStrings() { - String[] trueStrings = {"sure"}; - String[] falseStrings = {"nope"}; - BooleanConverter bc = new BooleanConverter( + final String[] trueStrings = {"sure"}; + final String[] falseStrings = {"nope"}; + final BooleanConverter bc = new BooleanConverter( trueStrings, falseStrings, BooleanConverter.NO_DEFAULT); - BooleanArrayConverter converter = new BooleanArrayConverter( + final BooleanArrayConverter converter = new BooleanArrayConverter( bc, BooleanArrayConverter.NO_DEFAULT); - boolean[] results = (boolean[]) converter.convert(null, "NOPE, sure, sure"); + final boolean[] results = (boolean[]) converter.convert(null, "NOPE, sure, sure"); assertNotNull(results); assertEquals(3, results.length); assertFalse(results[0]); @@ -170,7 +170,7 @@ public class BooleanArrayConverterTestCa // a true value.. converter.convert(null, "true"); fail("Converting invalid string should have generated an exception"); - } catch(Exception ex) { + } catch(final Exception ex) { // ok, expected } } @@ -180,11 +180,11 @@ public class BooleanArrayConverterTestCa * there is no default value then an exception is thrown. */ public void testInvalidStringWithoutDefault() { - BooleanArrayConverter converter = new BooleanArrayConverter(); + final BooleanArrayConverter converter = new BooleanArrayConverter(); try { converter.convert(null, "true!"); fail("Converting invalid string should have generated an exception"); - } catch (ConversionException expected) { + } catch (final ConversionException expected) { // Exception is successful test } } @@ -194,9 +194,9 @@ public class BooleanArrayConverterTestCa * there is a default value then that default is returned. */ public void testInvalidStringWithDefault() { - boolean[] defaults = new boolean[1]; - BooleanArrayConverter converter = new BooleanArrayConverter(defaults); - Object o = converter.convert(null, "true!"); + final boolean[] defaults = new boolean[1]; + final BooleanArrayConverter converter = new BooleanArrayConverter(defaults); + final Object o = converter.convert(null, "true!"); assertSame("Unexpected object returned for failed conversion", o, defaults); } @@ -205,11 +205,11 @@ public class BooleanArrayConverterTestCa * a valid boolean, and there is no default value then an exception is thrown. */ public void testInvalidElementWithoutDefault() { - BooleanArrayConverter converter = new BooleanArrayConverter(); + final BooleanArrayConverter converter = new BooleanArrayConverter(); try { converter.convert(null, "true,bogus"); fail("Converting invalid string should have generated an exception"); - } catch (ConversionException expected) { + } catch (final ConversionException expected) { // Exception is successful test } } @@ -223,9 +223,9 @@ public class BooleanArrayConverterTestCa * not for the failed element. */ public void testInvalidElementWithDefault() { - boolean[] defaults = new boolean[1]; - BooleanArrayConverter converter = new BooleanArrayConverter(defaults); - Object o = converter.convert(null, "true,bogus"); + final boolean[] defaults = new boolean[1]; + final BooleanArrayConverter converter = new BooleanArrayConverter(defaults); + final Object o = converter.convert(null, "true,bogus"); assertSame("Unexpected object returned for failed conversion", o, defaults); } @@ -241,10 +241,10 @@ public class BooleanArrayConverterTestCa * others are converted as expected. */ public void testElementDefault() { - boolean[] defaults = new boolean[1]; - BooleanConverter bc = new BooleanConverter(Boolean.TRUE); - BooleanArrayConverter converter = new BooleanArrayConverter(bc, defaults); - boolean[] results = (boolean[]) converter.convert(null, "true,bogus"); + final boolean[] defaults = new boolean[1]; + final BooleanConverter bc = new BooleanConverter(Boolean.TRUE); + final BooleanArrayConverter converter = new BooleanArrayConverter(bc, defaults); + final boolean[] results = (boolean[]) converter.convert(null, "true,bogus"); assertEquals(2, results.length); assertTrue(results[0]); @@ -255,17 +255,17 @@ public class BooleanArrayConverterTestCa * Check that registration of a custom converter works. */ public void testRegistration() { - String[] trueStrings = {"sure"}; - String[] falseStrings = {"nope"}; - BooleanConverter bc = new BooleanConverter( + final String[] trueStrings = {"sure"}; + final String[] falseStrings = {"nope"}; + final BooleanConverter bc = new BooleanConverter( trueStrings, falseStrings, BooleanConverter.NO_DEFAULT); - BooleanArrayConverter converter = new BooleanArrayConverter( + final BooleanArrayConverter converter = new BooleanArrayConverter( bc, BooleanArrayConverter.NO_DEFAULT); ConvertUtils.register(converter, BooleanArrayConverter.MODEL); - boolean[] sample = new boolean[0]; - boolean[] results = (boolean[]) ConvertUtils.convert("sure,nope", sample.getClass()); + final boolean[] sample = new boolean[0]; + final boolean[] results = (boolean[]) ConvertUtils.convert("sure,nope", sample.getClass()); assertEquals(2, results.length); assertTrue(results[0]);
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -35,17 +35,17 @@ public class BooleanConverterTestCase ex }; - public BooleanConverterTestCase(String name) { + public BooleanConverterTestCase(final String name) { super(name); } public void testStandardValues() { - BooleanConverter converter = new BooleanConverter(); + final BooleanConverter converter = new BooleanConverter(); testConversionValues(converter, STANDARD_TRUES, STANDARD_FALSES); } public void testCaseInsensitivity() { - BooleanConverter converter = new BooleanConverter(); + final BooleanConverter converter = new BooleanConverter(); testConversionValues( converter, new String[] {"Yes", "TRUE"}, @@ -54,27 +54,27 @@ public class BooleanConverterTestCase ex public void testInvalidString() { - BooleanConverter converter = new BooleanConverter(); + final BooleanConverter converter = new BooleanConverter(); try { converter.convert(Boolean.class, "bogus"); fail("Converting invalid string should have generated an exception"); - } catch (ConversionException expected) { + } catch (final ConversionException expected) { // Exception is successful test } } public void testDefaultValue() { - Object defaultValue = Boolean.TRUE; - BooleanConverter converter = new BooleanConverter(defaultValue); + final Object defaultValue = Boolean.TRUE; + final BooleanConverter converter = new BooleanConverter(defaultValue); assertSame(defaultValue, converter.convert(Boolean.class, "bogus")); testConversionValues(converter, STANDARD_TRUES, STANDARD_FALSES); } public void testAdditionalStrings() { - String[] trueStrings = {"sure"}; - String[] falseStrings = {"nope"}; - BooleanConverter converter = new BooleanConverter( + final String[] trueStrings = {"sure"}; + final String[] falseStrings = {"nope"}; + final BooleanConverter converter = new BooleanConverter( trueStrings, falseStrings, BooleanConverter.NO_DEFAULT); testConversionValues( converter, @@ -84,13 +84,13 @@ public class BooleanConverterTestCase ex try { converter.convert(Boolean.class, "true"); fail("Converting obsolete true value should have generated an exception"); - } catch (ConversionException expected) { + } catch (final ConversionException expected) { // Exception is successful test } try { converter.convert(Boolean.class, "bogus"); fail("Converting invalid string should have generated an exception"); - } catch (ConversionException expected) { + } catch (final ConversionException expected) { // Exception is successful test } } @@ -99,11 +99,11 @@ public class BooleanConverterTestCase ex * Tests a conversion to another target type. This should not be possible. */ public void testConversionToOtherType() { - BooleanConverter converter = new BooleanConverter(); + final BooleanConverter converter = new BooleanConverter(); try { converter.convert(Integer.class, STANDARD_TRUES[0]); fail("Could convert to unsupported type!"); - } catch (ConversionException cex) { + } catch (final ConversionException cex) { // Expected result } } @@ -112,12 +112,12 @@ public class BooleanConverterTestCase ex * Tests whether a conversion to a primitive boolean is possible. */ public void testPrimitiveTargetClass() { - BooleanConverter converter = new BooleanConverter(); + final BooleanConverter converter = new BooleanConverter(); assertTrue("Wrong result", converter.convert(Boolean.TYPE, STANDARD_TRUES[0])); } - protected void testConversionValues(BooleanConverter converter, - String[] trueValues, String[] falseValues) { + protected void testConversionValues(final BooleanConverter converter, + final String[] trueValues, final String[] falseValues) { for (int i = 0; i < trueValues.length; i++) { assertEquals(Boolean.TRUE, converter.convert(Boolean.class, trueValues[i])); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -34,7 +34,7 @@ public class ByteConverterTestCase exten // ------------------------------------------------------------------------ - public ByteConverterTestCase(String name) { + public ByteConverterTestCase(final String name) { super(name); } @@ -66,7 +66,7 @@ public class ByteConverterTestCase exten } @Override - protected NumberConverter makeConverter(Object defaultValue) { + protected NumberConverter makeConverter(final Object defaultValue) { return new ByteConverter(defaultValue); } @Override @@ -77,7 +77,7 @@ public class ByteConverterTestCase exten // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String", @@ -93,7 +93,7 @@ public class ByteConverterTestCase exten "from Double" }; - Object[] input = { + final Object[] input = { String.valueOf(Byte.MIN_VALUE), "-17", "-1", @@ -109,7 +109,7 @@ public class ByteConverterTestCase exten new Double(12.2) }; - Byte[] expected = { + final Byte[] expected = { new Byte(Byte.MIN_VALUE), new Byte((byte)-17), new Byte((byte)-1), @@ -136,13 +136,13 @@ public class ByteConverterTestCase exten * Test Invalid Amounts (too big/small) */ public void testInvalidAmount() { - Converter converter = makeConverter(); - Class<?> clazz = Byte.class; + final Converter converter = makeConverter(); + final Class<?> clazz = Byte.class; - Long min = new Long(Byte.MIN_VALUE); - Long max = new Long(Byte.MAX_VALUE); - Long minMinusOne = new Long(min.longValue() - 1); - Long maxPlusOne = new Long(max.longValue() + 1); + final Long min = new Long(Byte.MIN_VALUE); + final Long max = new Long(Byte.MAX_VALUE); + final Long minMinusOne = new Long(min.longValue() - 1); + final Long maxPlusOne = new Long(max.longValue() + 1); // Minimum assertEquals("Minimum", new Byte(Byte.MIN_VALUE), converter.convert(clazz, min)); @@ -154,7 +154,7 @@ public class ByteConverterTestCase exten try { assertEquals("Minimum - 1", null, converter.convert(clazz, minMinusOne)); fail("Less than minimum, expected ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } @@ -162,7 +162,7 @@ public class ByteConverterTestCase exten try { assertEquals("Maximum + 1", null, converter.convert(clazz, maxPlusOne)); fail("More than maximum, expected ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -31,7 +31,7 @@ public class CalendarConverterTestCase e * Construct a new Calendar test case. * @param name Test Name */ - public CalendarConverterTestCase(String name) { + public CalendarConverterTestCase(final String name) { super(name); } @@ -61,7 +61,7 @@ public class CalendarConverterTestCase e * @return A new Converter */ @Override - protected DateTimeConverter makeConverter(Object defaultValue) { + protected DateTimeConverter makeConverter(final Object defaultValue) { return new CalendarConverter(defaultValue); } @@ -81,7 +81,7 @@ public class CalendarConverterTestCase e * @return The converted value */ @Override - protected Object toType(Calendar value) { + protected Object toType(final Calendar value) { return value; } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -33,7 +33,7 @@ public class CharacterConverterTestCase * Construct a new Character Converter test case. * @param name Test Name */ - public CharacterConverterTestCase(String name) { + public CharacterConverterTestCase(final String name) { super(name); } @@ -65,7 +65,7 @@ public class CharacterConverterTestCase */ public void testConvertToString() { - Converter converter = new CharacterConverter(); + final Converter converter = new CharacterConverter(); assertEquals("Character Test", "N", converter.convert(String.class, new Character('N'))); assertEquals("String Test", "F", converter.convert(String.class, "FOO")); @@ -77,7 +77,7 @@ public class CharacterConverterTestCase * Test Conversion to Character */ public void testConvertToCharacter() { - Converter converter = new CharacterConverter(); + final Converter converter = new CharacterConverter(); assertEquals("Character Test", new Character('N'), converter.convert(Character.class, new Character('N'))); assertEquals("String Test", new Character('F'), converter.convert(Character.class, "FOO")); assertEquals("Integer Test", new Character('3'), converter.convert(Character.class, new Integer(321))); @@ -87,7 +87,7 @@ public class CharacterConverterTestCase * Tests whether the primitive char class can be passed as target type. */ public void testConvertToChar() { - Converter converter = new CharacterConverter(); + final Converter converter = new CharacterConverter(); assertEquals("Wrong result", new Character('F'), converter.convert(Character.TYPE, "FOO")); } @@ -96,11 +96,11 @@ public class CharacterConverterTestCase * provided. */ public void testConvertToCharacterNullNoDefault() { - Converter converter = new CharacterConverter(); + final Converter converter = new CharacterConverter(); try { converter.convert(Character.class, null); fail("Expected a ConversionException for null value"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } } @@ -109,7 +109,7 @@ public class CharacterConverterTestCase * Test Conversion to Character (with default) */ public void testDefault() { - Converter converter = new CharacterConverter("C"); + final Converter converter = new CharacterConverter("C"); assertEquals("Default Test", new Character('C'), converter.convert(Character.class, null)); } @@ -117,11 +117,11 @@ public class CharacterConverterTestCase * Tries a conversion to an unsupported type. */ public void testConvertToUnsupportedType() { - Converter converter = new CharacterConverter(); + final Converter converter = new CharacterConverter(); try { converter.convert(Integer.class, "Test"); fail("Could convert to unsupported type!"); - } catch (ConversionException cex) { + } catch (final ConversionException cex) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -33,7 +33,7 @@ public class ClassConverterTestCase exte * Construct a new Class Converter test case. * @param name Test Name */ - public ClassConverterTestCase(String name) { + public ClassConverterTestCase(final String name) { super(name); } @@ -64,7 +64,7 @@ public class ClassConverterTestCase exte * Test Conversion to String */ public void testConvertToString() { - Converter converter = new ClassConverter(); + final Converter converter = new ClassConverter(); assertEquals("Class Test", "java.lang.Integer", converter.convert(String.class, Integer.class)); assertEquals("Value Test", "foo", converter.convert(String.class, "foo")); @@ -76,7 +76,7 @@ public class ClassConverterTestCase exte * Test Conversion to Class */ public void testConvertToClass() { - Converter converter = new ClassConverter(); + final Converter converter = new ClassConverter(); assertEquals("Class Test", Integer.class, converter.convert(Class.class, Integer.class)); assertEquals("String Test", Integer.class, converter.convert(Class.class, "java.lang.Integer")); @@ -86,7 +86,7 @@ public class ClassConverterTestCase exte try { converter.convert(Class.class, new Integer(6)); fail("Expected invalid value to fail"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } @@ -94,7 +94,7 @@ public class ClassConverterTestCase exte try { converter.convert(Class.class, null); fail("Expected null value to fail"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } } @@ -104,7 +104,7 @@ public class ClassConverterTestCase exte */ public void testConvertToClassDefault() { - Converter converter = new ClassConverter(Object.class); + final Converter converter = new ClassConverter(Object.class); assertEquals("Invalid Test", Object.class, converter.convert(Class.class, new Integer(6))); assertEquals("Null Test", Object.class, converter.convert(Class.class, null)); @@ -115,7 +115,7 @@ public class ClassConverterTestCase exte */ public void testConvertToClassDefaultNull() { - Converter converter = new ClassConverter(null); + final Converter converter = new ClassConverter(null); assertEquals("Invalid Test", null, converter.convert(Class.class, new Integer(6))); assertEquals("Null Test", null, converter.convert(Class.class, null)); @@ -125,7 +125,7 @@ public class ClassConverterTestCase exte * Test Array Conversion */ public void testArray() { - Converter converter = new ClassConverter(); + final Converter converter = new ClassConverter(); // Test Array Class to String assertEquals("Array to String", "[Ljava.lang.Boolean;", converter.convert(String.class, Boolean[].class)); @@ -139,13 +139,13 @@ public class ClassConverterTestCase exte * Test Invalid */ public void testInvalid() { - Converter converter = new ClassConverter(); + final Converter converter = new ClassConverter(); // Test invalid class name try { converter.convert(Class.class, "foo.bar"); fail("Invalid class name, expected ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } } @@ -154,11 +154,11 @@ public class ClassConverterTestCase exte * Tries a conversion to an unsupported target type. */ public void testUnsupportedTargetType() { - Converter converter = new ClassConverter(); + final Converter converter = new ClassConverter(); try { converter.convert(Integer.class, getClass().getName()); fail("Invalid target class not detected!"); - } catch (ConversionException cex) { + } catch (final ConversionException cex) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java Wed Oct 15 20:15:17 2014 @@ -47,7 +47,7 @@ import java.io.InputStream; */ public class ClassReloader extends ClassLoader { - public ClassReloader(ClassLoader parent) { + public ClassReloader(final ClassLoader parent) { super(parent); } @@ -55,19 +55,19 @@ public class ClassReloader extends Class * Given a class already in the classpath of a parent classloader, * reload that class via this classloader. */ - public Class<?> reload(Class<?> clazz) throws FileNotFoundException, IOException { - String className = clazz.getName(); - String classFile = className.replace('.', '/') + ".class"; - InputStream classStream = getParent().getResourceAsStream(classFile); + public Class<?> reload(final Class<?> clazz) throws FileNotFoundException, IOException { + final String className = clazz.getName(); + final String classFile = className.replace('.', '/') + ".class"; + final InputStream classStream = getParent().getResourceAsStream(classFile); if (classStream == null) { throw new FileNotFoundException(classFile); } - byte[] buf = new byte[1024]; - ByteArrayOutputStream baos = new ByteArrayOutputStream(); + final byte[] buf = new byte[1024]; + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); for(;;) { - int bytesRead = classStream.read(buf); + final int bytesRead = classStream.read(buf); if (bytesRead == -1) { break; } @@ -75,10 +75,10 @@ public class ClassReloader extends Class } classStream.close(); - byte[] classData = baos.toByteArray(); + final byte[] classData = baos.toByteArray(); // now we have the raw class data, let's turn it into a class - Class<?> newClass = defineClass(className, classData, 0, classData.length); + final Class<?> newClass = defineClass(className, classData, 0, classData.length); resolveClass(newClass); return newClass; } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java Wed Oct 15 20:15:17 2014 @@ -30,7 +30,7 @@ public class ClassReloaderTestCase exten // ------------------------------------------------------------------------ - public ClassReloaderTestCase(String name) { + public ClassReloaderTestCase(final String name) { super(name); } @@ -48,11 +48,11 @@ public class ClassReloaderTestCase exten * Test basic operation of the ClassReloader. */ public void testBasicOperation() throws Exception { - ClassLoader sharedLoader = this.getClass().getClassLoader(); - ClassReloader componentLoader = new ClassReloader(sharedLoader); + final ClassLoader sharedLoader = this.getClass().getClassLoader(); + final ClassReloader componentLoader = new ClassReloader(sharedLoader); - Class<?> sharedClass = DummyClass.class; - Class<?> componentClass = componentLoader.reload(sharedClass); + final Class<?> sharedClass = DummyClass.class; + final Class<?> componentClass = componentLoader.reload(sharedClass); // the two Class objects contain the same bytecode, but are not equal assertTrue(sharedClass != componentClass); @@ -63,8 +63,8 @@ public class ClassReloaderTestCase exten assertTrue(sharedLoader != componentLoader); // verify that objects of these two types are not assignment-compatible - Object obj1 = sharedClass.newInstance(); - Object obj2 = componentClass.newInstance(); + final Object obj1 = sharedClass.newInstance(); + final Object obj2 = componentClass.newInstance(); assertTrue("Obj1 class incorrect", sharedClass.isInstance(obj1)); assertFalse("Obj1 class incorrect", componentClass.isInstance(obj1)); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java Wed Oct 15 20:15:17 2014 @@ -35,7 +35,7 @@ public class ConverterTestSuite { * Return the tests included in this test suite. */ public static Test suite() { - TestSuite testSuite = new TestSuite(); + final TestSuite testSuite = new TestSuite(); testSuite.addTestSuite(ArrayConverterTestCase.class); testSuite.addTestSuite(BigDecimalConverterTestCase.class); testSuite.addTestSuite(BigIntegerConverterTestCase.class); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java Wed Oct 15 20:15:17 2014 @@ -43,7 +43,7 @@ public abstract class DateConverterTestB * Construct a new test case. * @param name Name of the test */ - public DateConverterTestBase(String name) { + public DateConverterTestBase(final String name) { super(name); } @@ -85,7 +85,7 @@ public abstract class DateConverterTestB try { makeConverter().convert(getExpectedType(), null); fail("Expected ConversionException"); - } catch(ConversionException e) { + } catch(final ConversionException e) { // expected } } @@ -95,7 +95,7 @@ public abstract class DateConverterTestB * instance of getExpectedType(). */ public void testConvertDate() { - String[] message= { + final String[] message= { "from Date", "from Calendar", "from SQL Date", @@ -103,9 +103,9 @@ public abstract class DateConverterTestB "from SQL Timestamp" }; - long now = System.currentTimeMillis(); + final long now = System.currentTimeMillis(); - Object[] date = { + final Object[] date = { new Date(now), new java.util.GregorianCalendar(), new java.sql.Date(now), @@ -117,7 +117,7 @@ public abstract class DateConverterTestB ((GregorianCalendar)date[1]).setTime(new Date(now)); for (int i = 0; i < date.length; i++) { - Object val = makeConverter().convert(getExpectedType(), date[i]); + final Object val = makeConverter().convert(getExpectedType(), date[i]); assertNotNull("Convert " + message[i] + " should not be null", val); assertTrue("Convert " + message[i] + " should return a " + getExpectedType().getName(), getExpectedType().isInstance(val)); @@ -130,18 +130,18 @@ public abstract class DateConverterTestB * Test Default Type conversion (i.e. don't specify target type) */ public void testDefaultType() { - String pattern = "yyyy-MM-dd"; + final String pattern = "yyyy-MM-dd"; // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setPattern(pattern); // Valid String --> Type Conversion - String testString = "2006-10-29"; - Calendar calendar = toCalendar(testString, pattern, null); - Object expected = toType(calendar); + final String testString = "2006-10-29"; + final Calendar calendar = toCalendar(testString, pattern, null); + final Object expected = toType(calendar); - Object result = converter.convert(null, testString); + final Object result = converter.convert(null, testString); if (getExpectedType().equals(Calendar.class)) { assertTrue("TYPE ", getExpectedType().isAssignableFrom(result.getClass())); } else { @@ -159,12 +159,12 @@ public abstract class DateConverterTestB public void testDefaultStringToTypeConvert() { // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(false); try { converter.convert(getExpectedType(), "2006-10-23"); fail("Expected Conversion exception"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } @@ -175,15 +175,15 @@ public abstract class DateConverterTestB */ public void testStringConversion() { - String pattern = "yyyy-MM-dd"; + final String pattern = "yyyy-MM-dd"; // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setPattern(pattern); // Create Values - String expected = "2006-10-29"; - Calendar calendar = toCalendar(expected, pattern, null); + final String expected = "2006-10-29"; + final Calendar calendar = toCalendar(expected, pattern, null); // Type --> String Conversion stringConversion(converter, expected, toType(calendar)); @@ -213,16 +213,16 @@ public abstract class DateConverterTestB */ public void testPatternNoDefault() { - String pattern = "yyyy-MM-dd"; + final String pattern = "yyyy-MM-dd"; // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setPattern(pattern); // Valid String --> Type Conversion - String testString = "2006-10-29"; - Calendar calendar = toCalendar(testString, pattern, null); - Object expected = toType(calendar); + final String testString = "2006-10-29"; + final Calendar calendar = toCalendar(testString, pattern, null); + final Object expected = toType(calendar); validConversion(converter, expected, testString); // Valid java.util.Date --> Type Conversion @@ -256,17 +256,17 @@ public abstract class DateConverterTestB */ public void testPatternDefault() { - String pattern = "yyyy-MM-dd"; + final String pattern = "yyyy-MM-dd"; // Create & Configure the Converter - Object defaultValue = toType("2000-01-01", pattern, null); + final Object defaultValue = toType("2000-01-01", pattern, null); assertNotNull("Check default date", defaultValue); - DateTimeConverter converter = makeConverter(defaultValue); + final DateTimeConverter converter = makeConverter(defaultValue); converter.setPattern(pattern); // Valid String --> Type Conversion - String testString = "2006-10-29"; - Object expected = toType(testString, pattern, null); + final String testString = "2006-10-29"; + final Object expected = toType(testString, pattern, null); validConversion(converter, expected, testString); // Invalid Values, expect default value @@ -284,16 +284,16 @@ public abstract class DateConverterTestB */ public void testPatternNullDefault() { - String pattern = "yyyy-MM-dd"; + final String pattern = "yyyy-MM-dd"; // Create & Configure the Converter - Object defaultValue = null; - DateTimeConverter converter = makeConverter(defaultValue); + final Object defaultValue = null; + final DateTimeConverter converter = makeConverter(defaultValue); converter.setPattern(pattern); // Valid String --> Type Conversion - String testString = "2006-10-29"; - Object expected = toType(testString, pattern, null); + final String testString = "2006-10-29"; + final Object expected = toType(testString, pattern, null); validConversion(converter, expected, testString); // Invalid Values, expect default --> null @@ -314,8 +314,8 @@ public abstract class DateConverterTestB Object expected = null; // Create & Configure the Converter - String[] patterns = new String[] {"yyyy-MM-dd", "yyyy/MM/dd"}; - DateTimeConverter converter = makeConverter(); + final String[] patterns = new String[] {"yyyy-MM-dd", "yyyy/MM/dd"}; + final DateTimeConverter converter = makeConverter(); converter.setPatterns(patterns); // First Pattern @@ -340,18 +340,18 @@ public abstract class DateConverterTestB public void testLocale() { // Re-set the default Locale to Locale.US - Locale defaultLocale = Locale.getDefault(); + final Locale defaultLocale = Locale.getDefault(); Locale.setDefault(Locale.US); - String pattern = "M/d/yy"; // SHORT style date format for US Locale + final String pattern = "M/d/yy"; // SHORT style date format for US Locale // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(true); // Valid String --> Type Conversion - String testString = "10/28/06"; - Object expected = toType(testString, pattern, null); + final String testString = "10/28/06"; + final Object expected = toType(testString, pattern, null); validConversion(converter, expected, testString); // Invalid Conversions @@ -373,13 +373,13 @@ public abstract class DateConverterTestB public void testInvalidType() { // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); // Invalid Class Type try { converter.convert(Character.class, new Date()); fail("Requested Character.class conversion, expected ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } } @@ -390,16 +390,16 @@ public abstract class DateConverterTestB * @param expected The expected result * @param value The value to convert */ - void validConversion(Converter converter, Object expected, Object value) { - String valueType = (value == null ? "null" : value.getClass().getName()); - String msg = "Converting '" + valueType + "' value '" + value + "'"; + void validConversion(final Converter converter, final Object expected, final Object value) { + final String valueType = (value == null ? "null" : value.getClass().getName()); + final String msg = "Converting '" + valueType + "' value '" + value + "'"; try { - Object result = converter.convert(getExpectedType(), value); - Class<?> resultType = (result == null ? null : result.getClass()); - Class<?> expectType = (expected == null ? null : expected.getClass()); + final Object result = converter.convert(getExpectedType(), value); + final Class<?> resultType = (result == null ? null : result.getClass()); + final Class<?> expectType = (expected == null ? null : expected.getClass()); assertEquals("TYPE " + msg, expectType, resultType); assertEquals("VALUE " + msg, expected, result); - } catch (Exception ex) { + } catch (final Exception ex) { fail(msg + " threw " + ex.toString()); } } @@ -410,16 +410,16 @@ public abstract class DateConverterTestB * @param expected The expected result * @param value The value to convert */ - void stringConversion(Converter converter, String expected, Object value) { - String valueType = (value == null ? "null" : value.getClass().getName()); - String msg = "Converting '" + valueType + "' value '" + value + "' to String"; + void stringConversion(final Converter converter, final String expected, final Object value) { + final String valueType = (value == null ? "null" : value.getClass().getName()); + final String msg = "Converting '" + valueType + "' value '" + value + "' to String"; try { - Object result = converter.convert(String.class, value); - Class<?> resultType = (result == null ? null : result.getClass()); - Class<?> expectType = (expected == null ? null : expected.getClass()); + final Object result = converter.convert(String.class, value); + final Class<?> resultType = (result == null ? null : result.getClass()); + final Class<?> expectType = (expected == null ? null : expected.getClass()); assertEquals("TYPE " + msg, expectType, resultType); assertEquals("VALUE " + msg, expected, result); - } catch (Exception ex) { + } catch (final Exception ex) { fail(msg + " threw " + ex.toString()); } } @@ -429,13 +429,13 @@ public abstract class DateConverterTestB * @param converter The converter to use * @param value The value to convert */ - void invalidConversion(Converter converter, Object value) { - String valueType = (value == null ? "null" : value.getClass().getName()); - String msg = "Converting '" + valueType + "' value '" + value + "'"; + void invalidConversion(final Converter converter, final Object value) { + final String valueType = (value == null ? "null" : value.getClass().getName()); + final String msg = "Converting '" + valueType + "' value '" + value + "'"; try { - Object result = converter.convert(getExpectedType(), value); + final Object result = converter.convert(getExpectedType(), value); fail(msg + ", expected ConversionException, but result = '" + result + "'"); - } catch (ConversionException ex) { + } catch (final ConversionException ex) { // Expected Result } } @@ -447,8 +447,8 @@ public abstract class DateConverterTestB * @param locale The locale to use (or null) * @return parsed Calendar value */ - Object toType(String value, String pattern, Locale locale) { - Calendar calendar = toCalendar(value, pattern, locale); + Object toType(final String value, final String pattern, final Locale locale) { + final Calendar calendar = toCalendar(value, pattern, locale); return toType(calendar); } @@ -459,16 +459,16 @@ public abstract class DateConverterTestB * @param locale The locale to use (or null) * @return parsed Calendar value */ - Calendar toCalendar(String value, String pattern, Locale locale) { + Calendar toCalendar(final String value, final String pattern, final Locale locale) { Calendar calendar = null; try { - DateFormat format = (locale == null) + final DateFormat format = (locale == null) ? new SimpleDateFormat(pattern) : new SimpleDateFormat(pattern, locale); format.setLenient(false); format.parse(value); calendar = format.getCalendar(); - } catch (Exception e) { + } catch (final Exception e) { fail("Error creating Calendar value ='" + value + ", pattern='" + pattern + "' " + e.toString()); } @@ -480,7 +480,7 @@ public abstract class DateConverterTestB * @param calendar The calendar object to convert * @return The converted java.util.Date */ - Date toDate(Calendar calendar) { + Date toDate(final Calendar calendar) { return calendar.getTime(); } @@ -489,7 +489,7 @@ public abstract class DateConverterTestB * @param calendar The calendar object to convert * @return The converted java.sql.Date */ - java.sql.Date toSqlDate(Calendar calendar) { + java.sql.Date toSqlDate(final Calendar calendar) { return new java.sql.Date(getTimeInMillis(calendar)); } @@ -498,7 +498,7 @@ public abstract class DateConverterTestB * @param calendar The calendar object to convert * @return The converted java.sql.Time */ - java.sql.Time toSqlTime(Calendar calendar) { + java.sql.Time toSqlTime(final Calendar calendar) { return new java.sql.Time(getTimeInMillis(calendar)); } @@ -507,7 +507,7 @@ public abstract class DateConverterTestB * @param calendar The calendar object to convert * @return The converted java.sql.Timestamp */ - java.sql.Timestamp toSqlTimestamp(Calendar calendar) { + java.sql.Timestamp toSqlTimestamp(final Calendar calendar) { return new java.sql.Timestamp(getTimeInMillis(calendar)); } @@ -516,14 +516,14 @@ public abstract class DateConverterTestB * @param date The date or calendar object * @return The time in milliseconds */ - long getTimeInMillis(Object date) { + long getTimeInMillis(final Object date) { if (date instanceof java.sql.Timestamp) { // ---------------------- JDK 1.3 Fix ---------------------- // N.B. Prior to JDK 1.4 the Timestamp's getTime() method // didn't include the milliseconds. The following code // ensures it works consistently accross JDK versions - java.sql.Timestamp timestamp = (java.sql.Timestamp)date; + final java.sql.Timestamp timestamp = (java.sql.Timestamp)date; long timeInMillis = ((timestamp.getTime() / 1000) * 1000); timeInMillis += timestamp.getNanos() / 1000000; return timeInMillis; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -32,7 +32,7 @@ public class DateConverterTestCase exten * Construct a new Date test case. * @param name Test Name */ - public DateConverterTestCase(String name) { + public DateConverterTestCase(final String name) { super(name); } @@ -73,7 +73,7 @@ public class DateConverterTestCase exten * @return A new Converter */ @Override - protected DateTimeConverter makeConverter(Object defaultValue) { + protected DateTimeConverter makeConverter(final Object defaultValue) { return new DateConverter(defaultValue); } @@ -93,7 +93,7 @@ public class DateConverterTestCase exten * @return The converted value */ @Override - protected Object toType(Calendar value) { + protected Object toType(final Calendar value) { return value.getTime(); } } \ No newline at end of file Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -34,7 +34,7 @@ public class DoubleConverterTestCase ext // ------------------------------------------------------------------------ - public DoubleConverterTestCase(String name) { + public DoubleConverterTestCase(final String name) { super(name); } @@ -66,7 +66,7 @@ public class DoubleConverterTestCase ext } @Override - protected NumberConverter makeConverter(Object defaultValue) { + protected NumberConverter makeConverter(final Object defaultValue) { return new DoubleConverter(defaultValue); } @@ -78,7 +78,7 @@ public class DoubleConverterTestCase ext // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String", @@ -94,7 +94,7 @@ public class DoubleConverterTestCase ext "from Double" }; - Object[] input = { + final Object[] input = { String.valueOf(Double.MIN_VALUE), "-17.2", "-1.1", @@ -110,7 +110,7 @@ public class DoubleConverterTestCase ext new Double(12.2) }; - Double[] expected = { + final Double[] expected = { new Double(Double.MIN_VALUE), new Double(-17.2), new Double(-1.1), Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -38,7 +38,7 @@ public class FileConverterTestCase exten // ------------------------------------------------------------------------ - public FileConverterTestCase(String name) { + public FileConverterTestCase(final String name) { super(name); } @@ -71,19 +71,19 @@ public class FileConverterTestCase exten // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String" }; - Object[] input = { + final Object[] input = { "/tmp", "/tmp/foo.txt", "/tmp/does/not/exist.foo" }; - File[] expected = { + final File[] expected = { new File("/tmp"), new File("/tmp/foo.txt"), new File("/tmp/does/not/exist.foo") @@ -102,7 +102,7 @@ public class FileConverterTestCase exten try { converter.convert(Integer.class, "/tmp"); fail("Could convert to unsupported type!"); - } catch (ConversionException cex) { + } catch (final ConversionException cex) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -34,7 +34,7 @@ public class FloatConverterTestCase exte // ------------------------------------------------------------------------ - public FloatConverterTestCase(String name) { + public FloatConverterTestCase(final String name) { super(name); } @@ -66,7 +66,7 @@ public class FloatConverterTestCase exte } @Override - protected NumberConverter makeConverter(Object defaultValue) { + protected NumberConverter makeConverter(final Object defaultValue) { return new FloatConverter(defaultValue); } @@ -78,7 +78,7 @@ public class FloatConverterTestCase exte // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String", @@ -94,7 +94,7 @@ public class FloatConverterTestCase exte "from Double" }; - Object[] input = { + final Object[] input = { String.valueOf(Float.MIN_VALUE), "-17.2", "-1.1", @@ -110,7 +110,7 @@ public class FloatConverterTestCase exte new Double(12.2), }; - Float[] expected = { + final Float[] expected = { new Float(Float.MIN_VALUE), new Float(-17.2), new Float(-1.1), @@ -150,11 +150,11 @@ public class FloatConverterTestCase exte * Test Invalid Amounts (too big/small) */ public void testInvalidAmount() { - Converter converter = makeConverter(); - Class<?> clazz = Float.class; + final Converter converter = makeConverter(); + final Class<?> clazz = Float.class; - Double max = new Double(Float.MAX_VALUE); - Double tooBig = new Double(Double.MAX_VALUE); + final Double max = new Double(Float.MAX_VALUE); + final Double tooBig = new Double(Double.MAX_VALUE); // Maximum assertEquals("Maximum", new Float(Float.MAX_VALUE), converter.convert(clazz, max)); @@ -163,7 +163,7 @@ public class FloatConverterTestCase exte try { assertEquals("Too Big", null, converter.convert(clazz, tooBig)); fail("More than maximum, expected ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -35,7 +35,7 @@ public class IntegerConverterTestCase ex // ------------------------------------------------------------------------ - public IntegerConverterTestCase(String name) { + public IntegerConverterTestCase(final String name) { super(name); } @@ -67,7 +67,7 @@ public class IntegerConverterTestCase ex } @Override - protected NumberConverter makeConverter(Object defaultValue) { + protected NumberConverter makeConverter(final Object defaultValue) { return new IntegerConverter(defaultValue); } @@ -79,7 +79,7 @@ public class IntegerConverterTestCase ex // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String", @@ -95,7 +95,7 @@ public class IntegerConverterTestCase ex "from Double" }; - Object[] input = { + final Object[] input = { String.valueOf(Integer.MIN_VALUE), "-17", "-1", @@ -111,7 +111,7 @@ public class IntegerConverterTestCase ex new Double(12.2) }; - Integer[] expected = { + final Integer[] expected = { new Integer(Integer.MIN_VALUE), new Integer(-17), new Integer(-1), @@ -138,13 +138,13 @@ public class IntegerConverterTestCase ex * Test Invalid Amounts (too big/small) */ public void testInvalidAmount() { - Converter converter = makeConverter(); - Class<?> clazz = Integer.class; + final Converter converter = makeConverter(); + final Class<?> clazz = Integer.class; - Long min = new Long(Integer.MIN_VALUE); - Long max = new Long(Integer.MAX_VALUE); - Long minMinusOne = new Long(min.longValue() - 1); - Long maxPlusOne = new Long(max.longValue() + 1); + final Long min = new Long(Integer.MIN_VALUE); + final Long max = new Long(Integer.MAX_VALUE); + final Long minMinusOne = new Long(min.longValue() - 1); + final Long maxPlusOne = new Long(max.longValue() + 1); // Minimum assertEquals("Minimum", new Integer(Integer.MIN_VALUE), converter.convert(clazz, min)); @@ -156,7 +156,7 @@ public class IntegerConverterTestCase ex try { assertEquals("Minimum - 1", null, converter.convert(clazz, minMinusOne)); fail("Less than minimum, expected ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } @@ -164,7 +164,7 @@ public class IntegerConverterTestCase ex try { assertEquals("Maximum + 1", null, converter.convert(clazz, maxPlusOne)); fail("More than maximum, expected ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } } @@ -173,11 +173,11 @@ public class IntegerConverterTestCase ex * Tests whether an invalid default object causes an exception. */ public void testInvalidDefaultObject() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); try { converter.setDefaultValue("notANumber"); fail("Invalid default value not detected!"); - } catch (ConversionException cex) { + } catch (final ConversionException cex) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -34,7 +34,7 @@ public class LongConverterTestCase exten // ------------------------------------------------------------------------ - public LongConverterTestCase(String name) { + public LongConverterTestCase(final String name) { super(name); } @@ -66,7 +66,7 @@ public class LongConverterTestCase exten } @Override - protected NumberConverter makeConverter(Object defaultValue) { + protected NumberConverter makeConverter(final Object defaultValue) { return new LongConverter(defaultValue); } @@ -78,7 +78,7 @@ public class LongConverterTestCase exten // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String", @@ -94,7 +94,7 @@ public class LongConverterTestCase exten "from Double" }; - Object[] input = { + final Object[] input = { String.valueOf(Long.MIN_VALUE), "-17", "-1", @@ -110,7 +110,7 @@ public class LongConverterTestCase exten new Double(12.2) }; - Long[] expected = { + final Long[] expected = { new Long(Long.MIN_VALUE), new Long(-17), new Long(-1), Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java Wed Oct 15 20:15:17 2014 @@ -33,14 +33,14 @@ import org.apache.commons.beanutils.Conv public class MemoryTestCase extends TestCase { public void testWeakReference() throws Exception { - ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader(); + final ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader(); try { ClassReloader componentLoader = new ClassReloader(origContextClassLoader); Thread.currentThread().setContextClassLoader(componentLoader); Thread.currentThread().setContextClassLoader(origContextClassLoader); - WeakReference<ClassLoader> ref = new WeakReference<ClassLoader>(componentLoader); + final WeakReference<ClassLoader> ref = new WeakReference<ClassLoader>(componentLoader); componentLoader = null; forceGarbageCollection(ref); @@ -74,7 +74,7 @@ public class MemoryTestCase extends Test */ public void testComponentRegistersStandardConverter() throws Exception { - ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader(); + final ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader(); try { // sanity check; who's paranoid?? :-) assertEquals(origContextClassLoader, ConvertUtils.class.getClassLoader()); @@ -82,10 +82,10 @@ public class MemoryTestCase extends Test // create a custom classloader for a "component" // just like a container would. ClassLoader componentLoader1 = new ClassLoader() {}; - ClassLoader componentLoader2 = new ClassLoader() {}; + final ClassLoader componentLoader2 = new ClassLoader() {}; - Converter origFloatConverter = ConvertUtils.lookup(Float.TYPE); - Converter floatConverter1 = new FloatConverter(); + final Converter origFloatConverter = ConvertUtils.lookup(Float.TYPE); + final Converter floatConverter1 = new FloatConverter(); // Emulate the container invoking a component #1, and the component // registering a custom converter instance whose class is @@ -125,7 +125,7 @@ public class MemoryTestCase extends Test // Emulate a container "undeploying" component #1. This should // make component loader available for garbage collection (we hope) - WeakReference<ClassLoader> weakRefToComponent1 = new WeakReference<ClassLoader>(componentLoader1); + final WeakReference<ClassLoader> weakRefToComponent1 = new WeakReference<ClassLoader>(componentLoader1); componentLoader1 = null; // force garbage collection and verify that the componentLoader @@ -163,7 +163,7 @@ public class MemoryTestCase extends Test */ public void testComponentRegistersCustomConverter() throws Exception { - ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader(); + final ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader(); try { // sanity check; who's paranoid?? :-) assertEquals(origContextClassLoader, ConvertUtils.class.getClassLoader()); @@ -180,7 +180,7 @@ public class MemoryTestCase extends Test // Here we pretend we're running inside the component, and that // a class FloatConverter has been loaded from the component's // private classpath. - Class<?> newFloatConverterClass = componentLoader.reload(FloatConverter.class); + final Class<?> newFloatConverterClass = componentLoader.reload(FloatConverter.class); Object newFloatConverter = newFloatConverterClass.newInstance(); assertTrue(newFloatConverter.getClass().getClassLoader() == componentLoader); @@ -198,7 +198,7 @@ public class MemoryTestCase extends Test // After registering a custom converter, lookup should return // it back to us. We'll try this lookup again with a different // context-classloader set, and shouldn't see it - Converter componentConverter = ConvertUtils.lookup(Float.TYPE); + final Converter componentConverter = ConvertUtils.lookup(Float.TYPE); assertTrue(componentConverter.getClass().getClassLoader() == componentLoader); newFloatConverter = null; @@ -207,19 +207,19 @@ public class MemoryTestCase extends Test // Because the context classloader has been reset, we shouldn't // see the custom registered converter here... - Converter sharedConverter = ConvertUtils.lookup(Float.TYPE); + final Converter sharedConverter = ConvertUtils.lookup(Float.TYPE); assertFalse(sharedConverter.getClass().getClassLoader() == componentLoader); // and here we should see it again Thread.currentThread().setContextClassLoader(componentLoader); { - Converter componentConverter = ConvertUtils.lookup(Float.TYPE); + final Converter componentConverter = ConvertUtils.lookup(Float.TYPE); assertTrue(componentConverter.getClass().getClassLoader() == componentLoader); } Thread.currentThread().setContextClassLoader(origContextClassLoader); // Emulate a container "undeploying" the component. This should // make component loader available for garbage collection (we hope) - WeakReference<ClassLoader> weakRefToComponent = new WeakReference<ClassLoader>(componentLoader); + final WeakReference<ClassLoader> weakRefToComponent = new WeakReference<ClassLoader>(componentLoader); componentLoader = null; // force garbage collection and verify that the componentLoader @@ -255,7 +255,7 @@ public class MemoryTestCase extends Test * else we were not able to trigger garbage collection; there is no way * to tell these scenarios apart.</p> */ - private void forceGarbageCollection(WeakReference<?> target) { + private void forceGarbageCollection(final WeakReference<?> target) { int bytes = 2; while(target.get() != null) { @@ -268,9 +268,10 @@ public class MemoryTestCase extends Test // this easily-reclaimable memory! try { @SuppressWarnings("unused") + final byte[] b = new byte[bytes]; bytes = bytes * 2; - } catch(OutOfMemoryError e) { + } catch(final OutOfMemoryError e) { // well that sure should have forced a garbage collection // run to occur! break; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java Wed Oct 15 20:15:17 2014 @@ -41,7 +41,7 @@ public abstract class NumberConverterTes // ------------------------------------------------------------------------ - public NumberConverterTestBase(String name) { + public NumberConverterTestBase(final String name) { super(name); } @@ -60,7 +60,7 @@ public abstract class NumberConverterTes try { makeConverter().convert(getExpectedType(),null); fail("Expected ConversionException"); - } catch(ConversionException e) { + } catch(final ConversionException e) { // expected } } @@ -70,7 +70,7 @@ public abstract class NumberConverterTes * instance of getExpectedType(). */ public void testConvertNumber() { - String[] message= { + final String[] message= { "from Byte", "from Short", "from Integer", @@ -82,7 +82,7 @@ public abstract class NumberConverterTes "from Integer array", }; - Object[] number = { + final Object[] number = { new Byte((byte)7), new Short((short)8), new Integer(9), @@ -95,7 +95,7 @@ public abstract class NumberConverterTes }; for(int i=0;i<number.length;i++) { - Object val = makeConverter().convert(getExpectedType(),number[i]); + final Object val = makeConverter().convert(getExpectedType(),number[i]); assertNotNull("Convert " + message[i] + " should not be null",val); assertTrue( "Convert " + message[i] + " should return a " + getExpectedType().getName(), @@ -108,10 +108,10 @@ public abstract class NumberConverterTes public void testNumberToStringPattern() { // Re-set the default Locale to Locale.US - Locale defaultLocale = Locale.getDefault(); + final Locale defaultLocale = Locale.getDefault(); Locale.setDefault(Locale.US); - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); converter.setPattern("[0,0.0];(0,0.0)"); // Default Locale @@ -133,10 +133,10 @@ public abstract class NumberConverterTes public void testNumberToStringLocale() { // Re-set the default Locale to Locale.US - Locale defaultLocale = Locale.getDefault(); + final Locale defaultLocale = Locale.getDefault(); Locale.setDefault(Locale.US); - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); converter.setUseLocaleFormat(true); // Default Locale @@ -157,8 +157,8 @@ public abstract class NumberConverterTes */ public void testStringArrayToInteger() { - Integer defaultValue = new Integer(-1); - NumberConverter converter = makeConverter(defaultValue); + final Integer defaultValue = new Integer(-1); + final NumberConverter converter = makeConverter(defaultValue); // Default Locale assertEquals("Valid First", new Integer(5), converter.convert(Integer.class, new String[] {"5", "4", "3"})); @@ -172,7 +172,7 @@ public abstract class NumberConverterTes */ public void testNumberToStringDefault() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); // Default Number --> String conversion assertEquals("Default Convert " + numbers[0], numbers[0].toString(), converter.convert(String.class, numbers[0])); @@ -186,10 +186,10 @@ public abstract class NumberConverterTes public void testStringToNumberPattern() { // Re-set the default Locale to Locale.US - Locale defaultLocale = Locale.getDefault(); + final Locale defaultLocale = Locale.getDefault(); Locale.setDefault(Locale.US); - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); converter.setPattern("[0,0];(0,0)"); // Default Locale @@ -205,12 +205,12 @@ public abstract class NumberConverterTes try { converter.convert(getExpectedType(), "1,2"); fail("Expected invalid value to cause ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } // Invalid Type (will try via String) - Object obj = new Object() { + final Object obj = new Object() { @Override public String toString() { return "dsdgsdsdg"; @@ -219,7 +219,7 @@ public abstract class NumberConverterTes try { converter.convert(getExpectedType(), obj); fail("Expected invalid value to cause ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } @@ -233,10 +233,10 @@ public abstract class NumberConverterTes public void testStringToNumberLocale() { // Re-set the default Locale to Locale.US - Locale defaultLocale = Locale.getDefault(); + final Locale defaultLocale = Locale.getDefault(); Locale.setDefault(Locale.US); - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); converter.setUseLocaleFormat(true); // Default Locale @@ -247,7 +247,7 @@ public abstract class NumberConverterTes try { converter.convert(getExpectedType(), "0,02x"); fail("Expected invalid value to cause ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } @@ -260,7 +260,7 @@ public abstract class NumberConverterTes try { converter.convert(getExpectedType(), "0.02x"); fail("Expected invalid value to cause ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } @@ -273,7 +273,7 @@ public abstract class NumberConverterTes */ public void testStringToNumberDefault() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); converter.setUseLocaleFormat(false); // Default String --> Number conversion @@ -283,7 +283,7 @@ public abstract class NumberConverterTes try { converter.convert(getExpectedType(), "12x"); fail("Expected invalid value to cause ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } } @@ -293,7 +293,7 @@ public abstract class NumberConverterTes * default type should be used. */ public void testStringToNumberDefaultType() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); converter.setUseLocaleFormat(false); assertEquals("Default Convert " + numbers[0], numbers[0], converter.convert(null, numbers[0].toString())); @@ -304,7 +304,7 @@ public abstract class NumberConverterTes */ public void testBooleanToNumberDefault() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); // Other type --> String conversion assertEquals("Boolean.FALSE to Number ", 0, ((Number)converter.convert(getExpectedType(), Boolean.FALSE)).intValue()); @@ -317,10 +317,10 @@ public abstract class NumberConverterTes */ public void testDateToNumber() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); - Date dateValue = new Date(); - long longValue = dateValue.getTime(); + final Date dateValue = new Date(); + final long longValue = dateValue.getTime(); // Date --> Long conversion assertEquals("Date to Long", new Long(longValue), converter.convert(Long.class, dateValue)); @@ -329,7 +329,7 @@ public abstract class NumberConverterTes try { converter.convert(Integer.class, dateValue); fail("Date to Integer - expected a ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result - too large for Integer } @@ -340,10 +340,10 @@ public abstract class NumberConverterTes */ public void testCalendarToNumber() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); - Calendar calendarValue = Calendar.getInstance(); - long longValue = calendarValue.getTime().getTime(); + final Calendar calendarValue = Calendar.getInstance(); + final long longValue = calendarValue.getTime().getTime(); // Calendar --> Long conversion assertEquals("Calendar to Long", new Long(longValue), converter.convert(Long.class, calendarValue)); @@ -352,7 +352,7 @@ public abstract class NumberConverterTes try { converter.convert(Integer.class, calendarValue); fail("Calendar to Integer - expected a ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result - too large for Integer } @@ -363,7 +363,7 @@ public abstract class NumberConverterTes */ public void testOtherToStringDefault() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); // Other type --> String conversion assertEquals("Default Convert ", "ABC", converter.convert(String.class, new StringBuilder("ABC"))); @@ -375,8 +375,8 @@ public abstract class NumberConverterTes */ public void testInvalidDefault() { - Object defaultvalue = numbers[0]; - NumberConverter converter = makeConverter(defaultvalue); + final Object defaultvalue = numbers[0]; + final NumberConverter converter = makeConverter(defaultvalue); // Default String --> Number conversion assertEquals("Invalid null ", defaultvalue, converter.convert(getExpectedType(), null)); @@ -388,18 +388,18 @@ public abstract class NumberConverterTes */ public void testInvalidException() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); try { converter.convert(getExpectedType(), null); fail("Null test, expected ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } try { converter.convert(getExpectedType(), "XXXX"); fail("Invalid test, expected ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } } @@ -409,12 +409,12 @@ public abstract class NumberConverterTes */ public void testInvalidType() { - NumberConverter converter = makeConverter(); + final NumberConverter converter = makeConverter(); try { converter.convert(Object.class, numbers[0]); fail("Invalid type test, expected ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } } @@ -424,12 +424,12 @@ public abstract class NumberConverterTes */ public void testInvalidTypeWithDefault() { - NumberConverter converter = makeConverter(42); + final NumberConverter converter = makeConverter(42); try { converter.convert(Object.class, numbers[0]); fail("Invalid type with default test, expected ConversionException"); - } catch(ConversionException e) { + } catch(final ConversionException e) { // expected result } }
