This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new 5e9052ac Better JUnit API usage
5e9052ac is described below
commit 5e9052acd6557b2d58f7db753e604b8186447ba9
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Aug 5 09:51:03 2023 -0400
Better JUnit API usage
---
.../commons/beanutils2/BasicDynaBeanTestCase.java | 2 +-
.../commons/beanutils2/BeanComparatorTestCase.java | 12 +++++-----
.../BeanPropertyValueChangeConsumerTestCase.java | 27 ++++++++++------------
.../commons/beanutils2/BeanUtilsBeanTestCase.java | 22 +++++++++---------
.../commons/beanutils2/DynaBeanUtilsTestCase.java | 22 +++++++++---------
.../beanutils2/DynaPropertyUtilsTestCase.java | 6 ++---
.../commons/beanutils2/PropertyUtilsTestCase.java | 8 +++----
.../commons/beanutils2/WrapDynaBeanTestCase.java | 2 +-
.../beanutils2/converters/MemoryTestCase.java | 11 +++++----
.../beanutils2/sql/DynaResultSetTestCase.java | 2 +-
.../commons/beanutils2/sql/DynaRowSetTestCase.java | 2 +-
11 files changed, 57 insertions(+), 59 deletions(-)
diff --git
a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
index 456bdaac..e88d96f7 100644
--- a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
@@ -752,7 +752,7 @@ public class BasicDynaBeanTestCase extends TestCase {
final boolean oldValue = ((Boolean)
bean.get("booleanProperty")).booleanValue();
final boolean newValue = !oldValue;
bean.set("booleanProperty", Boolean.valueOf(newValue));
- assertTrue("Matched new value", newValue == ((Boolean)
bean.get("booleanProperty")).booleanValue());
+ assertEquals("Matched new value", newValue, ((Boolean)
bean.get("booleanProperty")).booleanValue());
} catch (final Throwable e) {
fail("Exception: " + e);
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
index 7bdb18d9..93e3f948 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
@@ -75,7 +75,7 @@ public class BeanComparatorTestCase extends TestCase {
public void testCompareBeanAgainstSelf() {
final BeanComparator<AlphaBean, String> beanComparator = new
BeanComparator<>("name");
final int result = beanComparator.compare(alphaBean1, alphaBean1);
- assertTrue("Comparator did not sort properly. Result:" + result,
result == 0);
+ assertEquals("Comparator did not sort properly. Result:" + result, 0,
result);
}
/**
@@ -86,7 +86,7 @@ public class BeanComparatorTestCase extends TestCase {
alphaBean2 = new AlphaBean("alphabean");
final BeanComparator<AlphaBean, String> beanComparator = new
BeanComparator<>("name");
final int result = beanComparator.compare(alphaBean1, alphaBean2);
- assertTrue("Comparator did not sort properly. Result:" + result,
result == 0);
+ assertEquals("Comparator did not sort properly. Result:" + result, 0,
result);
}
/**
@@ -153,7 +153,7 @@ public class BeanComparatorTestCase extends TestCase {
final BeanComparator<TestBean, String> beanComparator = new
BeanComparator<>("doubleProperty");
int result = beanComparator.compare(testBeanA, testBeanB);
- assertTrue("Comparator did not sort properly. Result:" + result,
result == 1);
+ assertEquals("Comparator did not sort properly. Result:" + result, 1,
result);
testBeanA.setStringProperty("string 1");
testBeanB.setStringProperty("string 2");
@@ -162,7 +162,7 @@ public class BeanComparatorTestCase extends TestCase {
result = beanComparator.compare(testBeanA, testBeanB);
- assertTrue("Comparator did not sort properly. Result:" + result,
result == -1);
+ assertEquals("Comparator did not sort properly. Result:" + result,
-1, result);
}
/**
@@ -171,7 +171,7 @@ public class BeanComparatorTestCase extends TestCase {
public void testSimpleCompare() {
final BeanComparator<AlphaBean, String> beanComparator = new
BeanComparator<>("name");
final int result = beanComparator.compare(alphaBean1, alphaBean2);
- assertTrue("Comparator did not sort properly. Result:" + result,
result == -1);
+ assertEquals("Comparator did not sort properly. Result:" + result,
-1, result);
}
/**
@@ -180,6 +180,6 @@ public class BeanComparatorTestCase extends TestCase {
public void testSimpleCompareInverse() {
final BeanComparator<AlphaBean, String> beanComparator = new
BeanComparator<>("name");
final int result = beanComparator.compare(alphaBean2, alphaBean1);
- assertTrue("Comparator did not sort properly. Result:" + result,
result == 1);
+ assertEquals("Comparator did not sort properly. Result:" + result, 1,
result);
}
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumerTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumerTestCase.java
index 34940fba..b1bf4eec 100644
---
a/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumerTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumerTestCase.java
@@ -17,6 +17,8 @@
package org.apache.commons.beanutils2;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import junit.framework.TestCase;
/**
@@ -46,7 +48,7 @@ public class BeanPropertyValueChangeConsumerTestCase extends
TestCase {
public void testExecuteWithIndexedProperty() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("intIndexed[0]",
expectedIntegerValue).accept(testBean);
- assertTrue(expectedIntegerValue.intValue() ==
testBean.getIntIndexed(0));
+ assertSame(expectedIntegerValue.intValue(), testBean.getIntIndexed(0));
}
/**
@@ -126,7 +128,7 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleBooleanPropertyAndBooleanValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("booleanProperty",
expectedBooleanValue).accept(testBean);
- assertTrue(expectedBooleanValue.booleanValue() ==
testBean.getBooleanProperty());
+ assertEquals(expectedBooleanValue.booleanValue(),
testBean.getBooleanProperty());
}
/**
@@ -147,19 +149,14 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleBytePropertyAndByteValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("byteProperty",
expectedByteValue).accept(testBean);
- assertTrue(expectedByteValue.byteValue() ==
testBean.getByteProperty());
+ assertEquals(expectedByteValue.byteValue(),
testBean.getByteProperty());
}
/**
* Test execute with simple boolean property and String value.
*/
public void testExecuteWithSimpleBytePropertyAndStringValue() {
- try {
- new BeanPropertyValueChangeConsumer<>("byteProperty",
"foo").accept(new TestBean());
- fail("Should have thrown an IllegalArgumentException");
- } catch (final IllegalArgumentException e) {
- /* this is what we expect */
- }
+ assertThrows(IllegalArgumentException.class, () -> new
BeanPropertyValueChangeConsumer<>("byteProperty", "foo").accept(new
TestBean()));
}
/**
@@ -168,7 +165,7 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleDoublePropertyAndDoubleValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("doubleProperty",
expectedDoubleValue).accept(testBean);
- assertTrue(expectedDoubleValue.doubleValue() ==
testBean.getDoubleProperty());
+ assertEquals(expectedDoubleValue.doubleValue(),
testBean.getDoubleProperty());
}
/**
@@ -177,7 +174,7 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleDoublePropertyAndFloatValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("doubleProperty",
expectedFloatValue).accept(testBean);
- assertTrue(expectedFloatValue.doubleValue() ==
testBean.getDoubleProperty());
+ assertEquals(expectedFloatValue.doubleValue(),
testBean.getDoubleProperty());
}
/**
@@ -186,7 +183,7 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleDoublePropertyAndIntegerValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("doubleProperty",
expectedIntegerValue).accept(testBean);
- assertTrue(expectedIntegerValue.doubleValue() ==
testBean.getDoubleProperty());
+ assertEquals(expectedIntegerValue.doubleValue(),
testBean.getDoubleProperty());
}
/**
@@ -219,7 +216,7 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleFloatPropertyAndFloatValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("floatProperty",
expectedFloatValue).accept(testBean);
- assertTrue(expectedFloatValue.floatValue() ==
testBean.getFloatProperty());
+ assertEquals(expectedFloatValue.floatValue(),
testBean.getFloatProperty());
}
/**
@@ -228,7 +225,7 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleFloatPropertyAndIntegerValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("floatProperty",
expectedIntegerValue).accept(testBean);
- assertTrue(expectedIntegerValue.floatValue() ==
testBean.getFloatProperty());
+ assertEquals(expectedIntegerValue.floatValue(),
testBean.getFloatProperty());
}
/**
@@ -273,7 +270,7 @@ public class BeanPropertyValueChangeConsumerTestCase
extends TestCase {
public void testExecuteWithSimpleIntPropertyAndIntegerValue() {
final TestBean testBean = new TestBean();
new BeanPropertyValueChangeConsumer<>("intProperty",
expectedIntegerValue).accept(testBean);
- assertTrue(expectedIntegerValue.intValue() ==
testBean.getIntProperty());
+ assertEquals(expectedIntegerValue.intValue(),
testBean.getIntProperty());
}
/**
diff --git
a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
index e4a29a90..3ca73340 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
@@ -716,12 +716,12 @@ public class BeanUtilsBeanTestCase extends TestCase {
String[] arr = BeanUtils.getArrayProperty(bean, "stringArray");
final String[] comp = bean.getStringArray();
- assertTrue("String array length = " + comp.length, comp.length ==
arr.length);
+ assertEquals("String array length = " + comp.length, comp.length,
arr.length);
arr = BeanUtils.getArrayProperty(bean, "intArray");
final int[] iarr = bean.getIntArray();
- assertTrue("String array length = " + iarr.length, iarr.length ==
arr.length);
+ assertEquals("String array length = " + iarr.length, iarr.length,
arr.length);
// Test property which isn't array or collection
arr = BeanUtils.getArrayProperty(bean, "shortProperty");
@@ -768,7 +768,7 @@ public class BeanUtilsBeanTestCase extends TestCase {
final String val = BeanUtils.getProperty(bean,
"nested.intIndexed[2]");
final String comp = String.valueOf(bean.getIntIndexed(2));
- assertTrue("nested.intIndexed[2] == " + comp, val.equals(comp));
+ assertEquals("nested.intIndexed[2] == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -785,11 +785,11 @@ public class BeanUtilsBeanTestCase extends TestCase {
try {
String val = BeanUtils.getIndexedProperty(bean, "intIndexed[3]");
String comp = String.valueOf(bean.getIntIndexed(3));
- assertTrue("intIndexed[3] == " + comp, val.equals(comp));
+ assertEquals("intIndexed[3] == " + comp, val, comp);
val = BeanUtils.getIndexedProperty(bean, "stringIndexed[3]");
comp = bean.getStringIndexed(3);
- assertTrue("stringIndexed[3] == " + comp, val.equals(comp));
+ assertEquals("stringIndexed[3] == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -807,12 +807,12 @@ public class BeanUtilsBeanTestCase extends TestCase {
String val = BeanUtils.getIndexedProperty(bean, "intIndexed", 3);
String comp = String.valueOf(bean.getIntIndexed(3));
- assertTrue("intIndexed,3 == " + comp, val.equals(comp));
+ assertEquals("intIndexed,3 == " + comp, val, comp);
val = BeanUtils.getIndexedProperty(bean, "stringIndexed", 3);
comp = bean.getStringIndexed(3);
- assertTrue("stringIndexed,3 == " + comp, val.equals(comp));
+ assertEquals("stringIndexed,3 == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
@@ -844,7 +844,7 @@ public class BeanUtilsBeanTestCase extends TestCase {
try {
final String val = BeanUtils.getNestedProperty(bean,
"nested.stringProperty");
final String comp = bean.getNested().getStringProperty();
- assertTrue("nested.StringProperty == " + comp, val.equals(comp));
+ assertEquals("nested.StringProperty == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -862,7 +862,7 @@ public class BeanUtilsBeanTestCase extends TestCase {
final String val = BeanUtils.getSimpleProperty(bean,
"shortProperty");
final String comp = String.valueOf(bean.getShortProperty());
- assertTrue("shortProperty == " + comp, val.equals(comp));
+ assertEquals("shortProperty == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -1361,12 +1361,12 @@ public class BeanUtilsBeanTestCase extends TestCase {
assertNotNull("stringArray is not null", newValue);
assertTrue("stringArray of correct type", newValue instanceof
String[]);
assertEquals("stringArray length", 5, ((String[]) newValue).length);
- assertTrue("stringArray[2] is null", ((String[]) newValue)[2] == null);
+ assertNull("stringArray[2] is null", ((String[]) newValue)[2]);
PropertyUtils.setProperty(bean, "stringArray", oldValue);
// Value into scalar
BeanUtils.setProperty(bean, "stringProperty", null);
- assertTrue("stringProperty is now null", BeanUtils.getProperty(bean,
"stringProperty") == null);
+ assertNull("stringProperty is now null", BeanUtils.getProperty(bean,
"stringProperty"));
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
index fab4955b..757df940 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
@@ -661,12 +661,12 @@ public class DynaBeanUtilsTestCase extends TestCase {
String[] arr = BeanUtils.getArrayProperty(bean, "stringArray");
final String[] comp = (String[]) bean.get("stringArray");
- assertTrue("String array length = " + comp.length, comp.length ==
arr.length);
+ assertEquals("String array length = " + comp.length, comp.length,
arr.length);
arr = BeanUtils.getArrayProperty(bean, "intArray");
final int[] iarr = (int[]) bean.get("intArray");
- assertTrue("String array length = " + iarr.length, iarr.length ==
arr.length);
+ assertEquals("String array length = " + iarr.length, iarr.length,
arr.length);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -685,7 +685,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
final String val = BeanUtils.getProperty(bean,
"nested.intIndexed[2]");
final String comp = String.valueOf(bean.get("intIndexed", 2));
- assertTrue("nested.intIndexed[2] == " + comp, val.equals(comp));
+ assertEquals("nested.intIndexed[2] == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -702,11 +702,11 @@ public class DynaBeanUtilsTestCase extends TestCase {
try {
String val = BeanUtils.getIndexedProperty(bean, "intIndexed[3]");
String comp = String.valueOf(bean.get("intIndexed", 3));
- assertTrue("intIndexed[3] == " + comp, val.equals(comp));
+ assertEquals("intIndexed[3] == " + comp, val, comp);
val = BeanUtils.getIndexedProperty(bean, "stringIndexed[3]");
comp = (String) bean.get("stringIndexed", 3);
- assertTrue("stringIndexed[3] == " + comp, val.equals(comp));
+ assertEquals("stringIndexed[3] == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -724,12 +724,12 @@ public class DynaBeanUtilsTestCase extends TestCase {
String val = BeanUtils.getIndexedProperty(bean, "intIndexed", 3);
String comp = String.valueOf(bean.get("intIndexed", 3));
- assertTrue("intIndexed,3 == " + comp, val.equals(comp));
+ assertEquals("intIndexed,3 == " + comp, val, comp);
val = BeanUtils.getIndexedProperty(bean, "stringIndexed", 3);
comp = (String) bean.get("stringIndexed", 3);
- assertTrue("stringIndexed,3 == " + comp, val.equals(comp));
+ assertEquals("stringIndexed,3 == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
@@ -747,7 +747,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
try {
final String val = BeanUtils.getNestedProperty(bean,
"nested.stringProperty");
final String comp = nested.getStringProperty();
- assertTrue("nested.StringProperty == " + comp, val.equals(comp));
+ assertEquals("nested.StringProperty == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -765,7 +765,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
final String val = BeanUtils.getSimpleProperty(bean,
"shortProperty");
final String comp = String.valueOf(bean.get("shortProperty"));
- assertTrue("shortProperty == " + comp, val.equals(comp));
+ assertEquals("shortProperty == " + comp, val, comp);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -1000,12 +1000,12 @@ public class DynaBeanUtilsTestCase extends TestCase {
assertNotNull("stringArray is not null", newValue);
assertTrue("stringArray of correct type", newValue instanceof
String[]);
assertEquals("stringArray length", 5, ((String[]) newValue).length);
- assertTrue("stringArray[2] is null", ((String[]) newValue)[2] == null);
+ assertNull("stringArray[2] is null", ((String[]) newValue)[2]);
PropertyUtils.setProperty(bean, "stringArray", oldValue);
// Value into scalar
BeanUtils.setProperty(bean, "stringProperty", null);
- assertTrue("stringProperty is now null", BeanUtils.getProperty(bean,
"stringProperty") == null);
+ assertNull("stringProperty is now null", BeanUtils.getProperty(bean,
"stringProperty"));
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
index 00c55c00..9f097bde 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
@@ -778,7 +778,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
assertNotNull("Got a value", value);
assertTrue("Got correct type", value instanceof Boolean);
final TestBean nested = (TestBean) bean.get("nested");
- assertTrue("Got correct value", ((Boolean) value).booleanValue()
== nested.getBooleanProperty());
+ assertEquals("Got correct value", ((Boolean)
value).booleanValue(), nested.getBooleanProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -1696,7 +1696,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
final boolean oldValue = nested.getBooleanProperty();
final boolean newValue = !oldValue;
PropertyUtils.setNestedProperty(bean, "nested.booleanProperty",
Boolean.valueOf(newValue));
- assertTrue("Matched new value", newValue ==
nested.getBooleanProperty());
+ assertEquals("Matched new value", newValue,
nested.getBooleanProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -1941,7 +1941,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
final boolean oldValue = ((Boolean)
bean.get("booleanProperty")).booleanValue();
final boolean newValue = !oldValue;
PropertyUtils.setSimpleProperty(bean, "booleanProperty",
Boolean.valueOf(newValue));
- assertTrue("Matched new value", newValue == ((Boolean)
bean.get("booleanProperty")).booleanValue());
+ assertEquals("Matched new value", newValue, ((Boolean)
bean.get("booleanProperty")).booleanValue());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
diff --git
a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
index 357f220e..60b71153 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
@@ -1334,7 +1334,7 @@ public class PropertyUtilsTestCase extends TestCase {
final Object value = PropertyUtils.getNestedProperty(bean,
"nested.booleanProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", value instanceof Boolean);
- assertTrue("Got correct value", ((Boolean) value).booleanValue()
== bean.getNested().getBooleanProperty());
+ assertEquals("Got correct value", ((Boolean)
value).booleanValue(), bean.getNested().getBooleanProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -1858,7 +1858,7 @@ public class PropertyUtilsTestCase extends TestCase {
final Object value = PropertyUtils.getSimpleProperty(bean,
"booleanProperty");
assertNotNull("Got a value", value);
assertTrue("Got correct type", value instanceof Boolean);
- assertTrue("Got correct value", ((Boolean) value).booleanValue()
== bean.getBooleanProperty());
+ assertEquals("Got correct value", ((Boolean)
value).booleanValue(), bean.getBooleanProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -3247,7 +3247,7 @@ public class PropertyUtilsTestCase extends TestCase {
final boolean oldValue = bean.getNested().getBooleanProperty();
final boolean newValue = !oldValue;
PropertyUtils.setNestedProperty(bean, "nested.booleanProperty",
Boolean.valueOf(newValue));
- assertTrue("Matched new value", newValue ==
bean.getNested().getBooleanProperty());
+ assertEquals("Matched new value", newValue,
bean.getNested().getBooleanProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -3537,7 +3537,7 @@ public class PropertyUtilsTestCase extends TestCase {
final boolean oldValue = bean.getBooleanProperty();
final boolean newValue = !oldValue;
PropertyUtils.setSimpleProperty(bean, "booleanProperty",
Boolean.valueOf(newValue));
- assertTrue("Matched new value", newValue ==
bean.getBooleanProperty());
+ assertEquals("Matched new value", newValue,
bean.getBooleanProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
diff --git
a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
index c501037f..4e1696d4 100644
--- a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
@@ -150,7 +150,7 @@ public class WrapDynaBeanTestCase extends
BasicDynaBeanTestCase {
final Object wrappedInstance = dynaBean.getInstance();
assertTrue("Object type is AlphaBean", wrappedInstance instanceof
AlphaBean);
final AlphaBean wrappedAlphaBean = (AlphaBean) wrappedInstance;
- assertTrue("Same Object", wrappedAlphaBean == alphaBean);
+ assertSame("Same Object", wrappedAlphaBean, alphaBean);
}
/**
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
b/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
index 7bc124a3..23a2bd78 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
@@ -20,6 +20,7 @@ package org.apache.commons.beanutils2.converters;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.lang.ref.WeakReference;
@@ -111,7 +112,7 @@ public class MemoryTestCase {
// private classpath.
final Class<?> newFloatConverterClass =
componentLoader.reload(FloatConverter.class);
Object newFloatConverter =
newFloatConverterClass.newInstance();
- assertTrue(newFloatConverter.getClass().getClassLoader() ==
componentLoader);
+ assertSame(newFloatConverter.getClass().getClassLoader(),
componentLoader);
// verify that this new object does implement the Converter
type
// despite being loaded via a classloader different from the
one
@@ -126,7 +127,7 @@ public class MemoryTestCase {
// it back to us. We'll try this lookup again with a different
// context-classloader set, and shouldn't see it
final Converter<Float> componentConverter =
ConvertUtils.lookup(Float.TYPE);
- assertTrue(componentConverter.getClass().getClassLoader() ==
componentLoader);
+ assertSame(componentConverter.getClass().getClassLoader(),
componentLoader);
newFloatConverter = null;
}
@@ -141,7 +142,7 @@ public class MemoryTestCase {
Thread.currentThread().setContextClassLoader(componentLoader);
{
final Converter<Float> componentConverter =
ConvertUtils.lookup(Float.TYPE);
- assertTrue(componentConverter.getClass().getClassLoader() ==
componentLoader);
+ assertSame(componentConverter.getClass().getClassLoader(),
componentLoader);
}
Thread.currentThread().setContextClassLoader(origContextClassLoader);
// Emulate a container "undeploying" the component. This should
@@ -210,13 +211,13 @@ public class MemoryTestCase {
// This should only affect code that runs with exactly the
// same context classloader set.
ConvertUtils.register(floatConverter1, Float.TYPE);
- assertTrue(ConvertUtils.lookup(Float.TYPE) == floatConverter1);
+ assertSame(ConvertUtils.lookup(Float.TYPE), floatConverter1);
}
Thread.currentThread().setContextClassLoader(origContextClassLoader);
// The converter visible outside any custom component should not
// have been altered.
- assertTrue(ConvertUtils.lookup(Float.TYPE) == origFloatConverter);
+ assertSame(ConvertUtils.lookup(Float.TYPE), origFloatConverter);
// Emulate the container invoking a component #2.
Thread.currentThread().setContextClassLoader(componentLoader2);
diff --git
a/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
b/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
index c16f9ff1..dc4da79c 100644
--- a/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
@@ -108,7 +108,7 @@ public class DynaResultSetTestCase extends TestCase {
// Negative test
DynaProperty dynaProp = dynaClass.getDynaProperty("unknownProperty");
- assertTrue("unknown property returns null", dynaProp == null);
+ assertNull("unknown property returns null", dynaProp);
// Positive test
dynaProp = dynaClass.getDynaProperty("stringproperty");
diff --git
a/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
b/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
index 22da32e4..c10a3bdc 100644
--- a/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
@@ -175,7 +175,7 @@ public class DynaRowSetTestCase extends TestCase {
// Negative test
DynaProperty dynaProp = dynaClass.getDynaProperty("unknownProperty");
- assertTrue("unknown property returns null", dynaProp == null);
+ assertNull("unknown property returns null", dynaProp);
// Positive test
dynaProp = dynaClass.getDynaProperty("stringproperty");
