Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -34,7 +34,7 @@ public class ShortConverterTestCase exte // ------------------------------------------------------------------------ - public ShortConverterTestCase(String name) { + public ShortConverterTestCase(final String name) { super(name); } @@ -66,7 +66,7 @@ public class ShortConverterTestCase exte } @Override - protected NumberConverter makeConverter(Object defaultValue) { + protected NumberConverter makeConverter(final Object defaultValue) { return new ShortConverter(defaultValue); } @@ -78,7 +78,7 @@ public class ShortConverterTestCase exte // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String", @@ -94,7 +94,7 @@ public class ShortConverterTestCase exte "from Double" }; - Object[] input = { + final Object[] input = { String.valueOf(Short.MIN_VALUE), "-17", "-1", @@ -110,7 +110,7 @@ public class ShortConverterTestCase exte new Double(12.2) }; - Short[] expected = { + final Short[] expected = { new Short(Short.MIN_VALUE), new Short((short)-17), new Short((short)-1), @@ -137,13 +137,13 @@ public class ShortConverterTestCase exte * Test Invalid Amounts (too big/small) */ public void testInvalidAmount() { - Converter converter = makeConverter(); - Class<?> clazz = Short.class; + final Converter converter = makeConverter(); + final Class<?> clazz = Short.class; - Long min = new Long(Short.MIN_VALUE); - Long max = new Long(Short.MAX_VALUE); - Long minMinusOne = new Long(min.longValue() - 1); - Long maxPlusOne = new Long(max.longValue() + 1); + final Long min = new Long(Short.MIN_VALUE); + final Long max = new Long(Short.MAX_VALUE); + final Long minMinusOne = new Long(min.longValue() - 1); + final Long maxPlusOne = new Long(max.longValue() + 1); // Minimum assertEquals("Minimum", new Short(Short.MIN_VALUE), converter.convert(clazz, min)); @@ -155,7 +155,7 @@ public class ShortConverterTestCase exte try { assertEquals("Minimum - 1", null, converter.convert(clazz, minMinusOne)); fail("Less than minimum, expected ConversionException"); - } catch (Exception e) { + } catch (final Exception e) { // expected result } @@ -163,7 +163,7 @@ public class ShortConverterTestCase exte 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/SqlDateConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -34,7 +34,7 @@ public class SqlDateConverterTestCase ex * Construct a new Date test case. * @param name Test Name */ - public SqlDateConverterTestCase(String name) { + public SqlDateConverterTestCase(final String name) { super(name); } @@ -57,12 +57,12 @@ public class SqlDateConverterTestCase ex public void testDefaultStringToTypeConvert() { // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(false); // Valid String --> java.sql.Date Conversion - String testString = "2006-05-16"; - Object expected = toType(testString, "yyyy-MM-dd", null); + final String testString = "2006-05-16"; + final Object expected = toType(testString, "yyyy-MM-dd", null); validConversion(converter, expected, testString); // Invalid String --> java.sql.Date Conversion @@ -75,15 +75,15 @@ public class SqlDateConverterTestCase ex public void testDefaultTypeToStringConvert() { // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(false); // Valid String --> java.sql.Date Conversion - String expected = "2006-05-16"; - Object testVal = toType(expected, "yyyy-MM-dd", null); + final String expected = "2006-05-16"; + final Object testVal = toType(expected, "yyyy-MM-dd", null); stringConversion(converter, expected, testVal); - Object result = converter.convert(String.class, new Integer(2)); + final Object result = converter.convert(String.class, new Integer(2)); assertEquals("Default toString()", "2", result); } @@ -102,7 +102,7 @@ public class SqlDateConverterTestCase ex * @return A new Converter */ @Override - protected DateTimeConverter makeConverter(Object defaultValue) { + protected DateTimeConverter makeConverter(final Object defaultValue) { return new SqlDateConverter(defaultValue); } @@ -122,7 +122,7 @@ public class SqlDateConverterTestCase ex * @return The converted value */ @Override - protected Object toType(Calendar value) { + protected Object toType(final Calendar value) { return new java.sql.Date(getTimeInMillis(value)); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -35,7 +35,7 @@ public class SqlTimeConverterTestCase ex * Construct a new Date test case. * @param name Test Name */ - public SqlTimeConverterTestCase(String name) { + public SqlTimeConverterTestCase(final String name) { super(name); } @@ -58,18 +58,18 @@ public class SqlTimeConverterTestCase ex 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 = "h:mm a"; // SHORT style time format for US Locale + final String pattern = "h:mm a"; // SHORT style time format for US Locale // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(true); // Valid String --> Type Conversion - String testString = "3:06 pm"; - Object expected = toType(testString, pattern, null); + final String testString = "3:06 pm"; + final Object expected = toType(testString, pattern, null); validConversion(converter, expected, testString); // Invalid Conversions @@ -97,12 +97,12 @@ public class SqlTimeConverterTestCase ex public void testDefaultStringToTypeConvert() { // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(false); // Valid String --> java.sql.Time Conversion - String testString = "15:36:21"; - Object expected = toType(testString, "HH:mm:ss", null); + final String testString = "15:36:21"; + final Object expected = toType(testString, "HH:mm:ss", null); validConversion(converter, expected, testString); // Invalid String --> java.sql.Time Conversion @@ -125,7 +125,7 @@ public class SqlTimeConverterTestCase ex * @return A new Converter */ @Override - protected DateTimeConverter makeConverter(Object defaultValue) { + protected DateTimeConverter makeConverter(final Object defaultValue) { return new SqlTimeConverter(defaultValue); } @@ -145,7 +145,7 @@ public class SqlTimeConverterTestCase ex * @return The converted value */ @Override - protected Object toType(Calendar value) { + protected Object toType(final Calendar value) { return new Time(getTimeInMillis(value)); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -35,7 +35,7 @@ public class SqlTimestampConverterTestCa * Construct a new Date test case. * @param name Test Name */ - public SqlTimestampConverterTestCase(String name) { + public SqlTimestampConverterTestCase(final String name) { super(name); } @@ -58,18 +58,18 @@ public class SqlTimestampConverterTestCa 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 h:mm a"; // SHORT style Date & Time format for US Locale + final String pattern = "M/d/yy h:mm a"; // SHORT style Date & Time format for US Locale // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(true); // Valid String --> Type Conversion - String testString = "3/21/06 3:06 pm"; - Object expected = toType(testString, pattern, null); + final String testString = "3/21/06 3:06 pm"; + final Object expected = toType(testString, pattern, null); validConversion(converter, expected, testString); // Invalid Conversions @@ -92,12 +92,12 @@ public class SqlTimestampConverterTestCa public void testDefaultStringToTypeConvert() { // Create & Configure the Converter - DateTimeConverter converter = makeConverter(); + final DateTimeConverter converter = makeConverter(); converter.setUseLocaleFormat(false); // Valid String --> java.sql.Timestamp Conversion - String testString = "2006-10-23 15:36:01.0"; - Object expected = toType(testString, "yyyy-MM-dd HH:mm:ss.S", null); + final String testString = "2006-10-23 15:36:01.0"; + final Object expected = toType(testString, "yyyy-MM-dd HH:mm:ss.S", null); validConversion(converter, expected, testString); // Invalid String --> java.sql.Timestamp Conversion @@ -122,7 +122,7 @@ public class SqlTimestampConverterTestCa * @return A new Converter */ @Override - protected DateTimeConverter makeConverter(Object defaultValue) { + protected DateTimeConverter makeConverter(final Object defaultValue) { return new SqlTimestampConverter(defaultValue); } @@ -142,7 +142,7 @@ public class SqlTimestampConverterTestCa * @return The converted value */ @Override - protected Object toType(Calendar value) { + protected Object toType(final Calendar value) { return new Timestamp(getTimeInMillis(value)); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -27,14 +27,14 @@ import junit.framework.TestCase; public class StringArrayConverterTestCase extends TestCase { - public StringArrayConverterTestCase(String name) { + public StringArrayConverterTestCase(final String name) { super(name); } public void testIntToString() { - int[] testArray = {1, 2, 3, 4, 5}; - String[] results = (String []) new StringArrayConverter().convert(String.class, testArray); + final int[] testArray = {1, 2, 3, 4, 5}; + final String[] results = (String []) new StringArrayConverter().convert(String.class, testArray); assertEquals("Incorrect results size", 5, results.length); assertEquals("Entry one is wrong", "1", results[0]); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -46,8 +46,8 @@ public class StringConverterTestCase ext * Tests a conversion to a string type. */ public void testConvertToTypeString() { - Object value = new Object(); - String strVal = converter.convert(String.class, value); + final Object value = new Object(); + final String strVal = converter.convert(String.class, value); assertEquals("Wrong conversion result", value.toString(), strVal); } @@ -58,7 +58,7 @@ public class StringConverterTestCase ext try { converter.convert(Integer.class, new Object()); fail("No conversion exception thrown!"); - } catch(ConversionException cex) { + } catch(final ConversionException cex) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -38,7 +38,7 @@ public class URLConverterTestCase extend // ------------------------------------------------------------------------ - public URLConverterTestCase(String name) { + public URLConverterTestCase(final String name) { super(name); } @@ -71,7 +71,7 @@ public class URLConverterTestCase extend // ------------------------------------------------------------------------ public void testSimpleConversion() throws Exception { - String[] message= { + final String[] message= { "from String", "from String", "from String", @@ -82,7 +82,7 @@ public class URLConverterTestCase extend "from String", }; - Object[] input = { + final Object[] input = { "http://www.apache.org";, "http://www.apache.org/";, "ftp://cvs.apache.org";, @@ -93,7 +93,7 @@ public class URLConverterTestCase extend "http://notreal.apache.org";, }; - URL[] expected = { + final URL[] expected = { new URL("http://www.apache.org";), new URL("http://www.apache.org/";), new URL("ftp://cvs.apache.org";), @@ -121,7 +121,7 @@ public class URLConverterTestCase extend try { converter.convert(Integer.class, "http://www.apache.org";); fail("Unsupported type could be converted!"); - } catch (ConversionException cex) { + } catch (final ConversionException cex) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java Wed Oct 15 20:15:17 2014 @@ -50,7 +50,7 @@ public class DefaultResolverTestCase ext * Construct a DefaultResolver Test Case. * @param name The name of the test */ - public DefaultResolverTestCase(String name) { + public DefaultResolverTestCase(final String name) { super(name); } @@ -91,7 +91,7 @@ public class DefaultResolverTestCase ext try { label = "Simple " + label(validProperties[i], i); assertEquals(label, -1, resolver.getIndex(validProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -101,7 +101,7 @@ public class DefaultResolverTestCase ext try { label = "Indexed " + label(validIndexProperties[i], i); assertEquals(label, validIndexValues[i], resolver.getIndex(validIndexProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -111,7 +111,7 @@ public class DefaultResolverTestCase ext try { label = "Mapped " + label(validMapProperties[i], i); assertEquals(label, -1, resolver.getIndex(validMapProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -119,33 +119,33 @@ public class DefaultResolverTestCase ext // Missing Index Value label = "Missing Index"; try { - int index = resolver.getIndex("foo[]"); + final int index = resolver.getIndex("foo[]"); fail(label + " expected IllegalArgumentException: " + index); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { assertEquals(label + " Error Message", "No Index Value", e.getMessage()); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " expected IllegalArgumentException: " + t); } // Malformed label = "Malformed"; try { - int index = resolver.getIndex("foo[12"); + final int index = resolver.getIndex("foo[12"); fail(label + " expected IllegalArgumentException: " + index); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { assertEquals(label + " Error Message", "Missing End Delimiter", e.getMessage()); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " expected IllegalArgumentException: " + t); } // Non-numeric label = "Malformed"; try { - int index = resolver.getIndex("foo[BAR]"); + final int index = resolver.getIndex("foo[BAR]"); fail(label + " expected IllegalArgumentException: " + index); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { assertEquals(label + " Error Message", "Invalid index value 'BAR'", e.getMessage()); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " expected IllegalArgumentException: " + t); } } @@ -161,7 +161,7 @@ public class DefaultResolverTestCase ext try { label = "Simple " + label(validProperties[i], i); assertEquals(label, null, resolver.getKey(validProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -171,7 +171,7 @@ public class DefaultResolverTestCase ext try { label = "Indexed " + label(validIndexProperties[i], i); assertEquals(label, null, resolver.getKey(validIndexProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -181,7 +181,7 @@ public class DefaultResolverTestCase ext try { label = "Mapped " + label(validMapProperties[i], i); assertEquals(label, validMapKeys[i], resolver.getKey(validMapProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -189,11 +189,11 @@ public class DefaultResolverTestCase ext // Malformed label = "Malformed"; try { - String key = resolver.getKey("foo(bar"); + final String key = resolver.getKey("foo(bar"); fail(label + " expected IllegalArgumentException: " + key); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { assertEquals(label + " Error Message", "Missing End Delimiter", e.getMessage()); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " expected IllegalArgumentException: " + t); } } @@ -209,7 +209,7 @@ public class DefaultResolverTestCase ext try { label = "Simple " + label(validProperties[i], i); assertFalse(label, resolver.isIndexed(validProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -219,7 +219,7 @@ public class DefaultResolverTestCase ext try { label = "Indexed " + label(validIndexProperties[i], i); assertTrue(label, resolver.isIndexed(validIndexProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -229,7 +229,7 @@ public class DefaultResolverTestCase ext try { label = "Mapped " + label(validMapProperties[i], i); assertFalse(label, resolver.isIndexed(validMapProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -246,7 +246,7 @@ public class DefaultResolverTestCase ext try { label = "Simple " + label(validProperties[i], i); assertFalse(label, resolver.isMapped(validProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -256,7 +256,7 @@ public class DefaultResolverTestCase ext try { label = "Indexed " + label(validIndexProperties[i], i); assertFalse(label, resolver.isMapped(validIndexProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -266,7 +266,7 @@ public class DefaultResolverTestCase ext try { label = "Mapped " + label(validMapProperties[i], i); assertTrue(label, resolver.isMapped(validMapProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -283,7 +283,7 @@ public class DefaultResolverTestCase ext try { label = "Simple " + label(validProperties[i], i); assertEquals(label, validNames[i], resolver.getProperty(validProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -293,7 +293,7 @@ public class DefaultResolverTestCase ext try { label = "Indexed " + label(validIndexProperties[i], i); assertEquals(label, validIndexNames[i], resolver.getProperty(validIndexProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -303,7 +303,7 @@ public class DefaultResolverTestCase ext try { label = "Mapped " + label(validMapProperties[i], i); assertEquals(label, validMapNames[i], resolver.getProperty(validMapProperties[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -318,7 +318,7 @@ public class DefaultResolverTestCase ext try { label = label(nextExpressions[i], i); assertEquals(label, nextProperties[i], resolver.next(nextExpressions[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } @@ -333,13 +333,13 @@ public class DefaultResolverTestCase ext try { label = label(nextExpressions[i], i); assertEquals(label, removeProperties[i], resolver.remove(nextExpressions[i])); - } catch (Throwable t) { + } catch (final Throwable t) { fail(label + " threw " + t); } } } - private String label(String expression, int i) { + private String label(final String expression, final int i) { return "Expression[" + i + "]=\"" + expression + "\""; } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java Wed Oct 15 20:15:17 2014 @@ -38,7 +38,7 @@ public class LocaleBeanUtilsTestCase ext * * @param name Name of the test case */ - public LocaleBeanUtilsTestCase(String name) { + public LocaleBeanUtilsTestCase(final String name) { super(name); } @@ -77,12 +77,12 @@ public class LocaleBeanUtilsTestCase ext * Test setting a nested simple property */ public void testSetNestedPropertySimple() { - TestBean bean = new TestBean(); + final TestBean bean = new TestBean(); bean.getNested().setIntProperty(5); assertEquals("Initial value 5", 5, bean.getNested().getIntProperty()); try { LocaleBeanUtils.setProperty(bean, "nested.intProperty", "123", null); - } catch (Throwable t) { + } catch (final Throwable t) { log.error(t); fail("Threw " + t); } @@ -93,12 +93,12 @@ public class LocaleBeanUtilsTestCase ext * Test setting a nested indexed property */ public void testSetNestedPropertyIndexed() { - TestBean bean = new TestBean(); + final TestBean bean = new TestBean(); bean.getNested().setIntIndexed(1, 51); assertEquals("Initial value[1] 51", 51, bean.getNested().getIntIndexed(1)); try { LocaleBeanUtils.setProperty(bean, "nested.intIndexed[1]", "123", null); - } catch (Throwable t) { + } catch (final Throwable t) { log.error(t); fail("Threw " + t); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java Wed Oct 15 20:15:17 2014 @@ -62,7 +62,7 @@ public class LocaleBeanificationTestCase * * @param name Name of the test case */ - public LocaleBeanificationTestCase(String name) { + public LocaleBeanificationTestCase(final String name) { super(name); } @@ -105,7 +105,7 @@ public class LocaleBeanificationTestCase // test methodology // many thanks to Juozas Baliuka for suggesting this method ClassLoader loader = new ClassLoader(this.getClass().getClassLoader()) {}; - WeakReference<ClassLoader> reference = new WeakReference<ClassLoader>(loader); + final WeakReference<ClassLoader> reference = new WeakReference<ClassLoader>(loader); Class<?> myClass = loader.loadClass("org.apache.commons.beanutils.BetaBean"); assertNotNull("Weak reference released early", reference.get()); @@ -126,7 +126,7 @@ public class LocaleBeanificationTestCase } else { // create garbage: - byte[] b = new byte[bytz]; + final byte[] b = new byte[bytz]; bytz = bytz * 2; } } @@ -143,13 +143,13 @@ public class LocaleBeanificationTestCase // many thanks to Juozas Baliuka for suggesting this methodology TestClassLoader loader = new TestClassLoader(); - ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); - WeakReference<ClassLoader> loaderReference = new WeakReference<ClassLoader>(loader, queue); + final ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); + final WeakReference<ClassLoader> loaderReference = new WeakReference<ClassLoader>(loader, queue); Integer test = new Integer(1); - WeakReference<Integer> testReference = new WeakReference<Integer>(test, queue); + final WeakReference<Integer> testReference = new WeakReference<Integer>(test, queue); //Map map = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.HARD, true); - Map<TestClassLoader, Integer> map = new WeakHashMap<TestClassLoader, Integer>(); + final Map<TestClassLoader, Integer> map = new WeakHashMap<TestClassLoader, Integer>(); map.put(loader, test); assertEquals("In map", test, map.get(loader)); @@ -176,7 +176,7 @@ public class LocaleBeanificationTestCase } else { // create garbage: - byte[] b = new byte[bytz]; + final byte[] b = new byte[bytz]; bytz = bytz * 2; } } @@ -191,7 +191,7 @@ public class LocaleBeanificationTestCase // many thanks to Juozas Baliuka for suggesting this methodology TestClassLoader loader = new TestClassLoader(); - WeakReference<TestClassLoader> loaderReference = new WeakReference<TestClassLoader>(loader); + final WeakReference<TestClassLoader> loaderReference = new WeakReference<TestClassLoader>(loader); LocaleBeanUtilsBean.getLocaleBeanUtilsInstance(); class GetBeanUtilsBeanThread extends Thread { @@ -217,14 +217,14 @@ public class LocaleBeanificationTestCase GetBeanUtilsBeanThread thread = new GetBeanUtilsBeanThread(); - WeakReference<GetBeanUtilsBeanThread> threadWeakReference = new WeakReference<GetBeanUtilsBeanThread>(thread); + final WeakReference<GetBeanUtilsBeanThread> threadWeakReference = new WeakReference<GetBeanUtilsBeanThread>(thread); thread.setContextClassLoader(loader); thread.start(); thread.join(); - WeakReference<LocaleBeanUtilsBean> beanUtilsReference = new WeakReference<LocaleBeanUtilsBean>(thread.beanUtils); - WeakReference<LocaleConvertUtilsBean> convertUtilsReference = new WeakReference<LocaleConvertUtilsBean>(thread.convertUtils); + final WeakReference<LocaleBeanUtilsBean> beanUtilsReference = new WeakReference<LocaleBeanUtilsBean>(thread.beanUtils); + final WeakReference<LocaleConvertUtilsBean> convertUtilsReference = new WeakReference<LocaleConvertUtilsBean>(thread.convertUtils); assertNotNull("Weak reference released early (1)", loaderReference.get()); assertNotNull("Weak reference released early (2)", beanUtilsReference.get()); @@ -252,7 +252,7 @@ public class LocaleBeanificationTestCase } else { // create garbage: - byte[] b = new byte[bytz]; + final byte[] b = new byte[bytz]; bytz = bytz * 2; } } @@ -268,7 +268,7 @@ public class LocaleBeanificationTestCase private final Signal signal; - GetBeanUtilsBeanThread(Signal signal) { + GetBeanUtilsBeanThread(final Signal signal) { this.signal = signal; } @@ -285,10 +285,10 @@ public class LocaleBeanificationTestCase } } - Signal signal = new Signal(); + final Signal signal = new Signal(); signal.setSignal(1); - GetBeanUtilsBeanThread thread = new GetBeanUtilsBeanThread(signal); + final GetBeanUtilsBeanThread thread = new GetBeanUtilsBeanThread(signal); thread.setContextClassLoader(new TestClassLoader()); thread.start(); @@ -315,7 +315,7 @@ public class LocaleBeanificationTestCase private final Signal signal; private final ContextClassLoaderLocal<Integer> ccll; - CCLLTesterThread(Signal signal, ContextClassLoaderLocal<Integer> ccll) { + CCLLTesterThread(final Signal signal, final ContextClassLoaderLocal<Integer> ccll) { this.signal = signal; this.ccll = ccll; } @@ -333,14 +333,14 @@ public class LocaleBeanificationTestCase } } - ContextClassLoaderLocal<Integer> ccll = new ContextClassLoaderLocal<Integer>(); + final ContextClassLoaderLocal<Integer> ccll = new ContextClassLoaderLocal<Integer>(); ccll.set(1776); assertEquals("Start thread sets value", new Integer(1776), ccll.get()); - Signal signal = new Signal(); + final Signal signal = new Signal(); signal.setSignal(1); - CCLLTesterThread thread = new CCLLTesterThread(signal, ccll); + final CCLLTesterThread thread = new CCLLTesterThread(signal, ccll); thread.setContextClassLoader(new TestClassLoader()); thread.start(); @@ -358,7 +358,7 @@ public class LocaleBeanificationTestCase private final Signal signal; private final PrimitiveBean bean; - TestIndependenceThread(Signal signal, PrimitiveBean bean) { + TestIndependenceThread(final Signal signal, final PrimitiveBean bean) { this.signal = signal; this.bean = bean; } @@ -368,15 +368,15 @@ public class LocaleBeanificationTestCase try { signal.setSignal(3); LocaleConvertUtils.register(new LocaleConverter() { - public <T> T convert(Class<T> type, Object value) { + public <T> T convert(final Class<T> type, final Object value) { return ConvertUtils.primitiveToWrapper(type).cast(9); } - public <T> T convert(Class<T> type, Object value, String pattern) { + public <T> T convert(final Class<T> type, final Object value, final String pattern) { return ConvertUtils.primitiveToWrapper(type).cast(9); } }, Integer.TYPE, Locale.getDefault()); LocaleBeanUtils.setProperty(bean, "int", "1"); - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); signal.setException(e); } @@ -388,24 +388,24 @@ public class LocaleBeanificationTestCase } } - PrimitiveBean bean = new PrimitiveBean(); + final PrimitiveBean bean = new PrimitiveBean(); LocaleBeanUtils.setProperty(bean, "int", new Integer(1)); assertEquals("Wrong property value (1)", 1, bean.getInt()); LocaleConvertUtils.register(new LocaleConverter() { - public <T> T convert(Class<T> type, Object value) { + public <T> T convert(final Class<T> type, final Object value) { return ConvertUtils.primitiveToWrapper(type).cast(5); } - public <T> T convert(Class<T> type, Object value, String pattern) { + public <T> T convert(final Class<T> type, final Object value, final String pattern) { return ConvertUtils.primitiveToWrapper(type).cast(5); } }, Integer.TYPE, Locale.getDefault()); LocaleBeanUtils.setProperty(bean, "int", "1"); assertEquals("Wrong property value(2)", 5, bean.getInt()); - Signal signal = new Signal(); + final Signal signal = new Signal(); signal.setSignal(1); - TestIndependenceThread thread = new TestIndependenceThread(signal, bean); + final TestIndependenceThread thread = new TestIndependenceThread(signal, bean); thread.setContextClassLoader(new TestClassLoader()); thread.start(); @@ -425,7 +425,7 @@ public class LocaleBeanificationTestCase private final Signal signal; private final LocaleBeanUtilsBean bean; - SetInstanceTesterThread(Signal signal, LocaleBeanUtilsBean bean) { + SetInstanceTesterThread(final Signal signal, final LocaleBeanUtilsBean bean) { this.signal = signal; this.bean = bean; } @@ -443,13 +443,13 @@ public class LocaleBeanificationTestCase } } - Signal signal = new Signal(); + final Signal signal = new Signal(); signal.setSignal(1); - LocaleBeanUtilsBean beanOne = new LocaleBeanUtilsBean(); - LocaleBeanUtilsBean beanTwo = new LocaleBeanUtilsBean(); + final LocaleBeanUtilsBean beanOne = new LocaleBeanUtilsBean(); + final LocaleBeanUtilsBean beanTwo = new LocaleBeanUtilsBean(); - SetInstanceTesterThread thread = new SetInstanceTesterThread(signal, beanTwo); + final SetInstanceTesterThread thread = new SetInstanceTesterThread(signal, beanTwo); thread.setContextClassLoader(new TestClassLoader()); LocaleBeanUtilsBean.setInstance(beanOne); @@ -465,8 +465,8 @@ public class LocaleBeanificationTestCase /** Tests whether the unset method works*/ public void testContextClassLoaderUnset() throws Exception { - LocaleBeanUtilsBean beanOne = new LocaleBeanUtilsBean(); - ContextClassLoaderLocal<LocaleBeanUtilsBean> ccll = new ContextClassLoaderLocal<LocaleBeanUtilsBean>(); + final LocaleBeanUtilsBean beanOne = new LocaleBeanUtilsBean(); + final ContextClassLoaderLocal<LocaleBeanUtilsBean> ccll = new ContextClassLoaderLocal<LocaleBeanUtilsBean>(); ccll.set(beanOne); assertEquals("Start thread gets right instance", beanOne, ccll.get()); ccll.unset(); @@ -480,10 +480,10 @@ public class LocaleBeanificationTestCase try { // first use the default non-locale-aware converter try { - Long data = (Long) ConvertUtils.convert("777", Long.class); + final Long data = (Long) ConvertUtils.convert("777", Long.class); assertEquals("Standard format long converted ok", 777, data.longValue()); } - catch(ConversionException ex) { + catch(final ConversionException ex) { fail("Unable to convert non-locale-aware number 777"); } @@ -492,10 +492,10 @@ public class LocaleBeanificationTestCase // This conversion will cause an error. But the default // Long converter is set up to return a default value of // zero on error. - Long data = (Long) ConvertUtils.convert("1.000.000", Long.class); + final Long data = (Long) ConvertUtils.convert("1.000.000", Long.class); assertEquals("Standard format behaved as expected", 0, data.longValue()); } - catch(ConversionException ex) { + catch(final ConversionException ex) { fail("Unexpected exception from standard Long converter."); } @@ -505,13 +505,13 @@ public class LocaleBeanificationTestCase // using a dot character (and comma is the decimal-point indicator). try { - Locale germanLocale = Locale.GERMAN; - LongLocaleConverter longLocaleConverter = new LongLocaleConverter(germanLocale); + final Locale germanLocale = Locale.GERMAN; + final LongLocaleConverter longLocaleConverter = new LongLocaleConverter(germanLocale); ConvertUtils.register(longLocaleConverter, Long.class); - Long data = (Long) ConvertUtils.convert("1.000.000", Long.class); + final Long data = (Long) ConvertUtils.convert("1.000.000", Long.class); assertEquals("German-format long converted ok", 1000000, data.longValue()); - } catch(ConversionException ex) { + } catch(final ConversionException ex) { fail("Unable to convert german-format number"); } } finally { @@ -539,7 +539,7 @@ public class LocaleBeanificationTestCase return e; } - public void setException(Exception e) { + public void setException(final Exception e) { this.e = e; } @@ -547,7 +547,7 @@ public class LocaleBeanificationTestCase return signal; } - public void setSignal(int signal) { + public void setSignal(final int signal) { this.signal = signal; } @@ -555,7 +555,7 @@ public class LocaleBeanificationTestCase return marker; } - public void setMarkerObject(Object marker) { + public void setMarkerObject(final Object marker) { this.marker = marker; } @@ -563,7 +563,7 @@ public class LocaleBeanificationTestCase return bean; } - public void setBean(LocaleBeanUtilsBean bean) { + public void setBean(final LocaleBeanUtilsBean bean) { this.bean = bean; } @@ -571,7 +571,7 @@ public class LocaleBeanificationTestCase return convertUtils; } - public void setConvertUtils(LocaleConvertUtilsBean convertUtils) { + public void setConvertUtils(final LocaleConvertUtilsBean convertUtils) { this.convertUtils = convertUtils; } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java Wed Oct 15 20:15:17 2014 @@ -45,7 +45,7 @@ public class LocaleConvertTestSuite { * Return the tests included in this test suite. */ public static Test suite() { - TestSuite testSuite = new TestSuite(); + final TestSuite testSuite = new TestSuite(); testSuite.addTestSuite(LocaleConvertUtilsTestCase.class); testSuite.addTestSuite(LocaleBeanificationTestCase.class); testSuite.addTestSuite(BigDecimalLocaleConverterTestCase.class); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java Wed Oct 15 20:15:17 2014 @@ -55,7 +55,7 @@ public class LocaleConvertUtilsTestCase * * @param name Name of the test case */ - public LocaleConvertUtilsTestCase(String name) { + public LocaleConvertUtilsTestCase(final String name) { super(name); } @@ -71,8 +71,8 @@ public class LocaleConvertUtilsTestCase LocaleConvertUtils.deregister(); - NumberFormat nf = DecimalFormat.getNumberInstance(); - String result = nf.format(1.1); + final NumberFormat nf = DecimalFormat.getNumberInstance(); + final String result = nf.format(1.1); // could be commas instead of stops in Europe. m_decimalSeparator = result.charAt(1); @@ -109,7 +109,7 @@ public class LocaleConvertUtilsTestCase fail("Array conversions not implemented yet."); Object value = null; - int intArray[] = new int[0]; + final int intArray[] = new int[0]; value = LocaleConvertUtils.convert((String) null, intArray.getClass()); checkIntegerArray(value, intArray); @@ -147,14 +147,14 @@ public class LocaleConvertUtilsTestCase try { LocaleConvertUtils.convert("foo", Byte.TYPE); fail("Should have thrown conversion exception (1)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Byte.class); fail("Should have thrown conversion exception (2)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } @@ -170,70 +170,70 @@ public class LocaleConvertUtilsTestCase try { LocaleConvertUtils.convert("foo", Double.TYPE); fail("Should have thrown conversion exception (3)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Double.class); fail("Should have thrown conversion exception (4)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Float.TYPE); fail("Should have thrown conversion exception (5)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Float.class); fail("Should have thrown conversion exception (6)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Integer.TYPE); fail("Should have thrown conversion exception (7)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Integer.class); fail("Should have thrown conversion exception (8)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Byte.TYPE); fail("Should have thrown conversion exception (9)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Long.class); fail("Should have thrown conversion exception (10)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Short.TYPE); fail("Should have thrown conversion exception (11)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } try { LocaleConvertUtils.convert("foo", Short.class); fail("Should have thrown conversion exception (12)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // Expected result } @@ -248,7 +248,7 @@ public class LocaleConvertUtilsTestCase fail("Array conversions not implemented yet."); Object value = null; - String stringArray[] = new String[0]; + final String stringArray[] = new String[0]; value = LocaleConvertUtils.convert((String) null, stringArray.getClass()); checkStringArray(value, stringArray); @@ -261,12 +261,12 @@ public class LocaleConvertUtilsTestCase public void fixmetestObjectToStringArray() { fail("Array conversions not implemented yet."); - int intArray0[] = new int[0]; - int intArray1[] = {123}; - int intArray2[] = {123, 456}; - String stringArray0[] = new String[0]; - String stringArray1[] = {"abc"}; - String stringArray2[] = {"abc", "def"}; + final int intArray0[] = new int[0]; + final int intArray1[] = {123}; + final int intArray2[] = {123, 456}; + final String stringArray0[] = new String[0]; + final String stringArray1[] = {"abc"}; + final String stringArray2[] = {"abc", "def"}; assertEquals("intArray0", null, LocaleConvertUtils.convert(intArray0)); @@ -323,19 +323,19 @@ public class LocaleConvertUtilsTestCase fail("Array conversions not implemented yet."); - String values1[] = {"10", "20", "30"}; + final String values1[] = {"10", "20", "30"}; Object value = LocaleConvertUtils.convert(values1, Integer.TYPE); - int shape[] = new int[0]; + final int shape[] = new int[0]; assertEquals(shape.getClass(), value.getClass()); - int results1[] = (int[]) value; + final int results1[] = (int[]) value; assertEquals(results1[0], 10); assertEquals(results1[1], 20); assertEquals(results1[2], 30); - String values2[] = {"100", "200", "300"}; + final String values2[] = {"100", "200", "300"}; value = LocaleConvertUtils.convert(values2, shape.getClass()); assertEquals(shape.getClass(), value.getClass()); - int results2[] = (int[]) value; + final int results2[] = (int[]) value; assertEquals(results2[0], 100); assertEquals(results2[1], 200); assertEquals(results2[2], 300); @@ -350,9 +350,9 @@ public class LocaleConvertUtilsTestCase fail("Array conversions not implemented yet."); Object value = null; - int intArray[] = new int[0]; - int intArray1[] = new int[]{0}; - int intArray2[] = new int[]{0, 10}; + final int intArray[] = new int[0]; + final int intArray1[] = new int[]{0}; + final int intArray2[] = new int[]{0, 10}; value = LocaleConvertUtils.convert("{ }", intArray.getClass()); checkIntegerArray(value, intArray); @@ -546,10 +546,10 @@ public class LocaleConvertUtilsTestCase fail("Array conversions not implemented yet."); Object value = null; - String stringArray[] = new String[0]; - String stringArray1[] = new String[] + final String stringArray[] = new String[0]; + final String stringArray1[] = new String[] {"abc"}; - String stringArray2[] = new String[] + final String stringArray2[] = new String[] {"abc", "de,f"}; value = LocaleConvertUtils.convert("", stringArray.getClass()); @@ -602,7 +602,7 @@ public class LocaleConvertUtilsTestCase Object result = null; try { result = LocaleConvertUtils.convert("123", Integer.class, (Locale)null, "#,###"); - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); fail("Threw: " + e); } @@ -618,7 +618,7 @@ public class LocaleConvertUtilsTestCase Object result = null; try { result = LocaleConvertUtils.convert(new String[] {"123"}, Integer[].class, (Locale)null, "#,###"); - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); fail("Threw: " + e); } @@ -635,7 +635,7 @@ public class LocaleConvertUtilsTestCase * converters have been generified.) */ public void testDefaultToStringConversionUnsupportedType() { - Integer value = 20131101; + final Integer value = 20131101; assertEquals("Wrong result", value.toString(), LocaleConvertUtils.convert(value.toString(), getClass())); } @@ -643,12 +643,12 @@ public class LocaleConvertUtilsTestCase // -------------------------------------------------------- Private Methods - private void checkIntegerArray(Object value, int intArray[]) { + private void checkIntegerArray(final Object value, final int intArray[]) { assertNotNull("Returned value is not null", value); assertEquals("Returned value is int[]", intArray.getClass(), value.getClass()); - int results[] = (int[]) value; + final int results[] = (int[]) value; assertEquals("Returned array length", intArray.length, results.length); for (int i = 0; i < intArray.length; i++) { assertEquals("Returned array value " + i, @@ -658,12 +658,12 @@ public class LocaleConvertUtilsTestCase } - private void checkStringArray(Object value, String stringArray[]) { + private void checkStringArray(final Object value, final String stringArray[]) { assertNotNull("Returned value is not null", value); assertEquals("Returned value is String[]", stringArray.getClass(), value.getClass()); - String results[] = (String[]) value; + final String results[] = (String[]) value; assertEquals("Returned array length", stringArray.length, results.length); for (int i = 0; i < stringArray.length; i++) { Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -65,7 +65,7 @@ public class BaseLocaleConverterTestCase // ---------------------------------------------------------- Constructors - public BaseLocaleConverterTestCase(String name) { + public BaseLocaleConverterTestCase(final String name) { super(name); } @@ -139,19 +139,19 @@ public class BaseLocaleConverterTestCase /** * Test Converting Value WITH a pattern */ - protected void convertValueWithPattern(BaseLocaleConverter converter, Object value, String pattern, Object expectedValue) { + protected void convertValueWithPattern(final BaseLocaleConverter converter, final Object value, final String pattern, final Object expectedValue) { convertValueWithPattern(converter, "", value, pattern, expectedValue); } /** * Test Converting Value WITH a pattern */ - protected void convertValueWithPattern(BaseLocaleConverter converter, String msgId, Object value, String pattern, Object expectedValue) { + protected void convertValueWithPattern(final BaseLocaleConverter converter, final String msgId, final Object value, final String pattern, final Object expectedValue) { // Convert value with no pattern try { result = converter.convert(value, pattern); - } catch (Exception e) { + } catch (final Exception e) { fail("Pattern conversion threw " + msgId + " threw " + e); } assertEquals("Check conversion value with pattern " + msgId, expectedValue, result); @@ -161,19 +161,19 @@ public class BaseLocaleConverterTestCase /** * Test Converting Value WITHOUT a pattern */ - protected void convertValueNoPattern(BaseLocaleConverter converter, Object value, Object expectedValue) { + protected void convertValueNoPattern(final BaseLocaleConverter converter, final Object value, final Object expectedValue) { convertValueNoPattern(converter, "", value, expectedValue); } /** * Test Converting Value WITHOUT a pattern */ - protected void convertValueNoPattern(BaseLocaleConverter converter, String msgId, Object value, Object expectedValue) { + protected void convertValueNoPattern(final BaseLocaleConverter converter, final String msgId, final Object value, final Object expectedValue) { // Convert value with no pattern try { result = converter.convert(value); - } catch (Exception e) { + } catch (final Exception e) { fail("No Pattern conversion threw " + msgId + " threw " + e); } assertEquals("Check conversion value without pattern " + msgId, expectedValue, result); @@ -184,19 +184,19 @@ public class BaseLocaleConverterTestCase /** * Test Converting Value To a specified Type */ - protected void convertValueToType(BaseLocaleConverter converter, Class<?> clazz, Object value, String pattern, Object expectedValue) { + protected void convertValueToType(final BaseLocaleConverter converter, final Class<?> clazz, final Object value, final String pattern, final Object expectedValue) { convertValueToType(converter, "", clazz, value, pattern, expectedValue); } /** * Test Converting Value To a specified Type */ - protected void convertValueToType(BaseLocaleConverter converter, String msgId, Class<?> clazz, Object value, String pattern, Object expectedValue) { + protected void convertValueToType(final BaseLocaleConverter converter, final String msgId, final Class<?> clazz, final Object value, final String pattern, final Object expectedValue) { // Convert value with no pattern try { result = converter.convert(clazz, value, pattern); - } catch (Exception e) { + } catch (final Exception e) { fail("Type conversion threw " + msgId + " threw " + e); } assertEquals("Check conversion value to type " + msgId, expectedValue, result); @@ -206,19 +206,19 @@ public class BaseLocaleConverterTestCase /** * Test Converting Null value. */ - protected void convertNull(BaseLocaleConverter converter, Object expectedValue) { + protected void convertNull(final BaseLocaleConverter converter, final Object expectedValue) { convertNull(converter, "", expectedValue); } /** * Test Converting Null value. */ - protected void convertNull(BaseLocaleConverter converter, String msgId, Object expectedValue) { + protected void convertNull(final BaseLocaleConverter converter, final String msgId, final Object expectedValue) { // Convert value with no pattern try { result = converter.convert(null); - } catch (Exception e) { + } catch (final Exception e) { fail("Null conversion " + msgId + " threw " + e); } @@ -233,14 +233,14 @@ public class BaseLocaleConverterTestCase /** * Test Converting an invalid value. */ - protected void convertInvalid(BaseLocaleConverter converter, Object expectedValue) { + protected void convertInvalid(final BaseLocaleConverter converter, final Object expectedValue) { convertInvalid(converter, "", expectedValue); } /** * Test Converting an invalid value. */ - protected void convertInvalid(BaseLocaleConverter converter, String msgId, Object expectedValue) { + protected void convertInvalid(final BaseLocaleConverter converter, final String msgId, final Object expectedValue) { // Convert value with no pattern try { @@ -248,7 +248,7 @@ public class BaseLocaleConverterTestCase if (expectedValue == null) { fail("Expected ConversionException if no default value " + msgId); } - } catch (Exception e) { + } catch (final Exception e) { if (expectedValue != null) { fail("Expected default value " + msgId + " threw " + e); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -31,7 +31,7 @@ public class BigDecimalLocaleConverterTe // ---------------------------------------------------------- Constructors - public BigDecimalLocaleConverterTestCase(String name) { + public BigDecimalLocaleConverterTestCase(final String name) { super(name); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -33,7 +33,7 @@ public class BigIntegerLocaleConverterTe // ---------------------------------------------------------- Constructors - public BigIntegerLocaleConverterTestCase(String name) { + public BigIntegerLocaleConverterTestCase(final String name) { super(name); } @@ -270,7 +270,7 @@ public class BigIntegerLocaleConverterTe try { converter.convert(getClass(), "test", null); fail("Unsupported type not detected!"); - } catch (ConversionException cex) { + } catch (final ConversionException cex) { // expected result } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -28,7 +28,7 @@ public class ByteLocaleConverterTestCase // ---------------------------------------------------------- Constructors - public ByteLocaleConverterTestCase(String name) { + public ByteLocaleConverterTestCase(final String name) { super(name); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -48,7 +48,7 @@ public class DateLocaleConverterTestCase // ------------------------------------------------------------------------ - public DateLocaleConverterTestCase(String name) { + public DateLocaleConverterTestCase(final String name) { super(name); } @@ -62,15 +62,15 @@ public class DateLocaleConverterTestCase super.setUp(); - String version = System.getProperty("java.specification.version"); + final String version = System.getProperty("java.specification.version"); log.debug("JDK Version "+version); try { - SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); + final SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); expectedValue = format.parse("20041001"); defaultValue = format.parse("19670316"); - } catch (Exception ex) { + } catch (final Exception ex) { log.error("Error creating expected/default dates", ex); } @@ -92,12 +92,12 @@ public class DateLocaleConverterTestCase // are expecting - Locale.GERMAN and Locale.GERMANY, Locale.FRENCH all // returned the standard "English" pattern characters on my machine // for JDK 1.4 (JDK 1.3 was OK). The Austria/German locale was OK though - String expectedChars = "GuMtkHmsSEDFwWahKzZ"; - DateFormatSymbols localizedSymbols = new DateFormatSymbols(localizedLocale); - String localChars = localizedSymbols.getLocalPatternChars(); + final String expectedChars = "GuMtkHmsSEDFwWahKzZ"; + final DateFormatSymbols localizedSymbols = new DateFormatSymbols(localizedLocale); + final String localChars = localizedSymbols.getLocalPatternChars(); // different JDK versions seem to have different numbers of pattern characters - int lth = localChars.length() > expectedChars.length() ? expectedChars.length() : + final int lth = localChars.length() > expectedChars.length() ? expectedChars.length() : localChars.length() < expectedChars.length() ? localChars.length() : expectedChars.length(); validLocalDateSymbols = expectedChars.substring(0, lth).equals(localChars.substring(0, lth)); @@ -116,7 +116,7 @@ public class DateLocaleConverterTestCase public void testSetLenient() { // make sure that date format works as expected - SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd, yyyy", Locale.UK); + final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd, yyyy", Locale.UK); // test with no leniency dateFormat.setLenient(false); @@ -125,7 +125,7 @@ public class DateLocaleConverterTestCase dateFormat.parse("Feb 10, 2001"); - } catch (ParseException e) { + } catch (final ParseException e) { fail("Could not parse date (1) - " + e.getMessage()); } @@ -134,7 +134,7 @@ public class DateLocaleConverterTestCase dateFormat.parse("Feb 31, 2001"); fail("Parsed illegal date (1)"); - } catch (ParseException e) { + } catch (final ParseException e) { // that's what we expected } @@ -145,7 +145,7 @@ public class DateLocaleConverterTestCase dateFormat.parse("Feb 10, 2001"); - } catch (ParseException e) { + } catch (final ParseException e) { fail("Could not parse date (2) - " + e.getMessage()); } @@ -153,12 +153,12 @@ public class DateLocaleConverterTestCase dateFormat.parse("Feb 31, 2001"); - } catch (ParseException e) { + } catch (final ParseException e) { fail("Could not parse date (3) - " + e.getMessage()); } // now repeat tests for converter - DateLocaleConverter converter = new DateLocaleConverter(Locale.UK, "MMM dd, yyyy"); + final DateLocaleConverter converter = new DateLocaleConverter(Locale.UK, "MMM dd, yyyy"); // test with no leniency converter.setLenient(false); @@ -168,7 +168,7 @@ public class DateLocaleConverterTestCase converter.convert("Feb 10, 2001"); - } catch (ConversionException e) { + } catch (final ConversionException e) { fail("Could not parse date (4) - " + e.getMessage()); } @@ -178,7 +178,7 @@ public class DateLocaleConverterTestCase assertEquals("Set lenient failed", converter.isLenient(), false); fail("Parsed illegal date (2)"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // that's what we expected } @@ -190,7 +190,7 @@ public class DateLocaleConverterTestCase converter.convert("Feb 10, 2001"); - } catch (ConversionException e) { + } catch (final ConversionException e) { fail("Could not parse date (5) - " + e.getMessage()); } @@ -198,7 +198,7 @@ public class DateLocaleConverterTestCase converter.convert("Feb 31, 2001"); - } catch (ConversionException e) { + } catch (final ConversionException e) { fail("Could not parse date (6) - " + e.getMessage()); } } @@ -416,13 +416,13 @@ public class DateLocaleConverterTestCase try { converter.convert("01/10/2004", "dd-MM-yyyy"); - } catch (ConversionException e) { + } catch (final ConversionException e) { assertEquals("Parse Error", "Error parsing date '01/10/2004' at position=2", e.getMessage()); } try { converter.convert("01-10-2004X", "dd-MM-yyyy"); - } catch (ConversionException e) { + } catch (final ConversionException e) { assertEquals("Parse Length", "Date '01-10-2004X' contains unparsed characters from position=10", e.getMessage()); } @@ -441,7 +441,7 @@ public class DateLocaleConverterTestCase */ public void testCalendarObject() { converter = new DateLocaleConverter(defaultLocale); - java.util.Calendar calendar = java.util.Calendar.getInstance(); + final java.util.Calendar calendar = java.util.Calendar.getInstance(); calendar.setTime((java.util.Date)expectedValue); assertEquals("java.util.Calendar", expectedValue, converter.convert(calendar)); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -30,7 +30,7 @@ public class DoubleLocaleConverterTestCa // ---------------------------------------------------------- Constructors - public DoubleLocaleConverterTestCase(String name) { + public DoubleLocaleConverterTestCase(final String name) { super(name); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -35,7 +35,7 @@ public class FloatLocaleConverterTestCas // ---------------------------------------------------------- Constructors - public FloatLocaleConverterTestCase(String name) { + public FloatLocaleConverterTestCase(final String name) { super(name); } @@ -270,7 +270,7 @@ public class FloatLocaleConverterTestCas public void testFloatLimits() { converter = new FloatLocaleConverter(defaultLocale, defaultDecimalPattern); - DecimalFormat fmt = new DecimalFormat("#.#############################################################"); + final DecimalFormat fmt = new DecimalFormat("#.#############################################################"); assertEquals(new Float(-0.12), converter.convert("-0.12")); assertEquals("Positive Float.MAX_VALUE", new Float(Float.MAX_VALUE), converter.convert(fmt.format(Float.MAX_VALUE))); @@ -283,26 +283,26 @@ public class FloatLocaleConverterTestCas try { converter.convert(fmt.format((double)Float.MAX_VALUE * (double)10)); fail("Positive Too Large should throw ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } try { converter.convert(fmt.format((double)Float.MAX_VALUE * (double)-10)); fail("Negative Too Large should throw ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } try { converter.convert(fmt.format((double)Float.MIN_VALUE / (double)10)); fail("Positive Too Small should throw ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } try { converter.convert(fmt.format((double)Float.MIN_VALUE / (double)-10)); fail("Negative Too Small should throw ConversionException"); - } catch (ConversionException e) { + } catch (final ConversionException e) { // expected result } } @@ -312,9 +312,9 @@ public class FloatLocaleConverterTestCas */ public void testParseZero() { try { - Object result = LocaleConvertUtils.convert("0", Float.class, Locale.US, null); + final Object result = LocaleConvertUtils.convert("0", Float.class, Locale.US, null); assertEquals(new Float(0), result); - } catch (ConversionException e) { + } catch (final ConversionException e) { fail("Zero threw ConversionException: " + e); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -30,7 +30,7 @@ public class IntegerLocaleConverterTestC // ---------------------------------------------------------- Constructors - public IntegerLocaleConverterTestCase(String name) { + public IntegerLocaleConverterTestCase(final String name) { super(name); } @@ -267,7 +267,7 @@ public class IntegerLocaleConverterTestC // ------------- Construct using specified Locale -------- converter = new IntegerLocaleConverter(localizedLocale); - Integer value = new Integer(1234); + final Integer value = new Integer(1234); assertEquals("Convert Integer", value, converter.convert(value)); assertEquals("Convert Long", value, converter.convert(new Long(value.intValue()))); } @@ -277,9 +277,9 @@ public class IntegerLocaleConverterTestC */ public void testToPrimitiveType() { converter = new IntegerLocaleConverter(); - Integer value = 20131028; - Class<Integer> target = Integer.TYPE; - int result = converter.convert(target, (Object) value.toString()); + final Integer value = 20131028; + final Class<Integer> target = Integer.TYPE; + final int result = converter.convert(target, (Object) value.toString()); assertEquals("Wrong result", value.intValue(), result); } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -30,7 +30,7 @@ public class LongLocaleConverterTestCase // ---------------------------------------------------------- Constructors - public LongLocaleConverterTestCase(String name) { + public LongLocaleConverterTestCase(final String name) { super(name); } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java Wed Oct 15 20:15:17 2014 @@ -30,7 +30,7 @@ public class ShortLocaleConverterTestCas // ---------------------------------------------------------- Constructors - public ShortLocaleConverterTestCase(String name) { + public ShortLocaleConverterTestCase(final String name) { super(name); }
