Author: niallp
Date: Wed May 21 12:56:21 2008
New Revision: 658830
URL: http://svn.apache.org/viewvc?rev=658830&view=rev
Log:
Remove tabs
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/AlphaBean.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaPropertyTestCase.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestBean.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/ThrowExceptionConverter.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/AlphaBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/AlphaBean.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/AlphaBean.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/AlphaBean.java
Wed May 21 12:56:21 2008
@@ -33,7 +33,7 @@
public void setName(String name) {
this.name = name;
- }
+ }
/**
* Used for testing that correct exception is thrown.
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanUtilsTestCase.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanUtilsTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanUtilsTestCase.java
Wed May 21 12:56:21 2008
@@ -1536,7 +1536,7 @@
}
public void testArrayPropertyConversion() throws Exception {
- BeanUtilsBean beanUtils = new BeanUtilsBean(
+ BeanUtilsBean beanUtils = new BeanUtilsBean(
new ConvertUtilsBean(),
new PropertyUtilsBean());
@@ -1588,7 +1588,7 @@
"Mapped property set correctly",
"some.dotty.value",
bean.getMapproperty("this.that.the-other"));
- }
+ }
/**
* Test for [EMAIL PROTECTED] BeanUtilsBean#initCause(Throwable,
Throwable)} method.
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaPropertyTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaPropertyTestCase.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaPropertyTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaPropertyTestCase.java
Wed May 21 12:56:21 2008
@@ -29,13 +29,13 @@
*/
public class DynaPropertyTestCase extends TestCase {
- private DynaProperty testPropertyWithName;
- private DynaProperty testProperty1Duplicate;
- private DynaProperty testPropertyWithNameAndType;
- private DynaProperty testProperty2Duplicate;
- private DynaProperty testPropertyWithNameAndTypeAndContentType;
- private DynaProperty testProperty3Duplicate;
-
+ private DynaProperty testPropertyWithName;
+ private DynaProperty testProperty1Duplicate;
+ private DynaProperty testPropertyWithNameAndType;
+ private DynaProperty testProperty2Duplicate;
+ private DynaProperty testPropertyWithNameAndTypeAndContentType;
+ private DynaProperty testProperty3Duplicate;
+
/**
* Construct a new instance of this test case.
*
@@ -60,52 +60,52 @@
*/
protected void setUp() throws Exception {
- super.setUp();
-
- testPropertyWithName = new DynaProperty("test1");
- testProperty1Duplicate = new DynaProperty("test1");
-
- testPropertyWithNameAndType = new DynaProperty("test2",
Integer.class);
- testProperty2Duplicate = new DynaProperty("test2",
Integer.class);
-
- testPropertyWithNameAndTypeAndContentType = new
DynaProperty("test3", Collection.class, Short.class);
- testProperty3Duplicate = new DynaProperty("test3",
Collection.class, Short.class);
- }
+ super.setUp();
+
+ testPropertyWithName = new DynaProperty("test1");
+ testProperty1Duplicate = new DynaProperty("test1");
+
+ testPropertyWithNameAndType = new DynaProperty("test2", Integer.class);
+ testProperty2Duplicate = new DynaProperty("test2", Integer.class);
+
+ testPropertyWithNameAndTypeAndContentType = new DynaProperty("test3",
Collection.class, Short.class);
+ testProperty3Duplicate = new DynaProperty("test3", Collection.class,
Short.class);
+ }
/**
* Tear down instance variables required by this test case.
*/
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception {
+
+ testPropertyWithName = testProperty1Duplicate = null;
+ testPropertyWithNameAndType = testProperty2Duplicate = null;
+ testPropertyWithNameAndTypeAndContentType = testProperty3Duplicate =
null;
+ super.tearDown();
+ }
+
+ /**
+ * Class under test for int hashCode(Object)
+ */
+ public void testHashCode() {
+
+ final int initialHashCode =
testPropertyWithNameAndTypeAndContentType.hashCode();
+ assertEquals(testPropertyWithName.hashCode(),
testProperty1Duplicate.hashCode());
+ assertEquals(testPropertyWithNameAndType.hashCode(),
testProperty2Duplicate.hashCode());
+ assertEquals(testPropertyWithNameAndTypeAndContentType.hashCode(),
testProperty3Duplicate.hashCode());
+ assertEquals(initialHashCode,
testPropertyWithNameAndTypeAndContentType.hashCode());
+ }
- testPropertyWithName = testProperty1Duplicate = null;
- testPropertyWithNameAndType = testProperty2Duplicate = null;
- testPropertyWithNameAndTypeAndContentType =
testProperty3Duplicate = null;
- super.tearDown();
- }
-
- /**
- * Class under test for int hashCode(Object)
- */
- public void testHashCode() {
-
- final int initialHashCode =
testPropertyWithNameAndTypeAndContentType.hashCode();
- assertEquals(testPropertyWithName.hashCode(),
testProperty1Duplicate.hashCode());
- assertEquals(testPropertyWithNameAndType.hashCode(),
testProperty2Duplicate.hashCode());
-
assertEquals(testPropertyWithNameAndTypeAndContentType.hashCode(),
testProperty3Duplicate.hashCode());
- assertEquals(initialHashCode,
testPropertyWithNameAndTypeAndContentType.hashCode());
- }
-
- /**
- * Class under test for boolean equals(Object)
- */
- public void testEqualsObject() {
-
- assertEquals(testPropertyWithName, testProperty1Duplicate);
- assertEquals(testPropertyWithNameAndType,
testProperty2Duplicate);
- assertEquals(testPropertyWithNameAndTypeAndContentType,
testProperty3Duplicate);
-
assertFalse(testPropertyWithName.equals(testPropertyWithNameAndType));
-
assertFalse(testPropertyWithNameAndType.equals(testPropertyWithNameAndTypeAndContentType));
+ /**
+ * Class under test for boolean equals(Object)
+ */
+ public void testEqualsObject() {
+
+ assertEquals(testPropertyWithName, testProperty1Duplicate);
+ assertEquals(testPropertyWithNameAndType, testProperty2Duplicate);
+ assertEquals(testPropertyWithNameAndTypeAndContentType,
testProperty3Duplicate);
+ assertFalse(testPropertyWithName.equals(testPropertyWithNameAndType));
+
assertFalse(testPropertyWithNameAndType.equals(testPropertyWithNameAndTypeAndContentType));
assertFalse(testPropertyWithName.equals(null));
- }
+ }
}
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestBean.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestBean.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestBean.java
Wed May 21 12:56:21 2008
@@ -40,7 +40,7 @@
return (String) map.get(key);
}
- public void setMapproperty(String key, String value) {
+ public void setMapproperty(String key, String value) {
map.put(key, value);
}
@@ -48,7 +48,7 @@
return ((Boolean)map.get(key)).booleanValue();
}
- public void setMappedBoolean(String key, boolean value) {
+ public void setMappedBoolean(String key, boolean value) {
map.put(key, (value ? Boolean.TRUE : Boolean.FALSE));
}
@@ -56,19 +56,19 @@
return (String) map.get(key);
}
- protected void setProtectedMapped(String key, String value) {
+ protected void setProtectedMapped(String key, String value) {
map.put(key, value);
}
- public void setMappedPrimitive(int key, int value) {
+ public void setMappedPrimitive(int key, int value) {
map.put(new Integer(key), new Integer(value));
}
- public void setAnyMapped(MappedPropertyTestBean key,
MappedPropertyTestBean value) {
+ public void setAnyMapped(MappedPropertyTestBean key,
MappedPropertyTestBean value) {
map.put(key, value);
}
- public void setMappedSetterOnly(String key, String value) {
+ public void setMappedSetterOnly(String key, String value) {
map.put(key, value);
}
@@ -83,19 +83,19 @@
return myMap;
}
- public void setInvalidGetter(String key, String value) {
+ public void setInvalidGetter(String key, String value) {
map.put(key, value);
}
public String getInvalidSetter(String key) {
return (String) map.get(key);
}
- public void setInvalidSetter(String key, String value, String other) {
+ public void setInvalidSetter(String key, String value, String other) {
}
public Long getDifferentTypes(String key) {
return new Long(((Number)map.get(key)).longValue());
}
- public void setDifferentTypes(String key, Integer value) {
+ public void setDifferentTypes(String key, Integer value) {
map.put(key, value);
}
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java
Wed May 21 12:56:21 2008
@@ -418,15 +418,15 @@
*/
public void testGetDescriptorInvalidBoolean() throws Exception {
- PropertyDescriptor pd =
- PropertyUtils.getPropertyDescriptor(bean, "invalidBoolean");
- assertNotNull("invalidBoolean is a property", pd);
- assertNotNull("invalidBoolean has a getter method",
- pd.getReadMethod());
- assertNull("invalidBoolean has no write method",
- pd.getWriteMethod());
- assertTrue("invalidBoolean getter method is isInvalidBoolean",
- "isInvalidBoolean".equals(pd.getReadMethod().getName()));
+ PropertyDescriptor pd =
+ PropertyUtils.getPropertyDescriptor(bean, "invalidBoolean");
+ assertNotNull("invalidBoolean is a property", pd);
+ assertNotNull("invalidBoolean has a getter method",
+ pd.getReadMethod());
+ assertNull("invalidBoolean has no write method",
+ pd.getWriteMethod());
+ assertTrue("invalidBoolean getter method is isInvalidBoolean",
+ "isInvalidBoolean".equals(pd.getReadMethod().getName()));
}
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
Wed May 21 12:56:21 2008
@@ -545,21 +545,21 @@
private boolean invalidBoolean = false;
public boolean getInvalidBoolean() {
- return (this.invalidBoolean);
+ return (this.invalidBoolean);
}
public boolean isInvalidBoolean() {
- return (this.invalidBoolean);
+ return (this.invalidBoolean);
}
public void setInvalidBoolean(String invalidBoolean) {
- if ("true".equalsIgnoreCase(invalidBoolean) ||
- "yes".equalsIgnoreCase(invalidBoolean) ||
- "1".equalsIgnoreCase(invalidBoolean)) {
- this.invalidBoolean = true;
- } else {
- this.invalidBoolean = false;
- }
+ if ("true".equalsIgnoreCase(invalidBoolean) ||
+ "yes".equalsIgnoreCase(invalidBoolean) ||
+ "1".equalsIgnoreCase(invalidBoolean)) {
+ this.invalidBoolean = true;
+ } else {
+ this.invalidBoolean = false;
+ }
}
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/ThrowExceptionConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/ThrowExceptionConverter.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/ThrowExceptionConverter.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/ThrowExceptionConverter.java
Wed May 21 12:56:21 2008
@@ -32,5 +32,5 @@
public Object convert(Class type, Object value) {
throw new PassTestException();
- }
+ }
}
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
Wed May 21 12:56:21 2008
@@ -184,7 +184,7 @@
}
}
}
-
+
/** Tests whether classloaders and beans are released from memory */
public void testMemoryLeak() throws Exception {
if (isPre14JVM()) {
@@ -364,7 +364,7 @@
try {
signal.setSignal(3);
LocaleConvertUtils.register(new LocaleConverter() {
-
public Object convert(Class type, Object value) {
+ public Object convert(Class type,
Object value) {
return new Integer(9);
}
public Object convert(Class type,
Object value, String pattern) {
@@ -388,7 +388,7 @@
assertEquals("Wrong property value (1)", 1, bean.getInt());
LocaleConvertUtils.register(new LocaleConverter() {
- public Object
convert(Class type, Object value) {
+ public Object convert(Class type, Object
value) {
return new Integer(5);
}
public Object convert(Class type, Object
value, String pattern) {
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java?rev=658830&r1=658829&r2=658830&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
Wed May 21 12:56:21 2008
@@ -138,7 +138,7 @@
} catch (ParseException e) {
// that's what we expected
- }
+ }
// test with leniency
dateFormat.setLenient(true);
@@ -182,7 +182,7 @@
} catch (ConversionException e) {
// that's what we expected
- }
+ }
// test with leniency
converter.setLenient(true);
