You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/10/15 22:15:22 UTC
svn commit: r1632171 [17/20] - in /commons/proper/beanutils/trunk/src:
main/java/org/apache/commons/beanutils/
main/java/org/apache/commons/beanutils/converters/
main/java/org/apache/commons/beanutils/expression/
main/java/org/apache/commons/beanutils/...
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java Wed Oct 15 20:15:17 2014
@@ -42,7 +42,7 @@ public class Jira339TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira339TestCase(String name) {
+ public Jira339TestCase(final String name) {
super(name);
}
@@ -51,7 +51,7 @@ public class Jira339TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -89,10 +89,10 @@ public class Jira339TestCase extends Tes
*/
public void testIssue_BEANUTILS_339_BeanUtilsBean_setProperty() {
- TestBean bean = new TestBean();
+ final TestBean bean = new TestBean();
try {
BeanUtils.setProperty(bean, "comparator", null);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("Failed: " + t.getMessage(), t);
fail("Threw exception: " + t);
}
@@ -104,12 +104,12 @@ public class Jira339TestCase extends Tes
*/
public void testIssue_BEANUTILS_331_BeanUtilsBean_populate() {
- TestBean bean = new TestBean();
+ final TestBean bean = new TestBean();
try {
- Map<String, Object> properties = new HashMap<String, Object>();
+ final Map<String, Object> properties = new HashMap<String, Object>();
properties.put("comparator", null);
BeanUtils.populate(bean, properties);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("Failed: " + t.getMessage(), t);
fail("Threw exception: " + t);
}
@@ -136,7 +136,7 @@ public class Jira339TestCase extends Tes
*
* @param comparator the comparator
*/
- public void setComparator(Comparator<?> comparator) {
+ public void setComparator(final Comparator<?> comparator) {
this.comparator = comparator;
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java Wed Oct 15 20:15:17 2014
@@ -33,7 +33,7 @@ public class Jira345TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira345TestCase(String name) {
+ public Jira345TestCase(final String name) {
super(name);
}
@@ -42,7 +42,7 @@ public class Jira345TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -79,7 +79,7 @@ public class Jira345TestCase extends Tes
* Test {@link BeanUtils} setProperty() with 2D array.
*/
public void testBeanUtilsSetProperty_2DArray() throws Exception{
- MyBean myBean = new MyBean();
+ final MyBean myBean = new MyBean();
BeanUtils.setProperty(myBean, "matr[0][0]","Sample");
assertEquals("Sample", myBean.getMatr()[0][0]);
}
@@ -88,7 +88,7 @@ public class Jira345TestCase extends Tes
* Test {@link BeanUtils} setProperty() with 3D array.
*/
public void testBeanUtilsSetProperty_3DArray() throws Exception{
- MyBean myBean = new MyBean();
+ final MyBean myBean = new MyBean();
BeanUtils.setProperty(myBean, "matr3D[0][0][0]","Sample");
assertEquals("Sample", myBean.getMatr3D()[0][0][0]);
}
@@ -106,13 +106,13 @@ public class Jira345TestCase extends Tes
public String[][] getMatr() {
return matr;
}
- public void setMatr(String[][] matr) {
+ public void setMatr(final String[][] matr) {
this.matr = matr;
}
public String[][][] getMatr3D() {
return matr3D;
}
- public void setMatr3D(String[][][] matr3D) {
+ public void setMatr3D(final String[][][] matr3D) {
this.matr3D = matr3D;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java Wed Oct 15 20:15:17 2014
@@ -50,9 +50,9 @@ public class Jira347TestCase extends Tes
* this would be fine as well.
*/
public void testMappedPropertyDescriptor_AnyArgsProperty() throws Exception {
- String className = "org.apache.commons.beanutils.MappedPropertyTestBean";
- ClassLoader loader = newClassLoader();
- Class<?> beanClass = loader.loadClass(className);
+ final String className = "org.apache.commons.beanutils.MappedPropertyTestBean";
+ final ClassLoader loader = newClassLoader();
+ final Class<?> beanClass = loader.loadClass(className);
beanClass.newInstance();
// -----------------------------------------------------------------------------
@@ -67,18 +67,18 @@ public class Jira347TestCase extends Tes
try {
descriptor = new MappedPropertyDescriptor("anyMapped", beanClass);
}
- catch (IntrospectionException e) {
+ catch (final IntrospectionException e) {
// this would be fine as well
}
if (descriptor != null) {
- String m1 = getMappedWriteMethod(descriptor);
+ final String m1 = getMappedWriteMethod(descriptor);
forceGarbageCollection();
try {
- String m2 = getMappedWriteMethod(descriptor);
+ final String m2 = getMappedWriteMethod(descriptor);
assertEquals("Method returned post garbage collection differs from Method returned prior to gc", m1, m2);
}
- catch (RuntimeException e) {
+ catch (final RuntimeException e) {
fail("getMappedWriteMethod threw an exception after garbage collection " + e);
}
}
@@ -93,8 +93,8 @@ public class Jira347TestCase extends Tes
*
* @return the string representation or null if mapped write method does not exist
*/
- private String getMappedWriteMethod(MappedPropertyDescriptor descriptor) {
- Method m = descriptor.getMappedWriteMethod();
+ private String getMappedWriteMethod(final MappedPropertyDescriptor descriptor) {
+ final Method m = descriptor.getMappedWriteMethod();
return m == null ? null : m.toString();
}
@@ -103,7 +103,7 @@ public class Jira347TestCase extends Tes
*/
private void forceGarbageCollection() throws Exception {
// Fill up memory
- SoftReference<Object> ref = new SoftReference<Object>(new Object());
+ final SoftReference<Object> ref = new SoftReference<Object>(new Object());
int count = 0;
while(ref.get() != null && count++ < 5) {
ArrayList<Object> list = new ArrayList<Object>();
@@ -112,7 +112,7 @@ public class Jira347TestCase extends Tes
while (true && ref.get() != null) {
list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + (i++));
}
- } catch (Throwable ignored) {
+ } catch (final Throwable ignored) {
}
list.clear();
list = null;
@@ -132,12 +132,12 @@ public class Jira347TestCase extends Tes
*/
private static URLClassLoader newClassLoader() throws MalformedURLException {
- String dataFilePath = MemoryLeakTestCase.class.getResource("pojotests").getFile();
+ final String dataFilePath = MemoryLeakTestCase.class.getResource("pojotests").getFile();
//System.out.println("dataFilePath: " + dataFilePath);
- String location = "file://" + dataFilePath.substring(0,dataFilePath.length()-"org.apache.commons.beanutils.memoryleaktests.pojotests".length());
+ final String location = "file://" + dataFilePath.substring(0,dataFilePath.length()-"org.apache.commons.beanutils.memoryleaktests.pojotests".length());
//System.out.println("location: " + location);
- StringBuilder newString = new StringBuilder();
+ final StringBuilder newString = new StringBuilder();
for (int i=0;i<location.length();i++) {
if (location.charAt(i)=='\\') {
newString.append("/");
@@ -145,10 +145,10 @@ public class Jira347TestCase extends Tes
newString.append(location.charAt(i));
}
}
- String classLocation = newString.toString();
+ final String classLocation = newString.toString();
//System.out.println("classlocation: " + classLocation);
- URLClassLoader theLoader = URLClassLoader.newInstance(new URL[]{new URL(classLocation)},null);
+ final URLClassLoader theLoader = URLClassLoader.newInstance(new URL[]{new URL(classLocation)},null);
return theLoader;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java Wed Oct 15 20:15:17 2014
@@ -37,7 +37,7 @@ public class Jira349TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira349TestCase(String name) {
+ public Jira349TestCase(final String name) {
super(name);
}
@@ -46,7 +46,7 @@ public class Jira349TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -83,16 +83,16 @@ public class Jira349TestCase extends Tes
* Test {@link PropertyUtils#copyProperties(Object, Object)}
*/
public void testIssue_BEANUTILS_349_PropertyUtils_copyProperties() {
- PrimitiveBean dest = new PrimitiveBean();
- ObjectBean origin = new ObjectBean ();
+ final PrimitiveBean dest = new PrimitiveBean();
+ final ObjectBean origin = new ObjectBean ();
try {
PropertyUtils.copyProperties(dest, origin);
- } catch (NullPointerException e) {
+ } catch (final NullPointerException e) {
log.error("Failed", e);
fail("Threw NullPointerException");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
log.warn("Expected Result", e);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("Failed", t);
fail("Threw exception: " + t);
}
@@ -106,7 +106,7 @@ public class Jira349TestCase extends Tes
public boolean getTestProperty() {
return testProperty;
}
- public void setTestProperty(boolean testProperty) {
+ public void setTestProperty(final boolean testProperty) {
this.testProperty = testProperty;
}
}
@@ -119,7 +119,7 @@ public class Jira349TestCase extends Tes
public Boolean getTestProperty() {
return testProperty;
}
- public void setTestProperty(Boolean testProperty) {
+ public void setTestProperty(final Boolean testProperty) {
this.testProperty = testProperty;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java Wed Oct 15 20:15:17 2014
@@ -35,7 +35,7 @@ public class Jira357TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira357TestCase(String name) {
+ public Jira357TestCase(final String name) {
super(name);
}
@@ -44,7 +44,7 @@ public class Jira357TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -105,18 +105,18 @@ public class Jira357TestCase extends Tes
/**
* Test {@link PropertyUtils#getPropertyDescriptors(Class)}
*/
- private void checkReadMethod(String propertyName, Class<?> expectedDeclaringClass) throws Exception {
+ private void checkReadMethod(final String propertyName, final Class<?> expectedDeclaringClass) throws Exception {
PropertyDescriptor[] descriptors = null;
try {
descriptors = PropertyUtils.getPropertyDescriptors(ConcreteTestBean.class);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
fail("Threw: " + e);
}
// Test InnerClassProperty
- PropertyDescriptor descriptor = findDescriptor(propertyName, descriptors);
+ final PropertyDescriptor descriptor = findDescriptor(propertyName, descriptors);
assertNotNull(propertyName + "descriptor", descriptor);
assertEquals(propertyName + " read method declaring class", expectedDeclaringClass, descriptor.getReadMethod().getDeclaringClass());
}
@@ -124,7 +124,7 @@ public class Jira357TestCase extends Tes
/**
* Find a property descriptor.
*/
- private PropertyDescriptor findDescriptor(String propertyName, PropertyDescriptor[] descriptors) {
+ private PropertyDescriptor findDescriptor(final String propertyName, final PropertyDescriptor[] descriptors) {
if (descriptors != null) {
for (int i = 0; i < descriptors.length; i++) {
if (propertyName.equals(descriptors[i].getName())) {
@@ -154,7 +154,7 @@ public class Jira357TestCase extends Tes
public String getInnerName() {
return firstName;
}
- public void setInnerName(String firstName) {
+ public void setInnerName(final String firstName) {
this.firstName = firstName;
}
}
@@ -174,7 +174,7 @@ public class Jira357TestCase extends Tes
return foo;
}
@Override
- public void setFoo(String foo) {
+ public void setFoo(final String foo) {
this.foo = foo;
}
@Override
@@ -182,14 +182,14 @@ public class Jira357TestCase extends Tes
return bar;
}
@Override
- public void setBar(boolean bar) {
+ public void setBar(final boolean bar) {
this.bar = bar;
}
@Override
public ConcreteTestBean.InnerClass getInnerClassProperty() {
return innerClassProperty;
}
- public void setInnerClassProperty(ConcreteTestBean.InnerClass innerClassProperty) {
+ public void setInnerClassProperty(final ConcreteTestBean.InnerClass innerClassProperty) {
this.innerClassProperty = innerClassProperty;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java Wed Oct 15 20:15:17 2014
@@ -34,7 +34,7 @@ public class Jira358TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira358TestCase(String name) {
+ public Jira358TestCase(final String name) {
super(name);
}
@@ -43,7 +43,7 @@ public class Jira358TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -81,11 +81,11 @@ public class Jira358TestCase extends Tes
*/
public void testPropertyUtils_getIndexedProperty_Array() throws Exception {
- TestBean bean = new TestBean();
+ final TestBean bean = new TestBean();
try {
PropertyUtils.getIndexedProperty(bean, "intArray", bean.getIntArray().length);
fail("Expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException e) {
+ } catch (final ArrayIndexOutOfBoundsException e) {
// expected result
}
}
@@ -95,11 +95,11 @@ public class Jira358TestCase extends Tes
*/
public void testPropertyUtils_getIndexedProperty_List() throws Exception {
- TestBean bean = new TestBean();
+ final TestBean bean = new TestBean();
try {
PropertyUtils.getIndexedProperty(bean, "listIndexed", bean.getListIndexed().size());
fail("Expected IndexOutOfBoundsException");
- } catch (IndexOutOfBoundsException e) {
+ } catch (final IndexOutOfBoundsException e) {
// expected result
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java Wed Oct 15 20:15:17 2014
@@ -36,7 +36,7 @@ public class Jira359TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira359TestCase(String name) {
+ public Jira359TestCase(final String name) {
super(name);
}
@@ -45,7 +45,7 @@ public class Jira359TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -82,13 +82,13 @@ public class Jira359TestCase extends Tes
* Test {@link BeanUtils} setProperty() String to array with colon value
*/
public void testBeanUtilsSetProperty_CustomConvertStringToArray_WithColonValue() throws Exception{
- ArrayConverter converter = new ArrayConverter(String[].class, new StringConverter());
+ final ArrayConverter converter = new ArrayConverter(String[].class, new StringConverter());
converter.setAllowedChars(new char[] {'.', '-', ':'});
- BeanUtilsBean utils = new BeanUtilsBean();
+ final BeanUtilsBean utils = new BeanUtilsBean();
utils.getConvertUtils().register(converter, String[].class);
- SimplePojoData simplePojo = new SimplePojoData();
+ final SimplePojoData simplePojo = new SimplePojoData();
utils.setProperty(simplePojo, "jcrMixinTypes", "mix:rereferencible,mix:simple");
showArray("Custom WithColonValue", simplePojo.getJcrMixinTypes());
assertEquals("array size", 2, simplePojo.getJcrMixinTypes().length);
@@ -100,7 +100,7 @@ public class Jira359TestCase extends Tes
* Test {@link BeanUtils} setProperty() String to array with colon value
*/
public void testBeanUtilsSetProperty_DefaultConvertStringToArray_WithColonValue() throws Exception{
- SimplePojoData simplePojo = new SimplePojoData();
+ final SimplePojoData simplePojo = new SimplePojoData();
BeanUtils.setProperty(simplePojo, "jcrMixinTypes", "mix:rereferencible,mix:simple");
showArray("Default WithColonValue", simplePojo.getJcrMixinTypes());
assertEquals("array size", 4, simplePojo.getJcrMixinTypes().length);
@@ -114,7 +114,7 @@ public class Jira359TestCase extends Tes
* Test {@link BeanUtils} setProperty() String to array without colon value
*/
public void testBeanUtilsSetProperty_DefaultConvertStringToArray_WithoutColonValue() throws Exception{
- SimplePojoData simplePojo = new SimplePojoData();
+ final SimplePojoData simplePojo = new SimplePojoData();
BeanUtils.setProperty(simplePojo, "jcrMixinTypes", "mixrereferencible,mixsimple");
showArray("Default WithoutColonValue", simplePojo.getJcrMixinTypes());
assertEquals("array size", 2, simplePojo.getJcrMixinTypes().length);
@@ -126,7 +126,7 @@ public class Jira359TestCase extends Tes
* Test {@link BeanUtils} setProperty() String to array without colon value and no comma
*/
public void testBeanUtilsSetProperty_DefaultConvertStringToArray_WithoutColonValueAndNocoma() throws Exception{
- SimplePojoData simplePojo = new SimplePojoData();
+ final SimplePojoData simplePojo = new SimplePojoData();
BeanUtils.setProperty(simplePojo, "jcrMixinTypes", "mixrereferencible");
showArray("Default WithoutColonAndNocoma", simplePojo.getJcrMixinTypes());
assertEquals("array size", 1, simplePojo.getJcrMixinTypes().length);
@@ -136,7 +136,7 @@ public class Jira359TestCase extends Tes
/**
* Show array contents.
*/
- private void showArray(String text, String[] array) {
+ private void showArray(final String text, final String[] array) {
if (array == null) {
System.out.println(text + " array is null");
} else {
@@ -154,7 +154,7 @@ public class Jira359TestCase extends Tes
public String[] getJcrMixinTypes() {
return this.jcrMixinTypes;
}
- public void setJcrMixinTypes(String[] mixinTypes) {
+ public void setJcrMixinTypes(final String[] mixinTypes) {
this.jcrMixinTypes = mixinTypes;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java Wed Oct 15 20:15:17 2014
@@ -33,7 +33,7 @@ public class Jira368TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira368TestCase(String name) {
+ public Jira368TestCase(final String name) {
super(name);
}
@@ -42,7 +42,7 @@ public class Jira368TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -81,11 +81,11 @@ public class Jira368TestCase extends Tes
public void testBeanUtilsSetProperty_NullBean() throws Exception {
try {
BeanUtils.setProperty(null, "foo", "bar");
- } catch (NullPointerException e) {
+ } catch (final NullPointerException e) {
fail("Threw NullPointerException");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// expected result
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Threw " + e);
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java Wed Oct 15 20:15:17 2014
@@ -33,7 +33,7 @@ public class Jira369TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira369TestCase(String name) {
+ public Jira369TestCase(final String name) {
super(name);
}
@@ -42,7 +42,7 @@ public class Jira369TestCase extends Tes
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -79,15 +79,15 @@ public class Jira369TestCase extends Tes
* Test {@link BeanUtils} getProperty() for property "aRatedCd".
*/
public void testBeanUtilsGetProperty_aRatedCd() throws Exception {
- TestBean bean = new TestBean();
+ final TestBean bean = new TestBean();
bean.setARatedCd("foo");
try {
assertEquals("foo", BeanUtils.getProperty(bean, "aRatedCd"));
fail("Expected NoSuchMethodException");
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
// expected result
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Threw " + e);
}
}
@@ -96,11 +96,11 @@ public class Jira369TestCase extends Tes
* Test {@link BeanUtils} getProperty() for property "ARatedCd".
*/
public void testBeanUtilsGetProperty_ARatedCd() throws Exception {
- TestBean bean = new TestBean();
+ final TestBean bean = new TestBean();
bean.setARatedCd("foo");
try {
assertEquals("foo", BeanUtils.getProperty(bean, "ARatedCd"));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Threw " + e);
}
}
@@ -109,11 +109,11 @@ public class Jira369TestCase extends Tes
* Test {@link BeanUtils} getProperty() for property "bRatedCd".
*/
public void testBeanUtilsGetProperty_bRatedCd() throws Exception {
- TestBean bean = new TestBean();
+ final TestBean bean = new TestBean();
bean.setbRatedCd("foo");
try {
assertEquals("foo", BeanUtils.getProperty(bean, "bRatedCd"));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Threw " + e);
}
}
@@ -129,7 +129,7 @@ public class Jira369TestCase extends Tes
return aproperty;
}
- public void setARatedCd(String aproperty) {
+ public void setARatedCd(final String aproperty) {
this.aproperty = aproperty;
}
@@ -137,7 +137,7 @@ public class Jira369TestCase extends Tes
return bproperty;
}
- public void setbRatedCd(String bproperty) {
+ public void setbRatedCd(final String bproperty) {
this.bproperty = bproperty;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java Wed Oct 15 20:15:17 2014
@@ -36,7 +36,7 @@ public class Jira381TestCase extends Tes
*
* @param name The name of the test
*/
- public Jira381TestCase(String name) {
+ public Jira381TestCase(final String name) {
super(name);
}
@@ -48,11 +48,11 @@ public class Jira381TestCase extends Tes
*/
public void testIssue_BEANUTILS_381_getMatchingAccessibleMethod() {
- Class<?> target = TestServiceBean.class;
- String methodName = "performOp";
- Class<?>[] runtimeClasses = new Class<?>[]{TestObjectSubclass.class};
+ final Class<?> target = TestServiceBean.class;
+ final String methodName = "performOp";
+ final Class<?>[] runtimeClasses = new Class<?>[]{TestObjectSubclass.class};
- Method returned = MethodUtils.getMatchingAccessibleMethod(target, methodName, runtimeClasses);
+ final Method returned = MethodUtils.getMatchingAccessibleMethod(target, methodName, runtimeClasses);
assertEquals(target, returned.getDeclaringClass());
assertEquals(methodName, returned.getName());
@@ -67,13 +67,13 @@ public class Jira381TestCase extends Tes
/**
* Generic object method
*/
- public void performOp(Object o){
+ public void performOp(final Object o){
}
/**
* Object method
*/
- public void performOp(TestObject o){
+ public void performOp(final TestObject o){
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java Wed Oct 15 20:15:17 2014
@@ -50,7 +50,7 @@ public class Jira411TestCase extends Tes
return imgLink;
}
- public void setImgLink(String imgLink) {
+ public void setImgLink(final String imgLink) {
this.imgLink = imgLink;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java Wed Oct 15 20:15:17 2014
@@ -31,14 +31,14 @@ import org.apache.commons.beanutils.Prop
public class Jira422TestCase extends TestCase {
public void testRootBean() throws Exception {
- RootBean bean = new FirstChildBean();
- Class<?> propertyType = PropertyUtils.getPropertyType(bean, "file[0]");
+ final RootBean bean = new FirstChildBean();
+ final Class<?> propertyType = PropertyUtils.getPropertyType(bean, "file[0]");
assertEquals(String.class.getName(), propertyType.getName());
}
public void testSecondChildBean() throws Exception {
- RootBean bean = new SecondChildBean();
- Class<?> propertyType = PropertyUtils.getPropertyType(bean, "file[0]");
+ final RootBean bean = new SecondChildBean();
+ final Class<?> propertyType = PropertyUtils.getPropertyType(bean, "file[0]");
assertEquals(String.class.getName(), propertyType.getName());
}
@@ -53,16 +53,16 @@ class RootBean {
return file;
}
- public void setFile(List file) {
+ public void setFile(final List file) {
this.file = file;
}
- public String getFile(int i) {
+ public String getFile(final int i) {
return (String) file.get(i);
}
@SuppressWarnings("unchecked")
- public void setFile(int i, String file) {
+ public void setFile(final int i, final String file) {
this.file.set(i, file);
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java Wed Oct 15 20:15:17 2014
@@ -30,8 +30,8 @@ import org.apache.commons.beanutils.Bean
*/
public class Jira454TestCase extends TestCase {
public void testCopyProperties() throws Exception {
- TestBean bean = new TestBean();
- TestBean b2 = new TestBean();
+ final TestBean bean = new TestBean();
+ final TestBean b2 = new TestBean();
BeanUtils.copyProperties(b2, bean);
assertNull("Got a creation date", b2.getCreatedAt());
}
@@ -43,7 +43,7 @@ public class Jira454TestCase extends Tes
return createdAt;
}
- public void setCreatedAt(Date createdAt) {
+ public void setCreatedAt(final Date createdAt) {
this.createdAt = createdAt;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java Wed Oct 15 20:15:17 2014
@@ -53,8 +53,8 @@ public class Jira456TestCase extends Tes
* @throws Exception if an error occurs
*/
private FluentIntrospectionTestBean clearWriteMethodRef() throws Exception {
- FluentIntrospectionTestBean bean = new FluentIntrospectionTestBean();
- PropertyDescriptor pd = pub.getPropertyDescriptor(bean, TEST_PROP);
+ final FluentIntrospectionTestBean bean = new FluentIntrospectionTestBean();
+ final PropertyDescriptor pd = pub.getPropertyDescriptor(bean, TEST_PROP);
// simulate that the write method reference is freed
pd.setWriteMethod(null);
@@ -65,7 +65,7 @@ public class Jira456TestCase extends Tes
* Tests whether a lost write method is automatically recovered and can be invoked.
*/
public void testWriteMethodRecover() throws Exception {
- FluentIntrospectionTestBean bean = clearWriteMethodRef();
+ final FluentIntrospectionTestBean bean = clearWriteMethodRef();
final String value = "Test value";
pub.setProperty(bean, TEST_PROP, value);
assertEquals("Property not set", value, bean.getFluentGetProperty());
@@ -76,7 +76,7 @@ public class Jira456TestCase extends Tes
* write method was freed.
*/
public void testPropertyIsWritable() throws Exception {
- FluentIntrospectionTestBean bean = clearWriteMethodRef();
+ final FluentIntrospectionTestBean bean = clearWriteMethodRef();
assertTrue("Not writable", pub.isWriteable(bean, TEST_PROP));
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java Wed Oct 15 20:15:17 2014
@@ -36,8 +36,8 @@ public class Jira458TestCase extends Tes
*
* @param input the input string
*/
- private void checkConversionWithNullDefault(String input) {
- Converter converter = new IntegerLocaleConverter(null, Locale.US);
+ private void checkConversionWithNullDefault(final String input) {
+ final Converter converter = new IntegerLocaleConverter(null, Locale.US);
assertNull("Wrong result", converter.convert(Integer.class, input));
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java Wed Oct 15 20:15:17 2014
@@ -34,14 +34,14 @@ public class Jira463TestCase extends Tes
* property can be suppressed.
*/
public void testSuppressClassProperty() throws Exception {
- BeanUtilsBean bub = new BeanUtilsBean();
+ final BeanUtilsBean bub = new BeanUtilsBean();
bub.getPropertyUtils().addBeanIntrospector(
SuppressPropertiesBeanIntrospector.SUPPRESS_CLASS);
- AlphaBean bean = new AlphaBean();
+ final AlphaBean bean = new AlphaBean();
try {
bub.getProperty(bean, "class");
fail("Could access class property!");
- } catch (NoSuchMethodException ex) {
+ } catch (final NoSuchMethodException ex) {
// ok
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java Wed Oct 15 20:15:17 2014
@@ -47,35 +47,35 @@ public class Jira465TestCase extends Tes
*
* @param bean the bean to be updated
*/
- private static void changeValue(Object bean) {
+ private static void changeValue(final Object bean) {
try {
BeanUtils.setProperty(bean, PATH, NEW_VALUE);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Could not set property: " + e);
}
}
public void testArrayProperty() throws InvocationTargetException,
IllegalAccessException {
- ArrayProp bean = new ArrayProp();
+ final ArrayProp bean = new ArrayProp();
changeValue(bean);
assertEquals("Wrong value", NEW_VALUE, bean.getFoo()[0]);
}
public void testArrayIndexedProperty() {
- ArrayIndexedProp bean = new ArrayIndexedProp();
+ final ArrayIndexedProp bean = new ArrayIndexedProp();
changeValue(bean);
assertEquals("Wrong value", NEW_VALUE, bean.getFoo(0));
}
public void testListProperty() {
- ListProp bean = new ListProp();
+ final ListProp bean = new ListProp();
changeValue(bean);
assertEquals("Wrong value", NEW_VALUE, bean.getFoo().get(0));
}
public void testListIndexedProperty() {
- ListIndexedProp bean = new ListIndexedProp();
+ final ListIndexedProp bean = new ListIndexedProp();
changeValue(bean);
assertEquals("Wrong value", NEW_VALUE, bean.getFoo(0));
}
@@ -87,7 +87,7 @@ public class Jira465TestCase extends Tes
return foo;
}
- public void setFoo(Object[] foo) {
+ public void setFoo(final Object[] foo) {
this.foo = foo;
}
}
@@ -95,11 +95,11 @@ public class Jira465TestCase extends Tes
public static class ArrayIndexedProp {
private final Object[] foo = new Object[] { OLD_VALUE };
- public Object getFoo(int i) {
+ public Object getFoo(final int i) {
return foo[i];
}
- public void setFoo(int i, Object value) {
+ public void setFoo(final int i, final Object value) {
this.foo[i] = value;
}
}
@@ -111,7 +111,7 @@ public class Jira465TestCase extends Tes
return foo;
}
- public void setFoo(List<String> foo) {
+ public void setFoo(final List<String> foo) {
this.foo = foo;
}
}
@@ -119,11 +119,11 @@ public class Jira465TestCase extends Tes
public static class ListIndexedProp {
private final List<String> foo = new ArrayList<String>(Arrays.asList(OLD_VALUE));
- public String getFoo(int i) {
+ public String getFoo(final int i) {
return foo.get(i);
}
- public void setFoo(int i, String value) {
+ public void setFoo(final int i, final String value) {
this.foo.set(i, value);
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java Wed Oct 15 20:15:17 2014
@@ -54,7 +54,7 @@ public class Jira61TestCase extends Test
*
* @param name The name of the test
*/
- public Jira61TestCase(String name) {
+ public Jira61TestCase(final String name) {
super(name);
}
@@ -63,7 +63,7 @@ public class Jira61TestCase extends Test
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -109,7 +109,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isReadable(wrapDynaBean, "simpleReadOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleReadOnly Threw exception: " + t);
}
@@ -117,7 +117,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isReadable(wrapDynaBean, "simpleWriteOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleWriteOnly Threw exception: " + t);
}
@@ -133,7 +133,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isWriteable(wrapDynaBean, "simpleReadOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleReadOnly Threw exception: " + t);
}
@@ -141,7 +141,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isWriteable(wrapDynaBean, "simpleWriteOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleWriteOnly Threw exception: " + t);
}
@@ -157,7 +157,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isReadable(wrapDynaBean, "indexedReadOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedReadOnly Threw exception: " + t);
}
@@ -165,7 +165,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isReadable(wrapDynaBean, "indexedWriteOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedWriteOnly Threw exception: " + t);
}
@@ -181,7 +181,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isReadable(wrapDynaBean, "mappedReadOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedReadOnly Threw exception: " + t);
}
@@ -189,7 +189,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isReadable(wrapDynaBean, "mappedWriteOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedWriteOnly Threw exception: " + t);
}
@@ -205,7 +205,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isWriteable(wrapDynaBean, "indexedReadOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedReadOnly Threw exception: " + t);
}
@@ -213,7 +213,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isWriteable(wrapDynaBean, "indexedWriteOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedWriteOnly Threw exception: " + t);
}
@@ -229,7 +229,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isWriteable(wrapDynaBean, "mappedReadOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedReadOnly Threw exception: " + t);
}
@@ -237,7 +237,7 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.isWriteable(wrapDynaBean, "mappedWriteOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedWriteOnly Threw exception: " + t);
}
@@ -253,7 +253,7 @@ public class Jira61TestCase extends Test
Object result = null;
try {
result = PropertyUtils.getProperty(wrapDynaBean, "simpleReadOnly");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleWriteOnly Threw exception: " + t);
}
@@ -261,9 +261,9 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.getProperty(wrapDynaBean, "simpleWriteOnly");
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
threwIllegalArgumentException = true; // expected result
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleWriteOnly Threw exception: " + t);
}
@@ -278,9 +278,9 @@ public class Jira61TestCase extends Test
boolean threwIllegalArgumentException = false;
try {
PropertyUtils.setProperty(wrapDynaBean, "simpleReadOnly", "READONLY-SIMPLE-BAR");
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
threwIllegalArgumentException = true; // expected result
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleReadOnly Threw exception: " + t);
}
@@ -288,7 +288,7 @@ public class Jira61TestCase extends Test
try {
PropertyUtils.setProperty(wrapDynaBean, "simpleWriteOnly", "SIMPLE-BAR");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("simpleWriteOnly Threw exception: " + t);
}
@@ -304,7 +304,7 @@ public class Jira61TestCase extends Test
Object result = null;
try {
result = PropertyUtils.getProperty(wrapDynaBean, "indexedReadOnly[0]");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedReadOnly Threw exception: " + t);
}
@@ -312,9 +312,9 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.getProperty(wrapDynaBean, "indexedWriteOnly[0]");
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
threwIllegalArgumentException = true; // expected result
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedWriteOnly Threw exception: " + t);
}
@@ -329,9 +329,9 @@ public class Jira61TestCase extends Test
boolean threwIllegalArgumentException = false;
try {
PropertyUtils.setProperty(wrapDynaBean, "indexedReadOnly[0]", "READONLY-INDEXED-BAR");
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
threwIllegalArgumentException = true; // expected result
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedReadOnly Threw exception: " + t);
}
@@ -339,7 +339,7 @@ public class Jira61TestCase extends Test
try {
PropertyUtils.setProperty(wrapDynaBean, "indexedWriteOnly[0]", "INDEXED-BAR");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("indexedWriteOnly Threw exception: " + t);
}
@@ -355,7 +355,7 @@ public class Jira61TestCase extends Test
Object result = null;
try {
result = PropertyUtils.getProperty(wrapDynaBean, "mappedReadOnly(foo-key)");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedReadOnly Threw exception: " + t);
}
@@ -363,9 +363,9 @@ public class Jira61TestCase extends Test
try {
result = PropertyUtils.getProperty(wrapDynaBean, "mappedWriteOnly(foo-key)");
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
threwIllegalArgumentException = true; // expected result
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedWriteOnly Threw exception: " + t);
}
@@ -380,9 +380,9 @@ public class Jira61TestCase extends Test
boolean threwIllegalArgumentException = false;
try {
PropertyUtils.setProperty(wrapDynaBean, "mappedReadOnly(foo-key)", "READONLY-MAPPED-BAR");
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
threwIllegalArgumentException = true; // expected result
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedReadOnly Threw exception: " + t);
}
@@ -390,7 +390,7 @@ public class Jira61TestCase extends Test
try {
PropertyUtils.setProperty(wrapDynaBean, "mappedWriteOnly(foo-key)", "MAPPED-BAR");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("mappedWriteOnly Threw exception: " + t);
}
@@ -402,12 +402,12 @@ public class Jira61TestCase extends Test
* to a read-only WrapDynaBean property.
*/
public void testIssue_BEANUTILS_61_PropertyUtils_copyProperties_to_WrapDynaBean() {
- String value = "copied simpleReadOnly";
- Map<String, Object> source = new HashMap<String, Object>();
+ final String value = "copied simpleReadOnly";
+ final Map<String, Object> source = new HashMap<String, Object>();
source.put("simpleReadOnly", value);
try {
PropertyUtils.copyProperties(wrapDynaBean, source);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("copyProperties Threw exception: " + t);
}
@@ -419,12 +419,12 @@ public class Jira61TestCase extends Test
* to a read-only WrapDynaBean property.
*/
public void testIssue_BEANUTILS_61_PropertyUtils_copyProperties_from_WrapDynaBean() {
- String value = "ORIG TARGET VALUE";
- TestBean targetBean = Jira61BeanFactory.createBean();
+ final String value = "ORIG TARGET VALUE";
+ final TestBean targetBean = Jira61BeanFactory.createBean();
targetBean.setSimpleWriteOnly(value);
try {
PropertyUtils.copyProperties(targetBean, wrapDynaBean);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("copyProperties Threw exception: " + t);
}
@@ -436,12 +436,12 @@ public class Jira61TestCase extends Test
* to a read-only WrapDynaBean property.
*/
public void testIssue_BEANUTILS_61_BeanUtils_copyProperties_to_WrapDynaBean() {
- String value = "copied simpleReadOnly";
- Map<String, Object> source = new HashMap<String, Object>();
+ final String value = "copied simpleReadOnly";
+ final Map<String, Object> source = new HashMap<String, Object>();
source.put("simpleReadOnly", value);
try {
BeanUtils.copyProperties(wrapDynaBean, source);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("copyProperties Threw exception: " + t);
}
@@ -453,12 +453,12 @@ public class Jira61TestCase extends Test
* to a read-only WrapDynaBean property.
*/
public void testIssue_BEANUTILS_61_BeanUtils_copyProperties_from_WrapDynaBean() {
- String value = "ORIG TARGET VALUE";
- TestBean targetBean = Jira61BeanFactory.createBean();
+ final String value = "ORIG TARGET VALUE";
+ final TestBean targetBean = Jira61BeanFactory.createBean();
targetBean.setSimpleWriteOnly(value);
try {
BeanUtils.copyProperties(targetBean, wrapDynaBean);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("copyProperties Threw exception: " + t);
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java Wed Oct 15 20:15:17 2014
@@ -48,7 +48,7 @@ public class Jira87TestCase extends Test
*
* @param name The name of the test
*/
- public Jira87TestCase(String name) {
+ public Jira87TestCase(final String name) {
super(name);
}
@@ -57,7 +57,7 @@ public class Jira87TestCase extends Test
*
* @param args Arguments
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
junit.textui.TestRunner.run(suite());
}
@@ -95,11 +95,11 @@ public class Jira87TestCase extends Test
*/
public void testJira87() {
- Jira87BeanFactory.PublicMappedInterface bean = Jira87BeanFactory.createMappedPropertyBean();
+ final Jira87BeanFactory.PublicMappedInterface bean = Jira87BeanFactory.createMappedPropertyBean();
try {
// N.B. The test impl. returns the key value
assertEquals("foo", PropertyUtils.getMappedProperty(bean, "value(foo)"));
- } catch (Throwable t) {
+ } catch (final Throwable t) {
log.error("ERROR " + t, t);
fail("Threw exception: " + t);
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java Wed Oct 15 20:15:17 2014
@@ -50,7 +50,7 @@ public class Jira92TestCase extends Test
* @param index index
* @param date indexed value to set
*/
- public void setDateArrayProperty(int index, java.util.Date date) {
+ public void setDateArrayProperty(final int index, final java.util.Date date) {
this.dateArrayProperty[index] = date;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java Wed Oct 15 20:15:17 2014
@@ -64,7 +64,7 @@ public class Jira18BeanFactory {
*
* @param simple The simple value
*/
- public void setSimple(String simple) {
+ public void setSimple(final String simple) {
this.simple = simple;
}
@@ -74,7 +74,7 @@ public class Jira18BeanFactory {
* @param index The index
* @return The indexed value
*/
- public String getIndexed(int index) {
+ public String getIndexed(final int index) {
return indexed[index];
}
@@ -84,7 +84,7 @@ public class Jira18BeanFactory {
* @param index The index
* @param value The indexed value
*/
- public void setIndexed(int index, String value) {
+ public void setIndexed(final int index, final String value) {
this.indexed[index] = value;
}
@@ -94,7 +94,7 @@ public class Jira18BeanFactory {
* @param key The mapped key
* @return The mapped value
*/
- public String getMapped(String key) {
+ public String getMapped(final String key) {
return (String)mapped.get(key);
}
@@ -104,7 +104,7 @@ public class Jira18BeanFactory {
* @param key The mapped key
* @param value The mapped value
*/
- public void setMapped(String key, String value) {
+ public void setMapped(final String key, final String value) {
mapped.put(key, value);
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java Wed Oct 15 20:15:17 2014
@@ -44,7 +44,7 @@ public class Jira298BeanFactory {
public String getName() {
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java Wed Oct 15 20:15:17 2014
@@ -66,7 +66,7 @@ public class Jira61BeanFactory {
*
* @param simple simple value
*/
- public void setSimpleWriteOnly(String simple) {
+ public void setSimpleWriteOnly(final String simple) {
this.simple = simple;
}
@@ -76,7 +76,7 @@ public class Jira61BeanFactory {
* @param index The index
* @return The indexed value
*/
- public String getIndexedReadOnly(int index) {
+ public String getIndexedReadOnly(final int index) {
return indexed[index];
}
@@ -86,7 +86,7 @@ public class Jira61BeanFactory {
* @param index The index
* @param value The indexed value
*/
- public void setIndexedWriteOnly(int index, String value) {
+ public void setIndexedWriteOnly(final int index, final String value) {
this.indexed[index] = value;
}
@@ -96,7 +96,7 @@ public class Jira61BeanFactory {
* @param key The mapped key
* @return The mapped value
*/
- public String getMappedReadOnly(String key) {
+ public String getMappedReadOnly(final String key) {
return (String)mapped.get(key);
}
@@ -106,7 +106,7 @@ public class Jira61BeanFactory {
* @param key The mapped key
* @param value The mapped value
*/
- public void setMappedWriteOnly(String key, String value) {
+ public void setMappedWriteOnly(final String key, final String value) {
mapped.put(key, value);
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java Wed Oct 15 20:15:17 2014
@@ -58,7 +58,7 @@ public class Jira87BeanFactory {
* @param key The key of the mapped value
* @return The key value
*/
- public Object getValue(String key) {
+ public Object getValue(final String key) {
return key;
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java Wed Oct 15 20:15:17 2014
@@ -34,7 +34,7 @@ public class ArrayConverterTestCase exte
* Construct a new Array Converter test case.
* @param name Test Name
*/
- public ArrayConverterTestCase(String name) {
+ public ArrayConverterTestCase(final String name) {
super(name);
}
@@ -66,23 +66,23 @@ public class ArrayConverterTestCase exte
*/
public void testComponentIntegerConverter() {
- IntegerConverter intConverter = new IntegerConverter(new Integer(0));
+ final IntegerConverter intConverter = new IntegerConverter(new Integer(0));
intConverter.setPattern("#,###");
intConverter.setLocale(Locale.US);
- ArrayConverter arrayConverter = new ArrayConverter(int[].class, intConverter, 0);
+ final ArrayConverter arrayConverter = new ArrayConverter(int[].class, intConverter, 0);
arrayConverter.setAllowedChars(new char[] {',', '-'});
arrayConverter.setDelimiter(';');
// Expected results
- int[] intArray = new int[] {1111, 2222, 3333, 4444};
- String stringA = "1,111; 2,222; 3,333; 4,444";
- String stringB = intArray[0]+ ";" + intArray[1] + ";" + intArray[2] + ";" +intArray[3];
- String[] strArray = new String[] {""+intArray[0], ""+intArray[1], ""+intArray[2], ""+intArray[3]};
- long[] longArray = new long[] {intArray[0], intArray[1], intArray[2], intArray[3]};
- Long[] LONGArray = new Long[] {new Long(intArray[0]), new Long(intArray[1]), new Long(intArray[2]), new Long(intArray[3])};
- Integer[] IntegerArray = new Integer[] {new Integer(intArray[0]), new Integer(intArray[1]), new Integer(intArray[2]), new Integer(intArray[3])};
- ArrayList<String> strList = new ArrayList<String>();
- ArrayList<Long> longList = new ArrayList<Long>();
+ final int[] intArray = new int[] {1111, 2222, 3333, 4444};
+ final String stringA = "1,111; 2,222; 3,333; 4,444";
+ final String stringB = intArray[0]+ ";" + intArray[1] + ";" + intArray[2] + ";" +intArray[3];
+ final String[] strArray = new String[] {""+intArray[0], ""+intArray[1], ""+intArray[2], ""+intArray[3]};
+ final long[] longArray = new long[] {intArray[0], intArray[1], intArray[2], intArray[3]};
+ final Long[] LONGArray = new Long[] {new Long(intArray[0]), new Long(intArray[1]), new Long(intArray[2]), new Long(intArray[3])};
+ final Integer[] IntegerArray = new Integer[] {new Integer(intArray[0]), new Integer(intArray[1]), new Integer(intArray[2]), new Integer(intArray[3])};
+ final ArrayList<String> strList = new ArrayList<String>();
+ final ArrayList<Long> longList = new ArrayList<Long>();
for (int i = 0; i < strArray.length; i++) {
strList.add(strArray[i]);
longList.add(LONGArray[i]);
@@ -95,7 +95,7 @@ public class ArrayConverterTestCase exte
try {
msg = "String --> int[]";
checkArray(msg, intArray, arrayConverter.convert(int[].class, stringA));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -103,7 +103,7 @@ public class ArrayConverterTestCase exte
try {
msg = "String --> Integer[] (with braces)";
checkArray(msg, IntegerArray, arrayConverter.convert(Integer[].class, "{" + stringA + "}"));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -111,7 +111,7 @@ public class ArrayConverterTestCase exte
try {
msg = "String[] --> int[]";
checkArray(msg, intArray, arrayConverter.convert(int[].class, strArray));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -119,7 +119,7 @@ public class ArrayConverterTestCase exte
try {
msg = "String[] --> Integer[]";
checkArray(msg, IntegerArray, arrayConverter.convert(Integer[].class, strArray));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -127,7 +127,7 @@ public class ArrayConverterTestCase exte
try {
msg = "long[] --> int[]";
checkArray(msg, intArray, arrayConverter.convert(int[].class, longArray));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -135,7 +135,7 @@ public class ArrayConverterTestCase exte
try {
msg = "Long --> int[]";
checkArray(msg, new int[] {LONGArray[0].intValue()}, arrayConverter.convert(int[].class, LONGArray[0]));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -143,7 +143,7 @@ public class ArrayConverterTestCase exte
try {
msg = "LONG[] --> int[]";
checkArray(msg, intArray, arrayConverter.convert(int[].class, LONGArray));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -151,7 +151,7 @@ public class ArrayConverterTestCase exte
try {
msg = "Long --> String";
assertEquals(msg, LONGArray[0] + "", arrayConverter.convert(String.class, LONGArray[0]));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -159,7 +159,7 @@ public class ArrayConverterTestCase exte
try {
msg = "LONG[] --> String (first)";
assertEquals(msg, LONGArray[0] + "", arrayConverter.convert(String.class, LONGArray));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -168,7 +168,7 @@ public class ArrayConverterTestCase exte
msg = "LONG[] --> String (all)";
arrayConverter.setOnlyFirstToString(false);
assertEquals(msg, stringB, arrayConverter.convert(String.class, LONGArray));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -176,7 +176,7 @@ public class ArrayConverterTestCase exte
try {
msg = "Collection of Long --> String";
assertEquals(msg, stringB, arrayConverter.convert(String.class, longList));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -184,7 +184,7 @@ public class ArrayConverterTestCase exte
try {
msg = "long[] --> String[]";
checkArray(msg, strArray, arrayConverter.convert(String[].class, LONGArray));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -192,7 +192,7 @@ public class ArrayConverterTestCase exte
try {
msg = "Collection of String --> Integer[]";
checkArray(msg, IntegerArray, arrayConverter.convert(Integer[].class, strList));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -200,7 +200,7 @@ public class ArrayConverterTestCase exte
try {
msg = "Collection of Long --> int[]";
checkArray(msg, intArray, arrayConverter.convert(int[].class, longList));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
}
@@ -211,26 +211,26 @@ public class ArrayConverterTestCase exte
public void testStringArrayToNumber() {
// Configure Converter
- IntegerConverter intConverter = new IntegerConverter();
- ArrayConverter arrayConverter = new ArrayConverter(int[].class, intConverter);
+ final IntegerConverter intConverter = new IntegerConverter();
+ final ArrayConverter arrayConverter = new ArrayConverter(int[].class, intConverter);
// Test Data
- String[] array = new String[] {"10", " 11", "12 ", " 13 "};
- ArrayList<String> list = new ArrayList<String>();
+ final String[] array = new String[] {"10", " 11", "12 ", " 13 "};
+ final ArrayList<String> list = new ArrayList<String>();
for (int i = 0; i < array.length; i++) {
list.add(array[i]);
}
// Expected results
String msg = null;
- int[] expectedInt = new int[] {10, 11, 12, 13};
- Integer[] expectedInteger = new Integer[] {new Integer(expectedInt[0]), new Integer(expectedInt[1]), new Integer(expectedInt[2]), new Integer(expectedInt[3])};
+ final int[] expectedInt = new int[] {10, 11, 12, 13};
+ final Integer[] expectedInteger = new Integer[] {new Integer(expectedInt[0]), new Integer(expectedInt[1]), new Integer(expectedInt[2]), new Integer(expectedInt[3])};
// Test String[] --> int[]
try {
msg = "String[] --> int[]";
checkArray(msg, expectedInt, arrayConverter.convert(int[].class, array));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -238,7 +238,7 @@ public class ArrayConverterTestCase exte
try {
msg = "String[] --> Integer[]";
checkArray(msg, expectedInteger, arrayConverter.convert(Integer[].class, array));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -246,7 +246,7 @@ public class ArrayConverterTestCase exte
try {
msg = "List --> int[]";
checkArray(msg, expectedInt, arrayConverter.convert(int[].class, list));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
@@ -254,7 +254,7 @@ public class ArrayConverterTestCase exte
try {
msg = "List --> Integer[]";
checkArray(msg, expectedInteger, arrayConverter.convert(Integer[].class, list));
- } catch (Exception e) {
+ } catch (final Exception e) {
fail(msg + " failed " + e);
}
}
@@ -268,46 +268,46 @@ public class ArrayConverterTestCase exte
// Following String uses two delimiter:
// - comma (",") to separate individual numbers
// - semi-colon (";") to separate lists of numbers
- String matrixString = "11,12,13 ; 21,22,23 ; 31,32,33 ; 41,42,43";
- int[][] expected = new int[][] {new int[] {11, 12, 13},
+ final String matrixString = "11,12,13 ; 21,22,23 ; 31,32,33 ; 41,42,43";
+ final int[][] expected = new int[][] {new int[] {11, 12, 13},
new int[] {21, 22, 23},
new int[] {31, 32, 33},
new int[] {41, 42, 43}};
// Construct an Integer Converter
- IntegerConverter integerConverter = new IntegerConverter();
+ final IntegerConverter integerConverter = new IntegerConverter();
// Construct an array Converter for an integer array (i.e. int[]) using
// an IntegerConverter as the element converter.
// N.B. Uses the default comma (i.e. ",") as the delimiter between individual numbers
- ArrayConverter arrayConverter = new ArrayConverter(int[].class, integerConverter);
+ final ArrayConverter arrayConverter = new ArrayConverter(int[].class, integerConverter);
// Construct a "Matrix" Converter which converts arrays of integer arrays using
// the first (int[]) Converter as the element Converter.
// N.B. Uses a semi-colon (i.e. ";") as the delimiter to separate the different sets of numbers.
// Also the delimiter for the above array Converter needs to be added to this
// array Converter's "allowed characters"
- ArrayConverter matrixConverter = new ArrayConverter(int[][].class, arrayConverter);
+ final ArrayConverter matrixConverter = new ArrayConverter(int[][].class, arrayConverter);
matrixConverter.setDelimiter(';');
matrixConverter.setAllowedChars(new char[] {','});
try {
// Do the Conversion
- Object result = matrixConverter.convert(int[][].class, matrixString);
+ final Object result = matrixConverter.convert(int[][].class, matrixString);
// Check it actually worked OK
assertEquals("Check int[][].class", int[][].class, result.getClass());
- int[][] matrix = (int[][])result;
+ final int[][] matrix = (int[][])result;
assertEquals("Check int[][] length", expected.length, matrix.length);
for (int i = 0; i < expected.length; i++) {
assertEquals("Check int[" + i + "] length", expected[i].length, matrix[i].length);
for (int j = 0; j < expected[i].length; j++) {
- String label = "Matrix int[" + i + "," + j + "] element";
+ final String label = "Matrix int[" + i + "," + j + "] element";
assertEquals(label, expected[i][j], matrix[i][j]);
// System.out.println(label + " = " + matrix[i][j]);
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("Matrix Conversion threw " + e);
}
}
@@ -316,9 +316,9 @@ public class ArrayConverterTestCase exte
* Test Converting using the IntegerConverter as the component Converter
*/
public void testInvalidWithDefault() {
- int[] zeroArray = new int[0];
- int[] oneArray = new int[1];
- IntegerConverter intConverter = new IntegerConverter();
+ final int[] zeroArray = new int[0];
+ final int[] oneArray = new int[1];
+ final IntegerConverter intConverter = new IntegerConverter();
assertEquals("Null Default", null, new ArrayConverter(int[].class, intConverter, -1).convert(int[].class, null));
checkArray("Zero Length", zeroArray, new ArrayConverter(int[].class, intConverter, 0).convert(int[].class, null));
@@ -329,8 +329,8 @@ public class ArrayConverterTestCase exte
* Test Empty String
*/
public void testEmptyString() {
- int[] zeroArray = new int[0];
- IntegerConverter intConverter = new IntegerConverter();
+ final int[] zeroArray = new int[0];
+ final IntegerConverter intConverter = new IntegerConverter();
checkArray("Empty String", zeroArray, new ArrayConverter(int[].class, intConverter, -1).convert(int[].class, ""));
assertEquals("Default String", null, new ArrayConverter(int[].class, intConverter).convert(String.class, null));
@@ -343,19 +343,19 @@ public class ArrayConverterTestCase exte
try {
new ArrayConverter(null, new DateConverter());
fail("Default Type missing - expected IllegalArgumentException");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// expected result
}
try {
new ArrayConverter(Boolean.class, new DateConverter());
fail("Default Type not an array - expected IllegalArgumentException");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// expected result
}
try {
new ArrayConverter(int[].class, null);
fail("Component Converter missing - expected IllegalArgumentException");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// expected result
}
}
@@ -364,8 +364,8 @@ public class ArrayConverterTestCase exte
* Test for BEANUTILS-302 - throwing a NPE when underscore used
*/
public void testUnderscore_BEANUTILS_302() {
- String value = "first_value,second_value";
- ArrayConverter converter = new ArrayConverter(String[].class, new StringConverter());
+ final String value = "first_value,second_value";
+ final ArrayConverter converter = new ArrayConverter(String[].class, new StringConverter());
// test underscore not allowed (the default)
String[] result = converter.convert(String[].class, value);
@@ -393,17 +393,17 @@ public class ArrayConverterTestCase exte
* @param expected Expected Array value
* @param result Result array value
*/
- private void checkArray(String msg, Object expected, Object result) {
+ private void checkArray(final String msg, final Object expected, final Object result) {
assertNotNull(msg + " Expected Null", expected);
assertNotNull(msg + " Result Null", result);
assertTrue(msg + " Result not array", result.getClass().isArray());
assertTrue(msg + " Expected not array", expected.getClass().isArray());
- int resultLth = Array.getLength(result);
+ final int resultLth = Array.getLength(result);
assertEquals(msg + " Size", Array.getLength(expected), resultLth);
assertEquals(msg + " Type", expected.getClass(), result.getClass());
for (int i = 0; i < resultLth; i++) {
- Object expectElement = Array.get(expected, i);
- Object resultElement = Array.get(result, i);
+ final Object expectElement = Array.get(expected, i);
+ final Object resultElement = Array.get(result, i);
assertEquals(msg + " Element " + i, expectElement, resultElement);
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java Wed Oct 15 20:15:17 2014
@@ -35,7 +35,7 @@ public class BigDecimalConverterTestCase
// ------------------------------------------------------------------------
- public BigDecimalConverterTestCase(String name) {
+ public BigDecimalConverterTestCase(final String name) {
super(name);
}
@@ -67,7 +67,7 @@ public class BigDecimalConverterTestCase
}
@Override
- protected NumberConverter makeConverter(Object defaultValue) {
+ protected NumberConverter makeConverter(final Object defaultValue) {
return new BigDecimalConverter(defaultValue);
}
@@ -79,7 +79,7 @@ public class BigDecimalConverterTestCase
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ final String[] message= {
"from String",
"from String",
"from String",
@@ -95,7 +95,7 @@ public class BigDecimalConverterTestCase
"from BigDecimal extension"
};
- Object[] input = {
+ final Object[] input = {
"-17.2",
"-1.1",
"0.0",
@@ -111,7 +111,7 @@ public class BigDecimalConverterTestCase
new ExtendingBigDecimal("3200.11")
};
- BigDecimal[] expected = {
+ final BigDecimal[] expected = {
new BigDecimal("-17.2"),
new BigDecimal("-1.1"),
new BigDecimal("0.0"),
@@ -144,7 +144,7 @@ public class BigDecimalConverterTestCase
* derived number classes are handled correctly.
*/
private class ExtendingBigDecimal extends BigDecimal {
- private ExtendingBigDecimal(String val) {
+ private ExtendingBigDecimal(final String val) {
super(val);
}
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java Wed Oct 15 20:15:17 2014
@@ -35,7 +35,7 @@ public class BigIntegerConverterTestCase
// ------------------------------------------------------------------------
- public BigIntegerConverterTestCase(String name) {
+ public BigIntegerConverterTestCase(final String name) {
super(name);
}
@@ -67,7 +67,7 @@ public class BigIntegerConverterTestCase
}
@Override
- protected NumberConverter makeConverter(Object defaultValue) {
+ protected NumberConverter makeConverter(final Object defaultValue) {
return new BigIntegerConverter(defaultValue);
}
@@ -79,7 +79,7 @@ public class BigIntegerConverterTestCase
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ final String[] message= {
"from String",
"from String",
"from String",
@@ -95,7 +95,7 @@ public class BigIntegerConverterTestCase
"from Double"
};
- Object[] input = {
+ final Object[] input = {
String.valueOf(Long.MIN_VALUE),
"-17",
"-1",
@@ -111,7 +111,7 @@ public class BigIntegerConverterTestCase
new Double(12.2)
};
- BigInteger[] expected = {
+ final BigInteger[] expected = {
BigInteger.valueOf(Long.MIN_VALUE),
BigInteger.valueOf(-17),
BigInteger.valueOf(-1),