You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2013/03/03 12:19:54 UTC
svn commit: r1452028 [5/7] - in /commons/proper/beanutils/trunk/src:
changes/ main/java/org/apache/commons/beanutils/
main/java/org/apache/commons/beanutils/converters/
main/java/org/apache/commons/beanutils/locale/
main/java/org/apache/commons/beanuti...
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils;
@@ -84,7 +84,7 @@ public class TestBean implements Seriali
public TestBean(double doubleProperty) {
setDoubleProperty(doubleProperty);
}
-
+
TestBean(int intProperty) {
setIntProperty(intProperty);
}
@@ -406,11 +406,11 @@ public class TestBean implements Seriali
* Another nested reference to another test bean,
*/
private TestBean anotherNested = null;
-
+
public TestBean getAnotherNested() {
return anotherNested;
}
-
+
public void setAnotherNested( TestBean anotherNested ) {
this.anotherNested = anotherNested;
}
@@ -419,15 +419,15 @@ public class TestBean implements Seriali
* Another nested reference to another test bean,
*/
private DynaBean nestedDynaBean = null;
-
+
public DynaBean getNestedDynaBean() {
return nestedDynaBean;
}
-
+
public void setNestedDynaBean(DynaBean nestedDynaBean) {
this.nestedDynaBean = nestedDynaBean;
}
-
+
/*
* Another nested reference to a bean containing mapp properties
*/
@@ -618,10 +618,10 @@ public class TestBean implements Seriali
}
/**
- * Increments the current value of the count by the
- * specified amount * 2. It has the same name
- * as the method above so as to test the looseness
- * of getMethod.
+ * Increments the current value of the count by the
+ * specified amount * 2. It has the same name
+ * as the method above so as to test the looseness
+ * of getMethod.
*/
public static void incrementCounter(Number amount) {
counter += 2 * amount.intValue();
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPackageSubclass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPackageSubclass.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPackageSubclass.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPackageSubclass.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPublicSubclass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPublicSubclass.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPublicSubclass.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBeanPublicSubclass.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSet.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSet.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSet.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils;
@@ -92,14 +92,14 @@ public class TestResultSet implements In
Class[] interfaces = new Class[] { ResultSet.class };
return (ResultSet)Proxy.newProxyInstance(classLoader, interfaces, invocationHandler);
}
-
+
/**
* Create a proxy ResultSet.
*/
public TestResultSet() {
this(TestResultSetMetaData.createProxy());
}
-
+
/**
* Create a proxy ResultSet with the specified meta data.
*
@@ -110,7 +110,7 @@ public class TestResultSet implements In
}
/**
- * Handles method invocation on the ResultSet proxy.
+ * Handles method invocation on the ResultSet proxy.
*
* @param proxy The proxy ResultSet object
* @param method the method being invoked
@@ -138,7 +138,7 @@ public class TestResultSet implements In
updateObject((String)args[0], args[1]);
return null;
}
-
+
throw new UnsupportedOperationException(methodName + " not implemented");
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils;
@@ -83,7 +83,7 @@ public class TestResultSetMetaData imple
}
/**
- * Handles method invocation on the {@link ResultSetMetaData} proxy.
+ * Handles method invocation on the {@link ResultSetMetaData} proxy.
*
* @param proxy The proxy ResultSet object
* @param method the method being invoked
@@ -102,7 +102,7 @@ public class TestResultSetMetaData imple
} if ("getColumnType".equals(methodName)) {
return getColumnType(((Integer)args[0]).intValue());
}
-
+
throw new UnsupportedOperationException(methodName + " not implemented");
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/ThrowExceptionConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/ThrowExceptionConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/ThrowExceptionConverter.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/ThrowExceptionConverter.java Sun Mar 3 11:19:49 2013
@@ -5,22 +5,22 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils;
/**
- * Converter implementation that throws a <code>PassTestException</code>
+ * Converter implementation that throws a <code>PassTestException</code>
* when convert is called.
* The idea is that catching this exception is a clear signal that this method
* has been called.
@@ -29,7 +29,7 @@ package org.apache.commons.beanutils;
*/
public class ThrowExceptionConverter implements Converter {
-
+
public Object convert(Class type, Object value) {
throw new PassTestException();
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils;
@@ -266,14 +266,14 @@ public class WrapDynaBeanTestCase extend
// Create a bean and set a value
WrapDynaBean origBean = new WrapDynaBean(new TestBean());
Integer newValue = new Integer(789);
- assertEquals("origBean default", new Integer(123), (Integer)origBean.get("intProperty"));
- origBean.set("intProperty", newValue);
- assertEquals("origBean new value", newValue, (Integer)origBean.get("intProperty"));
-
+ assertEquals("origBean default", new Integer(123), origBean.get("intProperty"));
+ origBean.set("intProperty", newValue);
+ assertEquals("origBean new value", newValue, origBean.get("intProperty"));
+
// Serialize/Deserialize & test value
WrapDynaBean bean = (WrapDynaBean)serializeDeserialize(origBean, "First Test");
- assertEquals("bean value", newValue, (Integer)bean.get("intProperty"));
-
+ assertEquals("bean value", newValue, bean.get("intProperty"));
+
}
/**
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java Sun Mar 3 11:19:49 2013
@@ -98,7 +98,7 @@ public class Jira157TestCase extends Tes
}
public String getY() {
return "y-value";
- }
+ }
};
Map result = null;
try {
@@ -124,7 +124,7 @@ public class Jira157TestCase extends Tes
}
public String getY() {
return "y-value";
- }
+ }
};
Map result = null;
try {
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java Sun Mar 3 11:19:49 2013
@@ -30,8 +30,8 @@ import org.apache.commons.logging.LogFac
* <p />
* See https://issues.apache.org/jira/browse/BEANUTILS-18
* <p />
- *
- *
+ *
+ *
* <p />
* This test case demonstrates the issue.
*
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -88,7 +88,7 @@ public class Jira339TestCase extends Tes
* Test {@link PropertyUtils#setProperty(Object, String, Object)}
*/
public void testIssue_BEANUTILS_339_BeanUtilsBean_setProperty() {
-
+
TestBean bean = new TestBean();
try {
BeanUtils.setProperty(bean, "comparator", null);
@@ -103,7 +103,7 @@ public class Jira339TestCase extends Tes
* Test {@link BeanUtils#populate(Object, Map)}
*/
public void testIssue_BEANUTILS_331_BeanUtilsBean_populate() {
-
+
TestBean bean = new TestBean();
try {
Map properties = new HashMap();
@@ -139,6 +139,6 @@ public class Jira339TestCase extends Tes
public void setComparator(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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -102,7 +102,7 @@ public class Jira345TestCase extends Tes
{{"11","12"}, {"13","14"}},
{{"21","22"}, {"23","24"}},
};
-
+
public String[][] getMatr() {
return matr;
}
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -36,18 +36,18 @@ import org.apache.commons.beanutils.memo
* @version $Revision$ $Date$
*/
public class Jira347TestCase extends TestCase {
-
+
/**
* Tests that MappedPropertyDescriptor does not throw an exception while re-creating a Method reference after it
* has been garbage collected under the following circumstances.
* - a class has a property 'mappedProperty'
* - there is no getter for this property
* - there is method setMappedProperty(MappedPropertyTestBean,MappedPropertyTestBean)
- *
+ *
* In this case getMappedWriteMethod should not throw an exception after the method reference has been garbage collected.
- * It is essential that in both cases the same method is returned or in both cases null.
+ * It is essential that in both cases the same method is returned or in both cases null.
* If the constructor of the MappedPropertyDescriptor would recognize the situation (of the first param not being of type String)
- * this would be fine as well.
+ * this would be fine as well.
*/
public void testMappedPropertyDescriptor_AnyArgsProperty() throws Exception {
String className = "org.apache.commons.beanutils.MappedPropertyTestBean";
@@ -70,7 +70,7 @@ public class Jira347TestCase extends Tes
catch (IntrospectionException e) {
// this would be fine as well
}
-
+
if (descriptor != null) {
String m1 = getMappedWriteMethod(descriptor);
forceGarbageCollection();
@@ -83,21 +83,21 @@ public class Jira347TestCase extends Tes
}
}
}
-
+
/**
* Retrieves the string representation of the mapped write method
* for the given descriptor.
- * This conversion is needed as there must not be strong reference to the
+ * This conversion is needed as there must not be strong reference to the
* Method object outside of this method as otherwise the garbage collector will not
- * clean up the soft reference within the MappedPropertyDescriptor.
- *
+ * clean up the soft reference within the MappedPropertyDescriptor.
+ *
* @return the string representation or null if mapped write method does not exist
*/
private String getMappedWriteMethod(MappedPropertyDescriptor descriptor) {
Method m = descriptor.getMappedWriteMethod();
return m == null ? null : m.toString();
}
-
+
/**
* Try to force the garbage collector to run by filling up memory and calling System.gc().
*/
@@ -117,16 +117,16 @@ public class Jira347TestCase extends Tes
list.clear();
list = null;
// System.out.println("Count " + count + " : " + getMemoryStats());
- System.gc();
+ System.gc();
Thread.sleep(1000);
}
// System.out.println("After GC: " + getMemoryStats());
-
+
if (ref.get() != null) {
throw new IllegalStateException("Your JVM is not releasing SoftReference, try running the testcase with less memory (-Xmx)");
}
}
-
+
/**
* Create a new class loader instance.
*/
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -88,7 +88,7 @@ public class Jira357TestCase extends Tes
* Test {@link PropertyUtils#getPropertyDescriptors(Class)}
*/
public void testPropertyUtils_getPropertyDescriptors_Bar() throws Exception {
-
+
// FIXME the isBar() method returning AbstractTestBean.class as the
// declaring class instead of ConcreteTestBean.class
// causing this test to fail - so its commented out for now
@@ -106,7 +106,7 @@ public class Jira357TestCase extends Tes
* Test {@link PropertyUtils#getPropertyDescriptors(Class)}
*/
private void checkReadMethod(String propertyName, Class expectedDeclaringClass) throws Exception {
-
+
PropertyDescriptor[] descriptors = null;
try {
descriptors = PropertyUtils.getPropertyDescriptors(ConcreteTestBean.class);
@@ -147,7 +147,7 @@ public class Jira357TestCase extends Tes
public abstract void setBar(boolean bar);
public abstract AbstractTestBean.InnerClass getInnerClassProperty();
-
+
/** Inner Class */
public abstract static class InnerClass {
private String firstName;
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -80,7 +80,7 @@ public class Jira358TestCase extends Tes
* Test {@link PropertyUtils#getIndexedProperty(Object, String, int)}
*/
public void testPropertyUtils_getIndexedProperty_Array() throws Exception {
-
+
TestBean bean = new TestBean();
try {
PropertyUtils.getIndexedProperty(bean, "intArray", bean.getIntArray().length);
@@ -94,7 +94,7 @@ public class Jira358TestCase extends Tes
* Test {@link PropertyUtils#getIndexedProperty(Object, String, int)}
*/
public void testPropertyUtils_getIndexedProperty_List() throws Exception {
-
+
TestBean bean = new TestBean();
try {
PropertyUtils.getIndexedProperty(bean, "listIndexed", bean.getListIndexed().size());
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -157,5 +157,5 @@ public class Jira359TestCase extends Tes
public void setJcrMixinTypes(String[] mixinTypes) {
this.jcrMixinTypes = mixinTypes;
}
- }
+ }
}
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -50,13 +50,13 @@ public class Jira381TestCase extends Tes
* See Jira issue# BEANUTILS-381.
*/
public void testIssue_BEANUTILS_381_getMatchingAccessibleMethod() {
-
+
Class target = TestServiceBean.class;
String methodName = "performOp";
Class[] runtimeClasses = new Class[]{TestObjectSubclass.class};
-
+
Method returned = MethodUtils.getMatchingAccessibleMethod(target, methodName, runtimeClasses);
-
+
assertEquals(target, returned.getDeclaringClass());
assertEquals(methodName, returned.getName());
assertEquals(TestObject.class, returned.getParameterTypes()[0]);
@@ -66,20 +66,20 @@ public class Jira381TestCase extends Tes
* Test bean.
*/
public class TestServiceBean{
-
+
/**
* Generic object method
*/
public void performOp(Object o){
}
-
+
/**
* Object method
*/
public void performOp(TestObject o){
}
}
-
+
/**
* Test object.
*
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -39,10 +39,10 @@ public class Jira92TestCase extends Test
}
/**
- * Test bean which has only indexed setter
+ * Test bean which has only indexed setter
*/
public static class Jira92TestBean {
-
+
private final java.util.Date[] dateArrayProperty = new java.util.Date[10];
/**
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -24,7 +24,7 @@ import org.apache.commons.beanutils.bugs
/**
* Factory whcih creates <i>package</i> scope beans with
* public methods for {@link Jira18TestCase}.
- *
+ *
* @version $Revision$ $Date$
*/
public class Jira18BeanFactory {
@@ -52,7 +52,7 @@ public class Jira18BeanFactory {
}
/**
* Return simple property.
- *
+ *
* @return The simple value
*/
public String getSimple() {
@@ -61,7 +61,7 @@ public class Jira18BeanFactory {
/**
* Set simple property.
- *
+ *
* @param simple The simple value
*/
public void setSimple(String simple) {
@@ -70,7 +70,7 @@ public class Jira18BeanFactory {
/**
* Return indexed property.
- *
+ *
* @param index The index
* @return The indexed value
*/
@@ -80,7 +80,7 @@ public class Jira18BeanFactory {
/**
* Set indexed property.
- *
+ *
* @param index The index
* @param value The indexed value
*/
@@ -90,7 +90,7 @@ public class Jira18BeanFactory {
/**
* Return mapped property.
- *
+ *
* @param key The mapped key
* @return The mapped value
*/
@@ -100,7 +100,7 @@ public class Jira18BeanFactory {
/**
* Set mapped property.
- *
+ *
* @param key The mapped key
* @param value The mapped value
*/
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -38,7 +38,7 @@ public class Jira61BeanFactory {
}
/**
- * Test Bean
+ * Test Bean
*/
public static class TestBean {
@@ -72,7 +72,7 @@ public class Jira61BeanFactory {
/**
* Return indexed property.
- *
+ *
* @param index The index
* @return The indexed value
*/
@@ -82,7 +82,7 @@ public class Jira61BeanFactory {
/**
* Set indexed property.
- *
+ *
* @param index The index
* @param value The indexed value
*/
@@ -92,7 +92,7 @@ public class Jira61BeanFactory {
/**
* Return mapped property.
- *
+ *
* @param key The mapped key
* @return The mapped value
*/
@@ -102,7 +102,7 @@ public class Jira61BeanFactory {
/**
* Set mapped property.
- *
+ *
* @param key The mapped key
* @param value The mapped 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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -54,7 +54,7 @@ public class Jira87BeanFactory {
/**
* This implementation returns the key value.
- *
+ *
* @param key The key of the mapped value
* @return The key value
*/
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
import java.lang.reflect.Array;
@@ -37,7 +37,7 @@ public class ArrayConverterTestCase exte
public ArrayConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
/**
@@ -45,7 +45,7 @@ public class ArrayConverterTestCase exte
* @return test suite
*/
public static TestSuite suite() {
- return new TestSuite(ArrayConverterTestCase.class);
+ return new TestSuite(ArrayConverterTestCase.class);
}
/** Set Up */
@@ -86,7 +86,7 @@ public class ArrayConverterTestCase exte
longList.add(LONGArray[i]);
}
-
+
String msg = null;
// String --> int[]
@@ -218,7 +218,7 @@ public class ArrayConverterTestCase exte
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};
@@ -277,7 +277,7 @@ public class ArrayConverterTestCase exte
// 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
+ // N.B. Uses the default comma (i.e. ",") as the delimiter between individual numbers
ArrayConverter arrayConverter = new ArrayConverter(int[].class, integerConverter);
// Construct a "Matrix" Converter which converts arrays of integer arrays using
@@ -317,7 +317,7 @@ public class ArrayConverterTestCase exte
int[] zeroArray = new int[0];
int[] oneArray = new int[1];
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));
checkArray("One Length", oneArray, new ArrayConverter(Integer[].class, intConverter, 1).convert(int[].class, null));
@@ -329,7 +329,7 @@ public class ArrayConverterTestCase exte
public void testEmptyString() {
int[] zeroArray = new int[0];
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));
}
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -40,7 +40,7 @@ public class BigDecimalConverterTestCase
public BigDecimalConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -52,7 +52,7 @@ public class BigDecimalConverterTestCase
}
public static TestSuite suite() {
- return new TestSuite(BigDecimalConverterTestCase.class);
+ return new TestSuite(BigDecimalConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -60,15 +60,15 @@ public class BigDecimalConverterTestCase
}
// ------------------------------------------------------------------------
-
+
protected NumberConverter makeConverter() {
return new BigDecimalConverter();
}
-
+
protected NumberConverter makeConverter(Object defaultValue) {
return new BigDecimalConverter(defaultValue);
}
-
+
protected Class getExpectedType() {
return BigDecimal.class;
}
@@ -76,7 +76,7 @@ public class BigDecimalConverterTestCase
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String",
@@ -89,8 +89,8 @@ public class BigDecimalConverterTestCase
"from Float",
"from Double"
};
-
- Object[] input = {
+
+ Object[] input = {
"-17.2",
"-1.1",
"0.0",
@@ -103,8 +103,8 @@ public class BigDecimalConverterTestCase
new Float("11.1"),
new Double("12.2")
};
-
- BigDecimal[] expected = {
+
+ BigDecimal[] expected = {
new BigDecimal("-17.2"),
new BigDecimal("-1.1"),
new BigDecimal("0.0"),
@@ -117,7 +117,7 @@ public class BigDecimalConverterTestCase
new BigDecimal("11.1"),
new BigDecimal("12.2")
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(
message[i] + " to BigDecimal",
@@ -129,6 +129,6 @@ public class BigDecimalConverterTestCase
converter.convert(null,input[i]));
}
}
-
+
}
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=1452028&r1=1452027&r2=1452028&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 Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -38,7 +38,7 @@ public class BigIntegerConverterTestCase
public BigIntegerConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -50,7 +50,7 @@ public class BigIntegerConverterTestCase
}
public static TestSuite suite() {
- return new TestSuite(BigIntegerConverterTestCase.class);
+ return new TestSuite(BigIntegerConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -58,15 +58,15 @@ public class BigIntegerConverterTestCase
}
// ------------------------------------------------------------------------
-
+
protected NumberConverter makeConverter() {
return new BigIntegerConverter();
}
-
+
protected NumberConverter makeConverter(Object defaultValue) {
return new BigIntegerConverter(defaultValue);
}
-
+
protected Class getExpectedType() {
return BigInteger.class;
}
@@ -74,7 +74,7 @@ public class BigIntegerConverterTestCase
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String",
@@ -89,8 +89,8 @@ public class BigIntegerConverterTestCase
"from Float",
"from Double"
};
-
- Object[] input = {
+
+ Object[] input = {
String.valueOf(Long.MIN_VALUE),
"-17",
"-1",
@@ -106,7 +106,7 @@ public class BigIntegerConverterTestCase
new Double(12.2)
};
- BigInteger[] expected = {
+ BigInteger[] expected = {
BigInteger.valueOf(Long.MIN_VALUE),
BigInteger.valueOf(-17),
BigInteger.valueOf(-1),
@@ -121,12 +121,12 @@ public class BigIntegerConverterTestCase
BigInteger.valueOf(11),
BigInteger.valueOf(12)
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(message[i] + " to BigInteger",expected[i],converter.convert(BigInteger.class,input[i]));
assertEquals(message[i] + " to null type",expected[i],converter.convert(null,input[i]));
}
}
-
+
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -52,12 +52,12 @@ public class BooleanArrayConverterTestCa
*/
public void testStandardStringArrayConversion() {
String[] values = {
- "true", "false",
+ "true", "false",
"yes", "no",
"y", "n",
"1", "0",
};
-
+
BooleanArrayConverter converter = new BooleanArrayConverter();
boolean[] results = (boolean[]) converter.convert(null, values);
@@ -134,7 +134,7 @@ public class BooleanArrayConverterTestCa
assertTrue(results[0]);
// string has only one element, quoted with '
- // Here we also pass an object of type String rather than the
+ // Here we also pass an object of type String rather than the
// StringBuffer
results = (boolean[]) converter.convert(null, "'yes'");
@@ -155,14 +155,14 @@ public class BooleanArrayConverterTestCa
trueStrings, falseStrings, BooleanConverter.NO_DEFAULT);
BooleanArrayConverter converter = new BooleanArrayConverter(
bc, BooleanArrayConverter.NO_DEFAULT);
-
+
boolean[] results = (boolean[]) converter.convert(null, "NOPE, sure, sure");
assertNotNull(results);
assertEquals(3, results.length);
assertFalse(results[0]);
assertTrue(results[1]);
assertTrue(results[2]);
-
+
try {
// the literal string 'true' should no longer be recognised as
// a true value..
@@ -226,7 +226,7 @@ public class BooleanArrayConverterTestCa
Object o = converter.convert(null, "true,bogus");
assertSame("Unexpected object returned for failed conversion", o, defaults);
}
-
+
/**
* Check that when a custom BooleanConverter is used, and that converter
* has a (per-element) default, then that element (and just that element)
@@ -243,12 +243,12 @@ public class BooleanArrayConverterTestCa
BooleanConverter bc = new BooleanConverter(Boolean.TRUE);
BooleanArrayConverter converter = new BooleanArrayConverter(bc, defaults);
boolean[] results = (boolean[]) converter.convert(null, "true,bogus");
-
+
assertEquals(2, results.length);
assertTrue(results[0]);
assertTrue(results[1]);
}
-
+
/**
* Check that registration of a custom converter works.
*/
@@ -260,11 +260,11 @@ public class BooleanArrayConverterTestCa
BooleanArrayConverter converter = new BooleanArrayConverter(
bc, BooleanArrayConverter.NO_DEFAULT);
-
+
ConvertUtils.register(converter, BooleanArrayConverter.MODEL);
boolean[] sample = new boolean[0];
boolean[] results = (boolean[]) ConvertUtils.convert("sure,nope", sample.getClass());
-
+
assertEquals(2, results.length);
assertTrue(results[0]);
assertFalse(results[1]);
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -94,7 +94,7 @@ public class BooleanConverterTestCase ex
}
- protected void testConversionValues(BooleanConverter converter,
+ protected void testConversionValues(BooleanConverter converter,
String[] trueValues, String[] falseValues) {
for (int i = 0; i < trueValues.length; i++) {
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -38,7 +38,7 @@ public class ByteConverterTestCase exten
public ByteConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -50,7 +50,7 @@ public class ByteConverterTestCase exten
}
public static TestSuite suite() {
- return new TestSuite(ByteConverterTestCase.class);
+ return new TestSuite(ByteConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -58,11 +58,11 @@ public class ByteConverterTestCase exten
}
// ------------------------------------------------------------------------
-
+
protected NumberConverter makeConverter() {
return new ByteConverter();
}
-
+
protected NumberConverter makeConverter(Object defaultValue) {
return new ByteConverter(defaultValue);
}
@@ -73,7 +73,7 @@ public class ByteConverterTestCase exten
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String",
@@ -88,8 +88,8 @@ public class ByteConverterTestCase exten
"from Float",
"from Double"
};
-
- Object[] input = {
+
+ Object[] input = {
String.valueOf(Byte.MIN_VALUE),
"-17",
"-1",
@@ -104,8 +104,8 @@ public class ByteConverterTestCase exten
new Float(11.1),
new Double(12.2)
};
-
- Byte[] expected = {
+
+ Byte[] expected = {
new Byte(Byte.MIN_VALUE),
new Byte((byte)-17),
new Byte((byte)-1),
@@ -120,7 +120,7 @@ public class ByteConverterTestCase exten
new Byte((byte)11),
new Byte((byte)12)
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(message[i] + " to Byte",expected[i],converter.convert(Byte.class,input[i]));
assertEquals(message[i] + " to byte",expected[i],converter.convert(Byte.TYPE,input[i]));
@@ -162,6 +162,6 @@ public class ByteConverterTestCase exten
// expected result
}
}
-
+
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -41,7 +41,7 @@ public class CalendarConverterTestCase e
* @return test suite
*/
public static TestSuite suite() {
- return new TestSuite(CalendarConverterTestCase.class);
+ return new TestSuite(CalendarConverterTestCase.class);
}
// ------------------------------------------------------------------------
@@ -52,7 +52,7 @@ public class CalendarConverterTestCase e
protected DateTimeConverter makeConverter() {
return new CalendarConverter();
}
-
+
/**
* Create the Converter with a default value.
* @param defaultValue The default value
@@ -72,7 +72,7 @@ public class CalendarConverterTestCase e
/**
* Convert from a java.util.Date to the Converter's type.
- *
+ *
* @param value The Date value to convert
* @return The converted value
*/
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
import junit.framework.TestCase;
@@ -35,7 +35,7 @@ public class CharacterConverterTestCase
public CharacterConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
/**
@@ -43,7 +43,7 @@ public class CharacterConverterTestCase
* @return test suite
*/
public static TestSuite suite() {
- return new TestSuite(CharacterConverterTestCase.class);
+ return new TestSuite(CharacterConverterTestCase.class);
}
/** Set Up */
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
import junit.framework.TestCase;
@@ -36,7 +36,7 @@ public class ClassConverterTestCase exte
public ClassConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
/**
@@ -44,7 +44,7 @@ public class ClassConverterTestCase exte
* @return test suite
*/
public static TestSuite suite() {
- return new TestSuite(ClassConverterTestCase.class);
+ return new TestSuite(ClassConverterTestCase.class);
}
/** Set Up */
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java Sun Mar 3 11:19:49 2013
@@ -24,13 +24,13 @@ import java.io.IOException;
/**
* A special classloader useful for testing j2ee-like scenarios.
- *
+ *
* <p>In some tests we want to be able to emulate "container" frameworks,
* where code runs in a hierarchy of classloaders, and certain classes may
* be loaded by various classloaders in the hierarchy.</p>
*
* <p>Normally this is done by having certain jars or class-file-directories
- * in the classpath of some classloaders but not others. This is quite
+ * in the classpath of some classloaders but not others. This is quite
* difficult difficult to integrate with the build process for the unit
* tests though; compiling certain classes and having the output go into
* places that is not in the default classpath for the unit tests would be
@@ -48,7 +48,7 @@ public class ClassReloader extends Class
public ClassReloader(ClassLoader parent) {
super(parent);
}
-
+
/**
* Given a class already in the classpath of a parent classloader,
* reload that class via this classloader.
@@ -57,11 +57,11 @@ public class ClassReloader extends Class
String className = clazz.getName();
String classFile = className.replace('.', '/') + ".class";
InputStream classStream = getParent().getResourceAsStream(classFile);
-
+
if (classStream == null) {
throw new FileNotFoundException(classFile);
}
-
+
byte[] buf = new byte[1024];
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for(;;) {
@@ -71,9 +71,9 @@ public class ClassReloader extends Class
baos.write(buf, 0, bytesRead);
}
classStream.close();
-
+
byte[] classData = baos.toByteArray();
-
+
// now we have the raw class data, let's turn it into a class
Class newClass = defineClass(className, classData, 0, classData.length);
resolveClass(newClass);
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java Sun Mar 3 11:19:49 2013
@@ -41,7 +41,7 @@ public class ClassReloaderTestCase exten
public static class DummyClass {
}
-
+
/**
* Test basic operation of the ClassReloader.
*/
@@ -54,7 +54,7 @@ public class ClassReloaderTestCase exten
// the two Class objects contain the same bytecode, but are not equal
assertTrue(sharedClass != componentClass);
-
+
// the two class objects have different classloaders
assertSame(sharedLoader, sharedClass.getClassLoader());
assertSame(componentLoader, componentClass.getClassLoader());
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java Sun Mar 3 11:19:49 2013
@@ -53,7 +53,7 @@ public abstract class DateConverterTestB
* @return A new Converter
*/
protected abstract DateTimeConverter makeConverter();
-
+
/**
* Create the Converter with a default value.
* @param defaultValue The default value
@@ -69,7 +69,7 @@ public abstract class DateConverterTestB
/**
* Convert from a Calendar to the appropriate Date type
- *
+ *
* @param value The Calendar value to convert
* @return The converted value
*/
@@ -111,7 +111,7 @@ public abstract class DateConverterTestB
new java.sql.Time(now),
new java.sql.Timestamp(now)
};
-
+
// Initialize calendar also with same ms to avoid a failing test in a new time slice
((GregorianCalendar)date[1]).setTime(new Date(now));
@@ -139,7 +139,7 @@ public abstract class DateConverterTestB
String testString = "2006-10-29";
Calendar calendar = toCalendar(testString, pattern, null);
Object expected = toType(calendar);
-
+
Object result = converter.convert(null, testString);
if (getExpectedType().equals(Calendar.class)) {
assertTrue("TYPE ", getExpectedType().isAssignableFrom(result.getClass()));
@@ -433,7 +433,7 @@ public abstract class DateConverterTestB
String msg = "Converting '" + valueType + "' value '" + value + "'";
try {
Object result = converter.convert(getExpectedType(), value);
- fail(msg + ", expected ConversionException, but result = '" + result + "'");
+ fail(msg + ", expected ConversionException, but result = '" + result + "'");
} catch (ConversionException ex) {
// Expected Result
}
@@ -461,7 +461,7 @@ public abstract class DateConverterTestB
Calendar toCalendar(String value, String pattern, Locale locale) {
Calendar calendar = null;
try {
- DateFormat format = (locale == null)
+ DateFormat format = (locale == null)
? new SimpleDateFormat(pattern)
: new SimpleDateFormat(pattern, locale);
format.setLenient(false);
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -43,7 +43,7 @@ public class DateConverterTestCase exten
* @return test suite
*/
public static TestSuite suite() {
- return new TestSuite(DateConverterTestCase.class);
+ return new TestSuite(DateConverterTestCase.class);
}
/** Set Up */
@@ -55,7 +55,7 @@ public class DateConverterTestCase exten
}
// ------------------------------------------------------------------------
-
+
/**
* Create the Converter with no default value.
* @return A new Converter
@@ -63,7 +63,7 @@ public class DateConverterTestCase exten
protected DateTimeConverter makeConverter() {
return new DateConverter();
}
-
+
/**
* Create the Converter with a default value.
* @param defaultValue The default value
@@ -83,7 +83,7 @@ public class DateConverterTestCase exten
/**
* Convert from a Calendar to the appropriate Date type
- *
+ *
* @param value The Calendar value to convert
* @return The converted value
*/
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -38,7 +38,7 @@ public class DoubleConverterTestCase ext
public DoubleConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -50,7 +50,7 @@ public class DoubleConverterTestCase ext
}
public static TestSuite suite() {
- return new TestSuite(DoubleConverterTestCase.class);
+ return new TestSuite(DoubleConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -58,15 +58,15 @@ public class DoubleConverterTestCase ext
}
// ------------------------------------------------------------------------
-
+
protected NumberConverter makeConverter() {
return new DoubleConverter();
}
-
+
protected NumberConverter makeConverter(Object defaultValue) {
return new DoubleConverter(defaultValue);
}
-
+
protected Class getExpectedType() {
return Double.class;
}
@@ -74,7 +74,7 @@ public class DoubleConverterTestCase ext
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String",
@@ -89,8 +89,8 @@ public class DoubleConverterTestCase ext
"from Float",
"from Double"
};
-
- Object[] input = {
+
+ Object[] input = {
String.valueOf(Double.MIN_VALUE),
"-17.2",
"-1.1",
@@ -105,8 +105,8 @@ public class DoubleConverterTestCase ext
new Float(11.1),
new Double(12.2)
};
-
- Double[] expected = {
+
+ Double[] expected = {
new Double(Double.MIN_VALUE),
new Double(-17.2),
new Double(-1.1),
@@ -121,7 +121,7 @@ public class DoubleConverterTestCase ext
new Double(11.1),
new Double(12.2)
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(
message[i] + " to Double",
@@ -140,6 +140,6 @@ public class DoubleConverterTestCase ext
0.00001D);
}
}
-
+
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -41,7 +41,7 @@ public class FileConverterTestCase exten
public FileConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -49,7 +49,7 @@ public class FileConverterTestCase exten
}
public static TestSuite suite() {
- return new TestSuite(FileConverterTestCase.class);
+ return new TestSuite(FileConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -57,11 +57,11 @@ public class FileConverterTestCase exten
}
// ------------------------------------------------------------------------
-
+
protected Converter makeConverter() {
return new FileConverter();
}
-
+
protected Class getExpectedType() {
return File.class;
}
@@ -69,29 +69,29 @@ public class FileConverterTestCase exten
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String"
};
-
- Object[] input = {
+
+ Object[] input = {
"/tmp",
"/tmp/foo.txt",
"/tmp/does/not/exist.foo"
};
-
- File[] expected = {
+
+ File[] expected = {
new File("/tmp"),
new File("/tmp/foo.txt"),
new File("/tmp/does/not/exist.foo")
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(message[i] + " to File",expected[i],converter.convert(File.class,input[i]));
assertEquals(message[i] + " to null type",expected[i],converter.convert(null,input[i]));
}
}
-
+
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -38,7 +38,7 @@ public class FloatConverterTestCase exte
public FloatConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -50,7 +50,7 @@ public class FloatConverterTestCase exte
}
public static TestSuite suite() {
- return new TestSuite(FloatConverterTestCase.class);
+ return new TestSuite(FloatConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -58,15 +58,15 @@ public class FloatConverterTestCase exte
}
// ------------------------------------------------------------------------
-
+
protected NumberConverter makeConverter() {
return new FloatConverter();
}
-
+
protected NumberConverter makeConverter(Object defaultValue) {
return new FloatConverter(defaultValue);
}
-
+
protected Class getExpectedType() {
return Float.class;
}
@@ -74,7 +74,7 @@ public class FloatConverterTestCase exte
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String",
@@ -89,8 +89,8 @@ public class FloatConverterTestCase exte
"from Float",
"from Double"
};
-
- Object[] input = {
+
+ Object[] input = {
String.valueOf(Float.MIN_VALUE),
"-17.2",
"-1.1",
@@ -105,8 +105,8 @@ public class FloatConverterTestCase exte
new Float(11.1),
new Double(12.2),
};
-
- Float[] expected = {
+
+ Float[] expected = {
new Float(Float.MIN_VALUE),
new Float(-17.2),
new Float(-1.1),
@@ -121,7 +121,7 @@ public class FloatConverterTestCase exte
new Float(11.1),
new Float(12.2)
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(
message[i] + " to Float",
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -38,7 +38,7 @@ public class IntegerConverterTestCase ex
public IntegerConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -50,7 +50,7 @@ public class IntegerConverterTestCase ex
}
public static TestSuite suite() {
- return new TestSuite(IntegerConverterTestCase.class);
+ return new TestSuite(IntegerConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -58,15 +58,15 @@ public class IntegerConverterTestCase ex
}
// ------------------------------------------------------------------------
-
+
protected NumberConverter makeConverter() {
return new IntegerConverter();
}
-
+
protected NumberConverter makeConverter(Object defaultValue) {
return new IntegerConverter(defaultValue);
}
-
+
protected Class getExpectedType() {
return Integer.class;
}
@@ -74,7 +74,7 @@ public class IntegerConverterTestCase ex
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String",
@@ -89,8 +89,8 @@ public class IntegerConverterTestCase ex
"from Float",
"from Double"
};
-
- Object[] input = {
+
+ Object[] input = {
String.valueOf(Integer.MIN_VALUE),
"-17",
"-1",
@@ -105,8 +105,8 @@ public class IntegerConverterTestCase ex
new Float(11.1),
new Double(12.2)
};
-
- Integer[] expected = {
+
+ Integer[] expected = {
new Integer(Integer.MIN_VALUE),
new Integer(-17),
new Integer(-1),
@@ -121,7 +121,7 @@ public class IntegerConverterTestCase ex
new Integer(11),
new Integer(12)
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(message[i] + " to Integer",expected[i],converter.convert(Integer.class,input[i]));
assertEquals(message[i] + " to int",expected[i],converter.convert(Integer.TYPE,input[i]));
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java Sun Mar 3 11:19:49 2013
@@ -5,15 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.commons.beanutils.converters;
@@ -38,7 +38,7 @@ public class LongConverterTestCase exten
public LongConverterTestCase(String name) {
super(name);
}
-
+
// ------------------------------------------------------------------------
public void setUp() throws Exception {
@@ -50,7 +50,7 @@ public class LongConverterTestCase exten
}
public static TestSuite suite() {
- return new TestSuite(LongConverterTestCase.class);
+ return new TestSuite(LongConverterTestCase.class);
}
public void tearDown() throws Exception {
@@ -58,15 +58,15 @@ public class LongConverterTestCase exten
}
// ------------------------------------------------------------------------
-
+
protected NumberConverter makeConverter() {
return new LongConverter();
}
-
+
protected NumberConverter makeConverter(Object defaultValue) {
return new LongConverter(defaultValue);
}
-
+
protected Class getExpectedType() {
return Long.class;
}
@@ -74,7 +74,7 @@ public class LongConverterTestCase exten
// ------------------------------------------------------------------------
public void testSimpleConversion() throws Exception {
- String[] message= {
+ String[] message= {
"from String",
"from String",
"from String",
@@ -89,8 +89,8 @@ public class LongConverterTestCase exten
"from Float",
"from Double"
};
-
- Object[] input = {
+
+ Object[] input = {
String.valueOf(Long.MIN_VALUE),
"-17",
"-1",
@@ -105,8 +105,8 @@ public class LongConverterTestCase exten
new Float(11.1),
new Double(12.2)
};
-
- Long[] expected = {
+
+ Long[] expected = {
new Long(Long.MIN_VALUE),
new Long(-17),
new Long(-1),
@@ -121,13 +121,13 @@ public class LongConverterTestCase exten
new Long(11),
new Long(12)
};
-
+
for(int i=0;i<expected.length;i++) {
assertEquals(message[i] + " to Long",expected[i],converter.convert(Long.class,input[i]));
assertEquals(message[i] + " to long",expected[i],converter.convert(Long.TYPE,input[i]));
assertEquals(message[i] + " to null type",expected[i],converter.convert(null,input[i]));
}
}
-
+
}