scolebourne 2002/09/18 12:49:48
Modified: lang/src/test/org/apache/commons/lang ObjectUtilsTest.java
Log:
Test identityToString
Reformat for Suns coding standards
Revision Changes Path
1.2 +34 -38
jakarta-commons/lang/src/test/org/apache/commons/lang/ObjectUtilsTest.java
Index: ObjectUtilsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/ObjectUtilsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectUtilsTest.java 19 Jul 2002 03:35:55 -0000 1.1
+++ ObjectUtilsTest.java 18 Sep 2002 19:49:47 -0000 1.2
@@ -66,61 +66,57 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ringo De Smet</a>
* @version $Id$
*/
-public class ObjectUtilsTest extends TestCase
-{
+public class ObjectUtilsTest extends TestCase {
private static final String FOO = "foo";
private static final String BAR = "bar";
- public ObjectUtilsTest(String name)
- {
+ public ObjectUtilsTest(String name) {
super(name);
}
-
- public static void main(String[] args)
- {
+
+ public static void main(String[] args) {
TestRunner.run(suite());
}
- public static Test suite()
- {
- TestSuite suite = new TestSuite(ObjectUtilsTest.class);
- suite.setName("ObjectUtils Tests");
+ public static Test suite() {
+ TestSuite suite = new TestSuite(ObjectUtilsTest.class);
+ suite.setName("ObjectUtils Tests");
return suite;
}
- protected void setUp() throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
}
- protected void tearDown() throws Exception
- {
+ protected void tearDown() throws Exception {
super.tearDown();
}
//-----------------------------------------------------------------------
-
- public void testIsNull()
- {
+
+ public void testIsNull() {
Object o = FOO;
Object dflt = BAR;
- assertSame("dflt was not returned when o was null", dflt,
- ObjectUtils.defaultIfNull(null, dflt));
- assertSame("dflt was returned when o was not null", o,
- ObjectUtils.defaultIfNull(o, dflt));
- }
-
- public void testEquals()
- {
- assertTrue("ObjectUtils.equals(null, null) returned false",
- ObjectUtils.equals(null, null));
- assertTrue("ObjectUtils.equals(\"foo\", null) returned true",
- !ObjectUtils.equals(FOO, null));
- assertTrue("ObjectUtils.equals(null, \"bar\") returned true",
- !ObjectUtils.equals(null, BAR));
- assertTrue("ObjectUtils.equals(\"foo\", \"bar\") returned true",
- !ObjectUtils.equals(FOO, BAR));
- assertTrue("ObjectUtils.equals(\"foo\", \"foo\") returned false",
- ObjectUtils.equals(FOO, FOO));
- }
+ assertSame("dflt was not returned when o was null", dflt,
ObjectUtils.defaultIfNull(null, dflt));
+ assertSame("dflt was returned when o was not null", o,
ObjectUtils.defaultIfNull(o, dflt));
+ }
+
+ public void testEquals() {
+ assertTrue("ObjectUtils.equals(null, null) returned false",
ObjectUtils.equals(null, null));
+ assertTrue("ObjectUtils.equals(\"foo\", null) returned true",
!ObjectUtils.equals(FOO, null));
+ assertTrue("ObjectUtils.equals(null, \"bar\") returned true",
!ObjectUtils.equals(null, BAR));
+ assertTrue("ObjectUtils.equals(\"foo\", \"bar\") returned true",
!ObjectUtils.equals(FOO, BAR));
+ assertTrue("ObjectUtils.equals(\"foo\", \"foo\") returned false",
ObjectUtils.equals(FOO, FOO));
+ }
+
+ public void testIdentityToString() {
+ assertEquals(
+ "java.lang.String@" + Integer.toHexString(System.identityHashCode(FOO)),
+ ObjectUtils.identityToString(FOO));
+ Integer i = new Integer(90);
+ assertEquals(
+ "java.lang.Integer@" + Integer.toHexString(System.identityHashCode(i)),
+ ObjectUtils.identityToString(i));
+ assertEquals(null, ObjectUtils.identityToString(null));
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
