harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r397123 [1/7] - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java: org/apache/harmony/tests/java/util/ tests/api/java/io/ tests/api/java/lang/ tests/api/java/lang/ref/ tests/api/java/lang/reflect/ tests/api/java/net/ ...
Date Wed, 26 Apr 2006 07:12:49 GMT
Author: smishura
Date: Wed Apr 26 00:12:16 2006
New Revision: 397123

URL: http://svn.apache.org/viewcvs?rev=397123&view=rev
Log:
Apply patch for HARMONY-353 (improvements to junit test method usage) for luni module (excluding conflict updates and failed tests). All luni tests passed on Windows.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilePermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileWriterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializablePermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/StringReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/StringWriterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/AssertionErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/BooleanTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ByteTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/CharacterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ClassTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/CompilerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/DoubleTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ExceptionInInitializerErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/FloatTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/IllegalArgumentExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/IllegalStateExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/IntegerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/InternalErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/LinkageErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/LongTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/MathTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/NoClassDefFoundErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/NoSuchFieldErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/NoSuchMethodErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ObjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/PackageTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ProcessTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimeExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/RuntimePermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ShortTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/StrictMathTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/StringBufferTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/StringTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/SystemTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThreadTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ThrowableTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/UnknownErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/UnsatisfiedLinkErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/UnsupportedOperationExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/VerifyErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/VirtualMachineErrorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/NetPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/SocketPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/SocketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLDecoderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/AbstractCollectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ArrayListTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ArraysTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/BitSetTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CalendarTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CollectionsTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/DateTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/HashMapTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/HashSetTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/HashtableTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/IdentityHashMap2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LinkedListTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LocaleTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ObservableTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/PropertiesTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/StackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TimerTaskTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TimerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeMapTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TreeSetTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/VectorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java Wed Apr 26 00:12:16 2006
@@ -36,10 +36,10 @@
 			assertTrue("Assert 0: " + specials[i] + " invalid: " + result,
 					result == i);
 		}
-		assertTrue("Assert 1: Invalid search index for -1d",
-				Arrays.binarySearch(specials, -1d) == -4);
-		assertTrue("Assert 2: Invalid search index for 1d",
-				Arrays.binarySearch(specials, 1d) == -8);
+		assertEquals("Assert 1: Invalid search index for -1d",
+				-4, Arrays.binarySearch(specials, -1d));
+		assertEquals("Assert 2: Invalid search index for 1d",
+				-8, Arrays.binarySearch(specials, 1d));
 	}
 	
 	/**
@@ -56,10 +56,10 @@
 			assertTrue("Assert 0: " + specials[i] + " invalid: " + result,
 					result == i);
 		}
-		assertTrue("Assert 1: Invalid search index for -1f",
-				Arrays.binarySearch(specials, -1f) == -4);
-		assertTrue("Assert 2: Invalid search index for 1f",
-				Arrays.binarySearch(specials, 1f) == -8);
+		assertEquals("Assert 1: Invalid search index for -1f",
+				-4, Arrays.binarySearch(specials, -1f));
+		assertEquals("Assert 2: Invalid search index for 1f",
+				-8, Arrays.binarySearch(specials, 1f));
 	}
 	
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -199,13 +199,13 @@
 		InputStream in = new BufferedInputStream(
 				new ByteArrayInputStream(bytes), 12);
 		try {
-			assertTrue("Wrong initial byte", in.read() == 0); // Fill the
+			assertEquals("Wrong initial byte", 0, in.read()); // Fill the
 			// buffer
 			byte[] buf = new byte[14];
 			in.read(buf, 0, 14); // Read greater than the buffer
 			assertTrue("Wrong block read data", new String(buf, 0, 14)
 					.equals(new String(bytes, 1, 14)));
-			assertTrue("Wrong bytes", in.read() == 15); // Check next byte
+			assertEquals("Wrong bytes", 15, in.read()); // Check next byte
 		} catch (IOException e) {
 			fail("Exception during read test 2");
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -70,8 +70,8 @@
 			os = new java.io.BufferedOutputStream(baos, 600);
 			os.write(fileString.getBytes(), 0, 500);
 			os.flush();
-			assertTrue("Bytes not written after flush",
-					((ByteArrayOutputStream) baos).size() == 500);
+			assertEquals("Bytes not written after flush",
+					500, ((ByteArrayOutputStream) baos).size());
 		} catch (java.io.IOException e) {
 			fail("Flush test failed");
 		}
@@ -88,10 +88,10 @@
 					baos = new java.io.ByteArrayOutputStream());
 			os.write(fileString.getBytes(), 0, 500);
 			bais = new java.io.ByteArrayInputStream(baos.toByteArray());
-			assertTrue("Bytes written, not buffered", bais.available() == 0);
+			assertEquals("Bytes written, not buffered", 0, bais.available());
 			os.flush();
 			bais = new java.io.ByteArrayInputStream(baos.toByteArray());
-			assertTrue("Bytes not written after flush", bais.available() == 500);
+			assertEquals("Bytes not written after flush", 500, bais.available());
 			os.write(fileString.getBytes(), 500, 513);
 			bais = new java.io.ByteArrayInputStream(baos.toByteArray());
 			assertTrue("Bytes not written when buffer full",
@@ -117,13 +117,13 @@
 			os = new java.io.BufferedOutputStream(baos);
 			os.write('t');
 			bais = new java.io.ByteArrayInputStream(baos.toByteArray());
-			assertTrue("Byte written, not buffered", bais.available() == 0);
+			assertEquals("Byte written, not buffered", 0, bais.available());
 			os.flush();
 			bais = new java.io.ByteArrayInputStream(baos.toByteArray());
-			assertTrue("Byte not written after flush", bais.available() == 1);
+			assertEquals("Byte not written after flush", 1, bais.available());
 			byte[] wbytes = new byte[1];
 			bais.read(wbytes, 0, 1);
-			assertTrue("Incorrect byte written", wbytes[0] == 't');
+			assertEquals("Incorrect byte written", 't', wbytes[0]);
 		} catch (java.io.IOException e) {
 			fail("Write test failed");
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java Wed Apr 26 00:12:16 2006
@@ -151,13 +151,13 @@
 		Reader in = new BufferedReader(new Support_StringReader(new String(
 				chars)), 12);
 		try {
-			assertTrue("Wrong initial char", in.read() == 0); // Fill the
+			assertEquals("Wrong initial char", 0, in.read()); // Fill the
 			// buffer
 			char[] buf = new char[14];
 			in.read(buf, 0, 14); // Read greater than the buffer
 			assertTrue("Wrong block read data", new String(buf)
 					.equals(new String(chars, 1, 14)));
-			assertTrue("Wrong chars", in.read() == 15); // Check next byte
+			assertEquals("Wrong chars", 15, in.read()); // Check next byte
 		} catch (IOException e) {
 			fail("Exception during read test 2:" + e);
 		}
@@ -268,8 +268,8 @@
 		try {
 			br = new BufferedReader(new Support_StringReader(testString));
 			String r = br.readLine();
-			assertTrue("readLine returned incorrect string", r
-					.equals("Test_All_Tests"));
+			assertEquals("readLine returned incorrect string", "Test_All_Tests", r
+					);
 		} catch (java.io.IOException e) {
 			fail("Exception during readLine test");
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java Wed Apr 26 00:12:16 2006
@@ -37,7 +37,7 @@
 		sw = new Support_StringWriter();
 		bw = new BufferedWriter(sw);
 		sw.write("Hi");
-		assertTrue("Constructor failed", sw.toString().equals("Hi"));
+		assertEquals("Constructor failed", "Hi", sw.toString());
 
 	}
 
@@ -71,8 +71,8 @@
 			bw.write("This should not cause a flush");
 			assertTrue("Bytes written without flush", sw.toString().equals(""));
 			bw.flush();
-			assertTrue("Bytes not flushed", sw.toString().equals(
-					"This should not cause a flush"));
+			assertEquals("Bytes not flushed", 
+					"This should not cause a flush", sw.toString());
 		} catch (Exception e) {
 			fail("Exception during flush test");
 		}
@@ -120,7 +120,7 @@
 			bw.write('T');
 			assertTrue("Char written without flush", sw.toString().equals(""));
 			bw.flush();
-			assertTrue("Incorrect char written", sw.toString().equals("T"));
+			assertEquals("Incorrect char written", "T", sw.toString());
 		} catch (Exception e) {
 			fail("Exception during write test");
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -49,8 +49,8 @@
 		java.io.InputStream bis = new java.io.ByteArrayInputStream(zz, 0, 100);
 
 		try {
-			assertTrue("Unable to create ByteArrayInputStream",
-					bis.available() == 100);
+			assertEquals("Unable to create ByteArrayInputStream",
+					100, bis.available());
 		} catch (Exception e) {
 			fail("Exception during Constructor test");
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -53,7 +53,7 @@
 	public void test_ConstructorI() {
 		// Test for method java.io.ByteArrayOutputStream(int)
 		bos = new java.io.ByteArrayOutputStream(100);
-		assertTrue("Failed to create stream", bos.size() == 0);
+		assertEquals("Failed to create stream", 0, bos.size());
 	}
 
 	/**
@@ -62,7 +62,7 @@
 	public void test_Constructor() {
 		// Test for method java.io.ByteArrayOutputStream()
 		bos = new java.io.ByteArrayOutputStream();
-		assertTrue("Failed to create stream", bos.size() == 0);
+		assertEquals("Failed to create stream", 0, bos.size());
 	}
 
 	/**
@@ -99,7 +99,7 @@
 		bos = new java.io.ByteArrayOutputStream();
 		bos.write(fileString.getBytes(), 0, 100);
 		bos.reset();
-		assertTrue("reset failed", bos.size() == 0);
+		assertEquals("reset failed", 0, bos.size());
 	}
 
 	/**
@@ -109,9 +109,9 @@
 		// Test for method int java.io.ByteArrayOutputStream.size()
 		bos = new java.io.ByteArrayOutputStream();
 		bos.write(fileString.getBytes(), 0, 100);
-		assertTrue("size test failed", bos.size() == 100);
+		assertEquals("size test failed", 100, bos.size());
 		bos.reset();
-		assertTrue("size test failed", bos.size() == 0);
+		assertEquals("size test failed", 0, bos.size());
 	}
 
 	/**
@@ -189,8 +189,8 @@
 		bos = new java.io.ByteArrayOutputStream();
 		bos.write('t');
 		byte[] result = bos.toByteArray();
-		assertTrue("Wrote incorrect bytes",
-				new String(result, 0, result.length).equals("t"));
+		assertEquals("Wrote incorrect bytes",
+				"t", new String(result, 0, result.length));
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java Wed Apr 26 00:12:16 2006
@@ -84,7 +84,7 @@
 			cr.mark(100);
 			cr.read();
 			cr.reset();
-			assertTrue("Failed to mark correct position", cr.read() == 'W');
+			assertEquals("Failed to mark correct position", 'W', cr.read());
 		} catch (IOException e) {
 			fail("Exception during mark test: " + e.getMessage());
 		}
@@ -106,7 +106,7 @@
 		// Test for method int java.io.CharArrayReader.read()
 		try {
 			cr = new CharArrayReader(hw);
-			assertTrue("Read returned incorrect char", cr.read() == 'H');
+			assertEquals("Read returned incorrect char", 'H', cr.read());
 			cr = new CharArrayReader(new char[] { '\u8765' });
 			assertTrue("Incorrect double byte char", cr.read() == '\u8765');
 		} catch (IOException e) {
@@ -170,8 +170,8 @@
 			cr.mark(100);
 			cr.read();
 			cr.reset();
-			assertTrue("Reset failed to return to marker position",
-					cr.read() == 'W');
+			assertEquals("Reset failed to return to marker position",
+					'W', cr.read());
 		} catch (IOException e) {
 			fail("Exception during reset test : " + e.getMessage());
 		}
@@ -189,9 +189,9 @@
 		} catch (IOException e) {
 			fail("Exception during skip test : " + e.getMessage());
 		}
-		assertTrue("Failed to skip correct number of chars", skipped == 5L);
+		assertEquals("Failed to skip correct number of chars", 5L, skipped);
 		try {
-			assertTrue("Skip skipped wrong chars", cr.read() == 'W');
+			assertEquals("Skip skipped wrong chars", 'W', cr.read());
 		} catch (IOException e) {
 			fail("read exception during skip test : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java Wed Apr 26 00:12:16 2006
@@ -29,9 +29,9 @@
 				throw new java.io.CharConversionException();
 			fail("Exception not thrown");
 		} catch (java.io.CharConversionException e) {
-			assertTrue(
+			assertNull(
 					"Exception defined with no message answers non-null to getMessage()",
-					e.getMessage() == null);
+					e.getMessage());
 		}
 	}
 
@@ -45,9 +45,8 @@
 				throw new java.io.CharConversionException("Blah");
 			fail("Exception not thrown");
 		} catch (java.io.CharConversionException e) {
-			assertTrue(
-					"Exception defined with no message answers non-null to getMessage()",
-					e.getMessage().equals("Blah"));
+			assertEquals("Exception defined with no message answers non-null to getMessage()",
+					"Blah", e.getMessage());
 		}
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -128,7 +128,7 @@
 			os.writeChar('t');
 			os.close();
 			openDataInputStream();
-			assertTrue("Incorrect char read", dis.readChar() == 't');
+			assertEquals("Incorrect char read", 't', dis.readChar());
 		} catch (IOException e) {
 			fail("IOException during readChar test : " + e.getMessage());
 		}
@@ -143,8 +143,8 @@
 			os.writeDouble(2345.76834720202);
 			os.close();
 			openDataInputStream();
-			assertTrue("Incorrect double read",
-					dis.readDouble() == 2345.76834720202);
+			assertEquals("Incorrect double read",
+					2345.76834720202, dis.readDouble());
 		} catch (IOException e) {
 			fail("IOException during readDouble test" + e.toString());
 		}
@@ -211,7 +211,7 @@
 			os.writeInt(768347202);
 			os.close();
 			openDataInputStream();
-			assertTrue("Incorrect int read", dis.readInt() == 768347202);
+			assertEquals("Incorrect int read", 768347202, dis.readInt());
 		} catch (IOException e) {
 			fail("IOException during readInt test : " + e.getMessage());
 		}
@@ -242,7 +242,7 @@
 			os.writeLong(9875645283333L);
 			os.close();
 			openDataInputStream();
-			assertTrue("Incorrect long read", dis.readLong() == 9875645283333L);
+			assertEquals("Incorrect long read", 9875645283333L, dis.readLong());
 		} catch (IOException e) {
 			fail("read long test failed : " + e.getMessage());
 		}
@@ -272,7 +272,7 @@
 			os.writeByte((byte) -127);
 			os.close();
 			openDataInputStream();
-			assertTrue("Incorrect byte read", dis.readUnsignedByte() == 129);
+			assertEquals("Incorrect byte read", 129, dis.readUnsignedByte());
 		} catch (IOException e) {
 			fail("IOException during readUnsignedByte test : " + e.getMessage());
 		}
@@ -287,7 +287,7 @@
 			os.writeShort(9875);
 			os.close();
 			openDataInputStream();
-			assertTrue("Incorrect short read", dis.readUnsignedShort() == 9875);
+			assertEquals("Incorrect short read", 9875, dis.readUnsignedShort());
 		} catch (IOException e) {
 			fail("Exception during readShort test : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -52,7 +52,7 @@
 			openDataInputStream();
 			int c = dis.readInt();
 			dis.close();
-			assertTrue("Failed to flush correctly", c == 9087589);
+			assertEquals("Failed to flush correctly", 9087589, c);
 		} catch (IOException e) {
 			fail("Exception during flush test : " + e.getMessage());
 		}
@@ -71,7 +71,7 @@
 			byte[] rbuf = new byte[150];
 			dis.read(rbuf, 0, 150);
 			dis.close();
-			assertTrue("Incorrect size returned", os.size() == 150);
+			assertEquals("Incorrect size returned", 150, os.size());
 		} catch (IOException e) {
 			fail("Exception during write test : " + e.getMessage());
 		}
@@ -179,7 +179,7 @@
 			openDataInputStream();
 			char c = dis.readChar();
 			dis.close();
-			assertTrue("Incorrect char written", c == 'T');
+			assertEquals("Incorrect char written", 'T', c);
 		} catch (IOException e) {
 			fail("Exception during writeChar test : " + e.getMessage());
 		}
@@ -199,8 +199,8 @@
 			int i, a = dis.available() / 2;
 			for (i = 0; i < a; i++)
 				chars[i] = dis.readChar();
-			assertTrue("Incorrect chars written", new String(chars, 0, i)
-					.equals("Test String"));
+			assertEquals("Incorrect chars written", "Test String", new String(chars, 0, i)
+					);
 		} catch (IOException e) {
 			fail("Exception during writeChars test : " + e.getMessage());
 		}
@@ -217,7 +217,7 @@
 			openDataInputStream();
 			double c = dis.readDouble();
 			dis.close();
-			assertTrue("Incorrect double written", c == 908755555456.98);
+			assertEquals("Incorrect double written", 908755555456.98, c);
 		} catch (IOException e) {
 			fail("Exception during writeDouble test : " + e.getMessage());
 		}
@@ -251,7 +251,7 @@
 			openDataInputStream();
 			int c = dis.readInt();
 			dis.close();
-			assertTrue("Incorrect int written", c == 9087589);
+			assertEquals("Incorrect int written", 9087589, c);
 		} catch (IOException e) {
 			fail("Exception during writeInt test : " + e.getMessage());
 		}
@@ -268,7 +268,7 @@
 			openDataInputStream();
 			long c = dis.readLong();
 			dis.close();
-			assertTrue("Incorrect long written", c == 908755555456L);
+			assertEquals("Incorrect long written", 908755555456L, c);
 		} catch (IOException e) {
 			fail("Exception during writeLong test" + e.getMessage());
 		}
@@ -285,7 +285,7 @@
 			openDataInputStream();
 			short c = dis.readShort();
 			dis.close();
-			assertTrue("Incorrect short written", c == 9087);
+			assertEquals("Incorrect short written", 9087, c);
 		} catch (IOException e) {
 			fail("Exception during writeShort test : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -195,7 +195,7 @@
 			fos = new java.io.FileOutputStream(f.getPath());
 			fos.write('t');
 			fis = new java.io.FileInputStream(f.getPath());
-			assertTrue("Incorrect char written", fis.read() == 't');
+			assertEquals("Incorrect char written", 't', fis.read());
 		} catch (java.io.IOException e) {
 			fail("Exception during write test : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilePermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilePermissionTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilePermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilePermissionTest.java Wed Apr 26 00:12:16 2006
@@ -43,9 +43,8 @@
 		assertTrue("Used to test", true);
 		FilePermission constructFile = new FilePermission("test constructor",
 				"write");
-		assertTrue(
-				"action given to the constructor did not correspond - constructor failed",
-				constructFile.getActions().equals("write"));
+		assertEquals("action given to the constructor did not correspond - constructor failed",
+				"write", constructFile.getActions());
 		assertTrue(
 				"name given to the construcotr did not correspond - construcotr failed",
 				constructFile.getName() == "test constructor");
@@ -57,10 +56,10 @@
 	 */
 	public void test_getActions() {
 		// Test for method java.lang.String java.io.FilePermission.getActions()
-		assertTrue("getActions should have returned only read", readAllFiles
-				.getActions().equals("read"));
-		assertTrue("getActions should have returned all actions", allInCurrent
-				.getActions().equals("read,write,execute,delete"));
+		assertEquals("getActions should have returned only read", "read", readAllFiles
+				.getActions());
+		assertEquals("getActions should have returned all actions", "read,write,execute,delete", allInCurrent
+				.getActions());
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileReaderTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileReaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileReaderTest.java Wed Apr 26 00:12:16 2006
@@ -44,8 +44,8 @@
 			char[] buf = new char[100];
 			int r = br.read(buf);
 			br.close();
-			assertTrue("Failed to read correct chars", new String(buf, 0, r)
-					.equals(" After test string"));
+			assertEquals("Failed to read correct chars", " After test string", new String(buf, 0, r)
+					);
 		} catch (Exception e) {
 			fail("Exception during Constructor test " + e.toString());
 		}
@@ -66,8 +66,8 @@
 			int r = br.read(buf);
 			br.close();
 			fis.close();
-			assertTrue("Failed to read correct chars", new String(buf, 0, r)
-					.equals(" After test string"));
+			assertEquals("Failed to read correct chars", " After test string", new String(buf, 0, r)
+					);
 		} catch (Exception e) {
 			fail("Exception during Constructor test " + e.toString());
 		}
@@ -86,8 +86,8 @@
 			char[] buf = new char[100];
 			int r = br.read(buf);
 			br.close();
-			assertTrue("Failed to read correct chars", new String(buf, 0, r)
-					.equals(" After test string"));
+			assertEquals("Failed to read correct chars", " After test string", new String(buf, 0, r)
+					);
 		} catch (Exception e) {
 			fail("Exception during Constructor test " + e.toString());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileTest.java Wed Apr 26 00:12:16 2006
@@ -303,8 +303,8 @@
 		File f3 = new File("thatFile.tst");
 
 		String notAFile = "notAFile.tst";
-		assertTrue("Equal files did not answer zero for compareTo", f1
-				.compareTo(f2) == 0);
+		assertEquals("Equal files did not answer zero for compareTo", 0, f1
+				.compareTo(f2));
 		assertTrue("f3.compareTo(f1) did not result in value < 0", f3
 				.compareTo(f1) < 0);
 		assertTrue("f1.compareTo(f3) did not result in vale > 0", f1
@@ -320,7 +320,7 @@
 		boolean onWindows = File.separatorChar == '\\';
 		boolean onUnix = File.separatorChar == '/';
 		if (onWindows) {
-			assertTrue("Files Should Return Equal.", f1.compareTo(f3) == 0);
+			assertEquals("Files Should Return Equal.", 0, f1.compareTo(f3));
 		} else if (onUnix) {
 			assertTrue("Files Should NOT Return Equal.", f1.compareTo(f3) != 0);
 		}
@@ -335,8 +335,8 @@
 		File f2 = new File("thisFile.file");
 		File f3 = new File("thatFile.file");
 		String notAFile = "notAFile.file";
-		assertTrue("Equal files did not answer zero for compareTo", f1
-				.compareTo((Object) f2) == 0);
+		assertEquals("Equal files did not answer zero for compareTo", 0, f1
+				.compareTo((Object) f2));
 		assertTrue("f3.compareTo(f1) did not result in value < 0", f3
 				.compareTo((Object) f1) < 0);
 		assertTrue("f1.compareTo(f3) did not result in vale > 0", f1
@@ -397,8 +397,8 @@
 				assertTrue("File Saved To Wrong Directory.", dirName.equals(dir
 						.getPath()
 						+ slash));
-				assertTrue("File Saved With Incorrect Name.", f1.getName()
-						.equals("tempfile.tst"));
+				assertEquals("File Saved With Incorrect Name.", "tempfile.tst", f1.getName()
+						);
 
 				// Test for creating a file that already exists.
 				assertTrue(
@@ -724,16 +724,16 @@
 			base += slash;
 		File f = new File(base, "temp.tst");
 		File f2 = f.getAbsoluteFile();
-		assertTrue("Test 1: Incorrect File Returned.", f2.compareTo(f
-				.getAbsoluteFile()) == 0);
+		assertEquals("Test 1: Incorrect File Returned.", 0, f2.compareTo(f
+				.getAbsoluteFile()));
 		f = new File(base + "Temp" + slash + slash + "temp.tst");
 		f2 = f.getAbsoluteFile();
-		assertTrue("Test 2: Incorrect File Returned.", f2.compareTo(f
-				.getAbsoluteFile()) == 0);
+		assertEquals("Test 2: Incorrect File Returned.", 0, f2.compareTo(f
+				.getAbsoluteFile()));
 		f = new File(base + slash + ".." + slash + "temp.tst");
 		f2 = f.getAbsoluteFile();
-		assertTrue("Test 3: Incorrect File Returned.", f2.compareTo(f
-				.getAbsoluteFile()) == 0);
+		assertEquals("Test 3: Incorrect File Returned.", 0, f2.compareTo(f
+				.getAbsoluteFile()));
 		f.delete();
 		f2.delete();
 	}
@@ -771,17 +771,17 @@
 				base += slash;
 			File f = new File(base, "temp.tst");
 			File f2 = f.getCanonicalFile();
-			assertTrue("Test 1: Incorrect File Returned.", f2
-					.getCanonicalFile().compareTo(f.getCanonicalFile()) == 0);
+			assertEquals("Test 1: Incorrect File Returned.", 0, f2
+					.getCanonicalFile().compareTo(f.getCanonicalFile()));
 			f = new File(base + "Temp" + slash + slash + "temp.tst");
 			f2 = f.getCanonicalFile();
-			assertTrue("Test 2: Incorrect File Returned.", f2
-					.getCanonicalFile().compareTo(f.getCanonicalFile()) == 0);
+			assertEquals("Test 2: Incorrect File Returned.", 0, f2
+					.getCanonicalFile().compareTo(f.getCanonicalFile()));
 			f = new File(base + "Temp" + slash + slash + ".." + slash
 					+ "temp.tst");
 			f2 = f.getCanonicalFile();
-			assertTrue("Test 3: Incorrect File Returned.", f2
-					.getCanonicalFile().compareTo(f.getCanonicalFile()) == 0);
+			assertEquals("Test 3: Incorrect File Returned.", 0, f2
+					.getCanonicalFile().compareTo(f.getCanonicalFile()));
 
 			// Test for when long directory/file names in Windows
 			String osName = System.getProperty("os.name", "unknown");
@@ -796,9 +796,9 @@
 					dir.mkdir();
 					f = new File(dir, "longfilename.tst");
 					f2 = f.getCanonicalFile();
-					assertTrue("Test 4: Incorrect File Returned.",
-							f2.getCanonicalFile().compareTo(
-									f.getCanonicalFile()) == 0);
+					assertEquals("Test 4: Incorrect File Returned.",
+							0, f2.getCanonicalFile().compareTo(
+									f.getCanonicalFile()));
 					FileOutputStream fos = new FileOutputStream(f);
 					fos.close();
 					f2 = new File(testdir + slash + "longdi~1" + slash
@@ -932,8 +932,8 @@
 	public void test_getName() {
 		// Test for method java.lang.String java.io.File.getName()
 		File f = new File("name.tst");
-		assertTrue("Test 1: Returned incorrect name", f.getName().equals(
-				"name.tst"));
+		assertEquals("Test 1: Returned incorrect name", 
+				"name.tst", f.getName());
 
 		f = new File("");
 		assertTrue("Test 2: Returned incorrect name", f.getName().equals(""));
@@ -947,7 +947,7 @@
 	public void test_getParent() {
 		// Test for method java.lang.String java.io.File.getParent()
 		File f = new File("p.tst");
-		assertTrue("Incorrect path returned", f.getParent() == null);
+		assertNull("Incorrect path returned", f.getParent());
 		f = new File(System.getProperty("user.home"), "p.tst");
 		assertTrue("Incorrect path returned", f.getParent().equals(
 				System.getProperty("user.home")));
@@ -963,11 +963,11 @@
 		assertTrue("Wrong parent test 2", f1.getParent().equals(
 				slash + "directory"));
 		f1 = new File("directory/file");
-		assertTrue("Wrong parent test 3", f1.getParent().equals("directory"));
+		assertEquals("Wrong parent test 3", "directory", f1.getParent());
 		f1 = new File("/");
-		assertTrue("Wrong parent test 4", f1.getParent() == null);
+		assertNull("Wrong parent test 4", f1.getParent());
 		f1 = new File("directory");
-		assertTrue("Wrong parent test 5", f1.getParent() == null);
+		assertNull("Wrong parent test 5", f1.getParent());
 
 		if (File.separatorChar == '\\' && new File("d:/").isAbsolute()) {
 			f1 = new File("d:/directory");
@@ -977,12 +977,12 @@
 			assertTrue("Wrong parent test 2a", f1.getParent().equals(
 					"d:" + slash + "directory"));
 			f1 = new File("d:directory/file");
-			assertTrue("Wrong parent test 3a", f1.getParent().equals(
-					"d:directory"));
+			assertEquals("Wrong parent test 3a", 
+					"d:directory", f1.getParent());
 			f1 = new File("d:/");
-			assertTrue("Wrong parent test 4a", f1.getParent() == null);
+			assertNull("Wrong parent test 4a", f1.getParent());
 			f1 = new File("d:directory");
-			assertTrue("Wrong parent test 5a", f1.getParent().equals("d:"));
+			assertEquals("Wrong parent test 5a", "d:", f1.getParent());
 		}
 	}
 
@@ -992,12 +992,12 @@
 	public void test_getParentFile() {
 		// Test for method java.io.File.getParentFile()
 		File f = new File("tempfile.tst");
-		assertTrue("Incorrect path returned", f.getParentFile() == null);
+		assertNull("Incorrect path returned", f.getParentFile());
 		f = new File(System.getProperty("user.dir"), "tempfile1.tmp");
 		File f2 = new File(System.getProperty("user.dir"), "tempfile2.tmp");
 		File f3 = new File(System.getProperty("user.dir"), "/a/tempfile.tmp");
-		assertTrue("Incorrect File Returned", f.getParentFile().compareTo(
-				f2.getParentFile()) == 0);
+		assertEquals("Incorrect File Returned", 0, f.getParentFile().compareTo(
+				f2.getParentFile()));
 		assertTrue("Incorrect File Returned", f.getParentFile().compareTo(
 				f3.getParentFile()) != 0);
 		f.delete();
@@ -1148,8 +1148,8 @@
 					+ "lModTest.tst");
 			f.delete();
 			long lastModifiedTime = f.lastModified();
-			assertTrue("LastModified Time Should Have Returned 0.",
-					lastModifiedTime == 0);
+			assertEquals("LastModified Time Should Have Returned 0.",
+					0, lastModifiedTime);
 			FileOutputStream fos = new FileOutputStream(f);
 			fos.close();
 			f.setLastModified(315550800000L);
@@ -1170,7 +1170,7 @@
 		try {
 			File f = new File(System.getProperty("user.dir"), platformId
 					+ "input.tst");
-			assertTrue("File Length Should Have Returned 0.", f.length() == 0);
+			assertEquals("File Length Should Have Returned 0.", 0, f.length());
 			FileOutputStream fos = new FileOutputStream(f);
 			fos.write(fileString.getBytes());
 			fos.close();
@@ -1207,24 +1207,23 @@
 
 		String[] flist = dir.list();
 
-		assertTrue("Method list() Should Have Returned null.", flist == null);
+		assertNull("Method list() Should Have Returned null.", flist);
 
 		assertTrue("Could not create parent directory for list test", dir
 				.mkdir());
 
 		String[] files = { "mtzz1.xx", "mtzz2.xx", "mtzz3.yy", "mtzz4.yy" };
 		try {
-			assertTrue(
-					"Method list() Should Have Returned An Array Of Length 0.",
-					dir.list().length == 0);
+			assertEquals("Method list() Should Have Returned An Array Of Length 0.",
+					0, dir.list().length);
 
 			File file = new File(dir, "notADir.tst");
 			try {
 				FileOutputStream fos = new FileOutputStream(file);
 				fos.close();
-				assertTrue(
+				assertNull(
 						"listFiles Should Have Returned Null When Used On A File Instead Of A Directory.",
-						file.list() == null);
+						file.list());
 			} catch (IOException e) {
 				fail("Unexpected IOException during test : " + e.getMessage());
 			} finally {
@@ -1264,7 +1263,7 @@
 				if (check[i] == false)
 					checkCount++;
 			}
-			assertTrue("Invalid file returned in listing", checkCount == 0);
+			assertEquals("Invalid file returned in listing", 0, checkCount);
 
 			for (int i = 0; i < files.length; i++) {
 				File f = new File(dir, files[i]);
@@ -1308,22 +1307,22 @@
 				}
 			}
 			// Test for attempting to cal listFiles on a non-existent directory.
-			assertTrue("listFiles Should Return Null.", dir.listFiles() == null);
+			assertNull("listFiles Should Return Null.", dir.listFiles());
 
 			assertTrue("Failed To Create Parent Directory.", dir.mkdir());
 
 			String[] files = { "1.tst", "2.tst", "3.tst", "" };
 			try {
-				assertTrue("listFiles Should Return An Array Of Length 0.", dir
-						.listFiles().length == 0);
+				assertEquals("listFiles Should Return An Array Of Length 0.", 0, dir
+						.listFiles().length);
 
 				File file = new File(dir, "notADir.tst");
 				try {
 					FileOutputStream fos = new FileOutputStream(file);
 					fos.close();
-					assertTrue(
+					assertNull(
 							"listFiles Should Have Returned Null When Used On A File Instead Of A Directory.",
-							file.listFiles() == null);
+							file.listFiles());
 				} catch (IOException e) {
 					fail("Unexpected IOException during test : " + e.getMessage());
 				} finally {
@@ -1341,8 +1340,8 @@
 
 				// Test to make sure that only the 3 files that were created are
 				// listed.
-				assertTrue("Incorrect Number Of Files Returned.",
-						flist.length == 3);
+				assertEquals("Incorrect Number Of Files Returned.",
+						3, flist.length);
 
 				// Test to make sure that listFiles can read hidden files.
 				boolean onUnix = File.separatorChar == '/';
@@ -1363,8 +1362,8 @@
 					fos.close();
 				}
 				flist = dir.listFiles();
-				assertTrue("Incorrect Number Of Files Returned.",
-						flist.length == 4);
+				assertEquals("Incorrect Number Of Files Returned.",
+						4, flist.length);
 
 				// Checking to make sure the correct files were are listed in
 				// the array.
@@ -1384,7 +1383,7 @@
 					if (check[i] == false)
 						checkCount++;
 				}
-				assertTrue("Invalid file returned in listing", checkCount == 0);
+				assertEquals("Invalid file returned in listing", 0, checkCount);
 
 				if (onWindows) {
 					Runtime r = Runtime.getRuntime();
@@ -1445,24 +1444,24 @@
 			}
 		};
 
-		assertTrue("listFiles Should Return Null.", baseDir
-				.listFiles(dirFilter) == null);
+		assertNull("listFiles Should Return Null.", baseDir
+				.listFiles(dirFilter));
 
 		assertTrue("Failed To Create Parent Directory.", baseDir.mkdir());
 
 		File dir1 = null;
 		String[] files = { "1.tst", "2.tst", "3.tst" };
 		try {
-			assertTrue("listFiles Should Return An Array Of Length 0.", baseDir
-					.listFiles(dirFilter).length == 0);
+			assertEquals("listFiles Should Return An Array Of Length 0.", 0, baseDir
+					.listFiles(dirFilter).length);
 
 			File file = new File(baseDir, "notADir.tst");
 			try {
 				FileOutputStream fos = new FileOutputStream(file);
 				fos.close();
-				assertTrue(
+				assertNull(
 						"listFiles Should Have Returned Null When Used On A File Instead Of A Directory.",
-						file.listFiles(dirFilter) == null);
+						file.listFiles(dirFilter));
 			} catch (IOException e) {
 				fail("Unexpected IOException During Test.");
 			} finally {
@@ -1493,12 +1492,12 @@
 
 			// Test to see if the correct number of directories are returned.
 			File[] directories = baseDir.listFiles(dirFilter);
-			assertTrue("Incorrect Number Of Directories Returned.",
-					directories.length == 1);
+			assertEquals("Incorrect Number Of Directories Returned.",
+					1, directories.length);
 
 			// Test to see if the directory was saved with the correct name.
-			assertTrue("Incorrect Directory Returned.", directories[0]
-					.compareTo(dir1) == 0);
+			assertEquals("Incorrect Directory Returned.", 0, directories[0]
+					.compareTo(dir1));
 
 			// Test to see if the correct number of files are returned.
 			File[] flist = baseDir.listFiles(fileFilter);
@@ -1523,7 +1522,7 @@
 				if (check[i] == false)
 					checkCount++;
 			}
-			assertTrue("Invalid file returned in listing", checkCount == 0);
+			assertEquals("Invalid file returned in listing", 0, checkCount);
 
 			for (int i = 0; i < files.length; i++) {
 				File f = new File(baseDir, files[i]);
@@ -1576,23 +1575,23 @@
 			}
 		};
 
-		assertTrue("listFiles Should Return Null.",
-				dir.listFiles(tstFilter) == null);
+		assertNull("listFiles Should Return Null.",
+				dir.listFiles(tstFilter));
 
 		assertTrue("Failed To Create Parent Directory.", dir.mkdir());
 
 		String[] files = { "1.tst", "2.tst", "3.tmp" };
 		try {
-			assertTrue("listFiles Should Return An Array Of Length 0.", dir
-					.listFiles(tstFilter).length == 0);
+			assertEquals("listFiles Should Return An Array Of Length 0.", 0, dir
+					.listFiles(tstFilter).length);
 
 			File file = new File(dir, "notADir.tst");
 			try {
 				FileOutputStream fos = new FileOutputStream(file);
 				fos.close();
-				assertTrue(
+				assertNull(
 						"listFiles Should Have Returned Null When Used On A File Instead Of A Directory.",
-						file.listFiles(tstFilter) == null);
+						file.listFiles(tstFilter));
 			} catch (IOException e) {
 				fail("Unexpected IOException during test : " + e.getMessage());
 			} finally {
@@ -1622,15 +1621,15 @@
 
 			// Tests to see if the correct number of files were returned.
 			File[] flist = dir.listFiles(tstFilter);
-			assertTrue("Incorrect Number Of Files Passed Through tstFilter.",
-					flist.length == 2);
+			assertEquals("Incorrect Number Of Files Passed Through tstFilter.",
+					2, flist.length);
 			for (int i = 0; i < flist.length; i++)
 				assertTrue("File Should Not Have Passed The tstFilter.",
 						flist[i].getPath().endsWith(".tst"));
 
 			flist = dir.listFiles(tmpFilter);
-			assertTrue("Incorrect Number Of Files Passed Through tmpFilter.",
-					flist.length == 1);
+			assertEquals("Incorrect Number Of Files Passed Through tmpFilter.",
+					1, flist.length);
 			assertTrue("File Should Not Have Passed The tmpFilter.", flist[0]
 					.getPath().endsWith(".tmp"));
 
@@ -1678,8 +1677,8 @@
 		};
 
 		String[] flist = dir.list(filter);
-		assertTrue("Method list(FilenameFilter) Should Have Returned Null.",
-				flist == null);
+		assertNull("Method list(FilenameFilter) Should Have Returned Null.",
+				flist);
 
 		assertTrue("Could not create parent directory for test", dir.mkdir());
 
@@ -1694,14 +1693,14 @@
 			 * File file = new File(dir, "notADir.tst"); try { FileOutputStream
 			 * fos = new FileOutputStream(file); fos.close(); } catch
 			 * (IOException e) { fail("Unexpected IOException During
-			 * Test."); } flist = dir.list(filter); assertTrue("listFiles
+			 * Test."); } flist = dir.list(filter); assertNull("listFiles
 			 * Should Have Returned Null When Used On A File Instead Of A
-			 * Directory.", flist == null); file.delete();
+			 * Directory.", flist); file.delete();
 			 */
 
 			flist = dir.list(filter);
-			assertTrue("Array Of Length 0 Should Have Returned.",
-					flist.length == 0);
+			assertEquals("Array Of Length 0 Should Have Returned.",
+					0, flist.length);
 
 			try {
 				for (int i = 0; i < files.length; i++) {
@@ -1738,7 +1737,7 @@
 				if (check[i] == false)
 					checkCount++;
 			}
-			assertTrue("Invalid file returned in listing", checkCount == 0);
+			assertEquals("Invalid file returned in listing", 0, checkCount);
 
 			for (int i = 0; i < files.length; i++) {
 				File f = new File(dir, files[i]);
@@ -1765,8 +1764,8 @@
 		boolean onUnix = File.separatorChar == '/';
 		boolean onWindows = File.separatorChar == '\\';
 		if (onUnix) {
-			assertTrue("Incorrect Number Of Root Directories.",
-					roots.length == 1);
+			assertEquals("Incorrect Number Of Root Directories.",
+					1, roots.length);
 			String fileLoc = roots[0].getPath();
 			assertTrue("Incorrect Root Directory Returned.", fileLoc
 					.startsWith(slash));

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileWriterTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileWriterTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileWriterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileWriterTest.java Wed Apr 26 00:12:16 2006
@@ -53,8 +53,8 @@
 			char[] buf = new char[100];
 			int r = br.read(buf);
 			br.close();
-			assertTrue("Failed to write correct chars", new String(buf, 0, r)
-					.equals(" After test string"));
+			assertEquals("Failed to write correct chars", " After test string", new String(buf, 0, r)
+					);
 		} catch (Exception e) {
 			fail("Exception during Constructor test " + e.toString());
 		}
@@ -99,8 +99,8 @@
 			char[] buf = new char[100];
 			int r = br.read(buf);
 			br.close();
-			assertTrue("Failed to write correct chars", new String(buf, 0, r)
-					.equals(" After test string"));
+			assertEquals("Failed to write correct chars", " After test string", new String(buf, 0, r)
+					);
 		} catch (Exception e) {
 			fail("Exception during Constructor test " + e.toString());
 		}
@@ -123,8 +123,8 @@
 			char[] buf = new char[100];
 			int r = br.read(buf);
 			br.close();
-			assertTrue("Failed to append to file", new String(buf, 0, r)
-					.equals("Test String After test string"));
+			assertEquals("Failed to append to file", "Test String After test string", new String(buf, 0, r)
+					);
 
 			fos = new FileOutputStream(f.getPath());
 			fos.write("Test String".getBytes());
@@ -136,8 +136,8 @@
 			buf = new char[100];
 			r = br.read(buf);
 			br.close();
-			assertTrue("Failed to overwrite file", new String(buf, 0, r)
-					.equals(" After test string"));
+			assertEquals("Failed to overwrite file", " After test string", new String(buf, 0, r)
+					);
 		} catch (Exception e) {
 			fail("Exception during Constructor test " + e.toString());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -51,7 +51,7 @@
 			os = new java.io.FilterOutputStream(bos);
 			os.write(fileString.getBytes(), 0, 500);
 			os.flush();
-			assertTrue("Bytes not written after flush", bos.size() == 500);
+			assertEquals("Bytes not written after flush", 500, bos.size());
 			os.close();
 		} catch (java.io.IOException e) {
 			fail("Close test failed : " + e.getMessage());
@@ -68,7 +68,7 @@
 			os = new java.io.FilterOutputStream(bos);
 			os.write(fileString.getBytes(), 0, 500);
 			os.flush();
-			assertTrue("Bytes not written after flush", bos.size() == 500);
+			assertEquals("Bytes not written after flush", 500, bos.size());
 			os.close();
 		} catch (java.io.IOException e) {
 			fail("Flush test failed : " + e.getMessage());
@@ -131,10 +131,10 @@
 			os.write('t');
 			bis = new java.io.ByteArrayInputStream(bos.toByteArray());
 			os.flush();
-			assertTrue("Byte not written after flush", bis.available() == 1);
+			assertEquals("Byte not written after flush", 1, bis.available());
 			byte[] wbytes = new byte[1];
 			bis.read(wbytes, 0, 1);
-			assertTrue("Incorrect byte written", wbytes[0] == 't');
+			assertEquals("Incorrect byte written", 't', wbytes[0]);
 		} catch (java.io.IOException e) {
 			fail("Write test failed : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java Wed Apr 26 00:12:16 2006
@@ -424,8 +424,8 @@
 		try {
 			is = new InputStreamReader(fis, "8859_1");
 		} catch (UnsupportedEncodingException e) {
-			assertTrue("Returned incorrect encoding", is.getEncoding().equals(
-					"8859_1"));
+			assertEquals("Returned incorrect encoding", 
+					"8859_1", is.getEncoding());
 		}
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -55,19 +55,19 @@
 	 */
 	public void test_getLineNumber() {
 		// Test for method int java.io.LineNumberInputStream.getLineNumber()
-		assertTrue("New stream returned line number other than zero", lnis
-				.getLineNumber() == 0);
+		assertEquals("New stream returned line number other than zero", 0, lnis
+				.getLineNumber());
 		try {
 			lnis.read();
 			lnis.read();
 		} catch (IOException e) {
 			fail("Exception during getLineNumber test : " + e.getMessage());
 		}
-		assertTrue("stream returned incorrect line number after read", lnis
-				.getLineNumber() == 1);
+		assertEquals("stream returned incorrect line number after read", 1, lnis
+				.getLineNumber());
 		lnis.setLineNumber(89);
-		assertTrue("stream returned incorrect line number after set", lnis
-				.getLineNumber() == 89);
+		assertEquals("stream returned incorrect line number after set", 89, lnis
+				.getLineNumber());
 	}
 
 	/**
@@ -79,8 +79,8 @@
 			lnis.mark(40);
 			lnis.skip(4);
 			lnis.reset();
-			assertTrue("Failed to mark", lnis.getLineNumber() == 0);
-			assertTrue("Failed to mark", lnis.read() == '0');
+			assertEquals("Failed to mark", 0, lnis.getLineNumber());
+			assertEquals("Failed to mark", '0', lnis.read());
 		} catch (IOException e) {
 			fail("Exception during mark test : " + e.getMessage());
 		}
@@ -92,17 +92,17 @@
 	public void test_read() {
 		// Test for method int java.io.LineNumberInputStream.read()
 		try {
-			assertTrue("Failed to read correct byte", lnis.read() == '0');
-			assertTrue("Failed to read correct byte on dos text",
-					lnis2.read() == '0');
+			assertEquals("Failed to read correct byte", '0', lnis.read());
+			assertEquals("Failed to read correct byte on dos text",
+					'0', lnis2.read());
 			assertTrue("Failed to read correct byte on dos text",
 					lnis2.read() == '\n');
-			assertTrue("Failed to read correct byte on dos text",
-					lnis2.read() == '1');
+			assertEquals("Failed to read correct byte on dos text",
+					'1', lnis2.read());
 			assertTrue("Failed to read correct byte on dos text",
 					lnis2.read() == '\n');
-			assertTrue("Failed to read correct byte on dos text",
-					lnis2.read() == '2');
+			assertEquals("Failed to read correct byte on dos text",
+					'2', lnis2.read());
 		} catch (IOException e) {
 			fail("Exception during read test : " + e.getMessage());
 		}
@@ -134,8 +134,8 @@
 			lnis.mark(40);
 			lnis.skip(4);
 			lnis.reset();
-			assertTrue("Failed to reset", lnis.getLineNumber() == 0);
-			assertTrue("Failed to reset", lnis.read() == '0');
+			assertEquals("Failed to reset", 0, lnis.getLineNumber());
+			assertEquals("Failed to reset", '0', lnis.read());
 			lnis.reset();
 		} catch (IOException e) {
 			fail("Exception during mark test : " + e.getMessage());
@@ -158,7 +158,7 @@
 	public void test_setLineNumberI() {
 		// Test for method void java.io.LineNumberInputStream.setLineNumber(int)
 		lnis.setLineNumber(89);
-		assertTrue("Failed to set line number", lnis.getLineNumber() == 89);
+		assertEquals("Failed to set line number", 89, lnis.getLineNumber());
 	}
 
 	/**
@@ -168,8 +168,8 @@
 		// Test for method long java.io.LineNumberInputStream.skip(long)
 		try {
 			lnis.skip(4);
-			assertTrue("Skip failed to increment lineNumber", lnis
-					.getLineNumber() == 2);
+			assertEquals("Skip failed to increment lineNumber", 2, lnis
+					.getLineNumber());
 		} catch (IOException e) {
 			fail("Exception during skip test : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java Wed Apr 26 00:12:16 2006
@@ -31,7 +31,7 @@
 	public void test_ConstructorLjava_io_Reader() {
 		// Test for method java.io.LineNumberReader(java.io.Reader)
 		lnr = new LineNumberReader(new StringReader(text), 4092);
-		assertTrue("Failed to create reader", lnr.getLineNumber() == 0);
+		assertEquals("Failed to create reader", 0, lnr.getLineNumber());
 	}
 
 	/**
@@ -40,7 +40,7 @@
 	public void test_ConstructorLjava_io_ReaderI() {
 		// Test for method java.io.LineNumberReader(java.io.Reader, int)
 		lnr = new LineNumberReader(new StringReader(text));
-		assertTrue("Failed to create reader", lnr.getLineNumber() == 0);
+		assertEquals("Failed to create reader", 0, lnr.getLineNumber());
 	}
 
 	/**
@@ -49,8 +49,8 @@
 	public void test_getLineNumber() {
 		// Test for method int java.io.LineNumberReader.getLineNumber()
 		lnr = new LineNumberReader(new StringReader(text));
-		assertTrue("Returned incorrect line number--expected 0, got ", lnr
-				.getLineNumber() == 0);
+		assertEquals("Returned incorrect line number--expected 0, got ", 0, lnr
+				.getLineNumber());
 		try {
 			lnr.readLine();
 			lnr.readLine();
@@ -91,14 +91,14 @@
 
 		try {
 			int c = lnr.read();
-			assertTrue("Read returned incorrect character", c == '0');
+			assertEquals("Read returned incorrect character", '0', c);
 		} catch (IOException e) {
 			fail("Exception during read test : " + e.getMessage());
 		}
 		try {
 			lnr.read();
-			assertTrue("Read failed to inc lineNumber",
-					lnr.getLineNumber() == 1);
+			assertEquals("Read failed to inc lineNumber",
+					1, lnr.getLineNumber());
 		} catch (IOException e) {
 			fail("Exception during read test:" + e.getMessage());
 		}
@@ -119,7 +119,7 @@
 		} catch (IOException e) {
 			fail("Exception during read test : " + e.getMessage());
 		}
-		assertTrue("Read failed to inc lineNumber", lnr.getLineNumber() == 2);
+		assertEquals("Read failed to inc lineNumber", 2, lnr.getLineNumber());
 	}
 
 	/**
@@ -128,7 +128,7 @@
 	public void test_readLine() {
 		// Test for method java.lang.String java.io.LineNumberReader.readLine()
 		lnr = new LineNumberReader(new StringReader(text));
-		assertTrue("Returned incorrect line number", lnr.getLineNumber() == 0);
+		assertEquals("Returned incorrect line number", 0, lnr.getLineNumber());
 		String line = null;
 		try {
 			lnr.readLine();
@@ -136,7 +136,7 @@
 		} catch (IOException e) {
 			fail("Exception during getLineNumberTest: " + e.toString());
 		}
-		assertTrue("Returned incorrect string", "1".equals(line));
+		assertEquals("Returned incorrect string", "1", line);
 		assertTrue("Returned incorrect line number :" + lnr.getLineNumber(),
 				lnr.getLineNumber() == 2);
 	}
@@ -147,7 +147,7 @@
 	public void test_reset() {
 		// Test for method void java.io.LineNumberReader.reset()
 		lnr = new LineNumberReader(new StringReader(text));
-		assertTrue("Returned incorrect line number", lnr.getLineNumber() == 0);
+		assertEquals("Returned incorrect line number", 0, lnr.getLineNumber());
 		String line = null;
 		try {
 			lnr.mark(100);
@@ -157,7 +157,7 @@
 		} catch (IOException e) {
 			fail("Exception during getLineNumberTest: " + e.toString());
 		}
-		assertTrue("Failed to reset reader", "0".equals(line));
+		assertEquals("Failed to reset reader", "0", line);
 	}
 
 	/**
@@ -167,7 +167,7 @@
 		// Test for method void java.io.LineNumberReader.setLineNumber(int)
 		lnr = new LineNumberReader(new StringReader(text));
 		lnr.setLineNumber(1001);
-		assertTrue("set incorrect line number", lnr.getLineNumber() == 1001);
+		assertEquals("set incorrect line number", 1001, lnr.getLineNumber());
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -227,7 +227,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect bytes", ois.available() == 10);
+			assertEquals("Read incorrect bytes", 10, ois.available());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -285,7 +285,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect byte value", ois.read() == 'T');
+			assertEquals("Read incorrect byte value", 'T', ois.read());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -305,8 +305,8 @@
 					.toByteArray()));
 			ois.read(buf, 0, 10);
 			ois.close();
-			assertTrue("Read incorrect bytes", new String(buf, 0, 10)
-					.equals("HelloWorld"));
+			assertEquals("Read incorrect bytes", "HelloWorld", new String(buf, 0, 10)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -339,7 +339,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect byte value", ois.readByte() == 127);
+			assertEquals("Read incorrect byte value", 127, ois.readByte());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -356,7 +356,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect char value", ois.readChar() == 'T');
+			assertEquals("Read incorrect char value", 'T', ois.readChar());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -403,11 +403,11 @@
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
 			sth = (SerializableTestHelper) (ois.readObject());
-			assertTrue("readFields / writeFields failed--first field not set",
-					sth.getText1().equals("Gabba"));
-			assertTrue(
+			assertEquals("readFields / writeFields failed--first field not set",
+					"Gabba", sth.getText1());
+			assertNull(
 					"readFields / writeFields failed--second field should not have been set",
-					sth.getText2() == null);
+					sth.getText2());
 		} catch (Exception e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -444,8 +444,8 @@
 					.toByteArray()));
 			ois.readFully(buf);
 			ois.close();
-			assertTrue("Read incorrect bytes", new String(buf, 0, 10)
-					.equals("HelloWorld"));
+			assertEquals("Read incorrect bytes", "HelloWorld", new String(buf, 0, 10)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -465,8 +465,8 @@
 					.toByteArray()));
 			ois.readFully(buf, 0, 10);
 			ois.close();
-			assertTrue("Read incorrect bytes", new String(buf, 0, 10)
-					.equals("HelloWorld"));
+			assertEquals("Read incorrect bytes", "HelloWorld", new String(buf, 0, 10)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -501,8 +501,8 @@
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
 			ois.readLine();
-			assertTrue("Read incorrect string value", ois.readLine().equals(
-					"SecondLine"));
+			assertEquals("Read incorrect string value", 
+					"SecondLine", ois.readLine());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -599,8 +599,8 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect unsignedByte value", ois
-					.readUnsignedByte() == 255);
+			assertEquals("Read incorrect unsignedByte value", 255, ois
+					.readUnsignedByte());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -617,8 +617,8 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect unsignedShort value", ois
-					.readUnsignedShort() == 65535);
+			assertEquals("Read incorrect unsignedShort value", 65535, ois
+					.readUnsignedShort());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -635,8 +635,8 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect utf value", ois.readUTF().equals(
-					"HelloWorld"));
+			assertEquals("Read incorrect utf value", 
+					"HelloWorld", ois.readUTF());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -657,8 +657,8 @@
 			ois.skipBytes(5);
 			ois.read(buf, 0, 5);
 			ois.close();
-			assertTrue("Skipped incorrect bytes", new String(buf, 0, 5)
-					.equals("World"));
+			assertEquals("Skipped incorrect bytes", "World", new String(buf, 0, 5)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java Wed Apr 26 00:12:16 2006
@@ -628,11 +628,11 @@
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
 			sth = (SerializableTestHelper) (ois.readObject());
-			assertTrue("readFields / writeFields failed--first field not set",
-					sth.getText1().equals("Gabba"));
-			assertTrue(
+			assertEquals("readFields / writeFields failed--first field not set",
+					"Gabba", sth.getText1());
+			assertNull(
 					"readFields / writeFields failed--second field should not have been set",
-					sth.getText2() == null);
+					sth.getText2());
 		} catch (Exception e) {
 			fail("Exception thrown : " + e.getMessage());
 		}
@@ -728,8 +728,8 @@
 					.toByteArray()));
 			ois.read(buf, 0, 10);
 			ois.close();
-			assertTrue("Read incorrect bytes", new String(buf, 0, 10)
-					.equals("HelloWorld"));
+			assertEquals("Read incorrect bytes", "HelloWorld", new String(buf, 0, 10)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -749,8 +749,8 @@
 					.toByteArray()));
 			ois.read(buf, 0, 10);
 			ois.close();
-			assertTrue("Read incorrect bytes", new String(buf, 0, 10)
-					.equals("HelloWorld"));
+			assertEquals("Read incorrect bytes", "HelloWorld", new String(buf, 0, 10)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -766,7 +766,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Read incorrect byte", ois.read() == 'T');
+			assertEquals("Read incorrect byte", 'T', ois.read());
 			ois.close();
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
@@ -799,7 +799,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Wrote incorrect byte value", ois.readByte() == 127);
+			assertEquals("Wrote incorrect byte value", 127, ois.readByte());
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -819,8 +819,8 @@
 					.toByteArray()));
 			ois.readFully(buf);
 			ois.close();
-			assertTrue("Wrote incorrect bytes value", new String(buf, 0, 10)
-					.equals("HelloWorld"));
+			assertEquals("Wrote incorrect bytes value", "HelloWorld", new String(buf, 0, 10)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -836,7 +836,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Wrote incorrect char value", ois.readChar() == 'T');
+			assertEquals("Wrote incorrect char value", 'T', ois.readChar());
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -860,8 +860,8 @@
 			for (int i = 0; i < avail; ++i)
 				buf[i] = ois.readChar();
 			ois.close();
-			assertTrue("Wrote incorrect chars", new String(buf, 0, 10)
-					.equals("HelloWorld"));
+			assertEquals("Wrote incorrect chars", "HelloWorld", new String(buf, 0, 10)
+					);
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -1010,7 +1010,7 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Wrote incorrect short value", ois.readShort() == 127);
+			assertEquals("Wrote incorrect short value", 127, ois.readShort());
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}
@@ -1027,8 +1027,8 @@
 			oos.close();
 			ois = new ObjectInputStream(new ByteArrayInputStream(bao
 					.toByteArray()));
-			assertTrue("Wrote incorrect UTF value", ois.readUTF().equals(
-					"HelloWorld"));
+			assertEquals("Wrote incorrect UTF value", 
+					"HelloWorld", ois.readUTF());
 		} catch (IOException e) {
 			fail("Exception serializing data : " + e.getMessage());
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java Wed Apr 26 00:12:16 2006
@@ -52,10 +52,10 @@
 		// Test for method java.io.ObjectStreamField
 		// java.io.ObjectStreamClass.getField(java.lang.String)
 		ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
-		assertTrue("getField did not return correct field", osc.getField("bam")
-				.getTypeCode() == 'J');
-		assertTrue("getField did not null for non-existent field", osc
-				.getField("wham") == null);
+		assertEquals("getField did not return correct field", 'J', osc.getField("bam")
+				.getTypeCode());
+		assertNull("getField did not null for non-existent field", osc
+				.getField("wham"));
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java?rev=397123&r1=397122&r2=397123&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java Wed Apr 26 00:12:16 2006
@@ -65,8 +65,8 @@
 		// java.io.ObjectStreamField.compareTo(java.lang.Object)
 		assertTrue("Object compared to int did not return > 0", holaField
 				.compareTo(hamField) > 0);
-		assertTrue("Int compared to itself did not return 0", hamField
-				.compareTo(hamField) == 0);
+		assertEquals("Int compared to itself did not return 0", 0, hamField
+				.compareTo(hamField));
 		assertTrue("(Int)ham compared to (Int)sam did not return < 0", hamField
 				.compareTo(samField) < 0);
 	}
@@ -76,8 +76,8 @@
 	 */
 	public void test_getName() {
 		// Test for method java.lang.String java.io.ObjectStreamField.getName()
-		assertTrue("Field did not return correct name", holaField.getName()
-				.equals("hola"));
+		assertEquals("Field did not return correct name", "hola", holaField.getName()
+				);
 	}
 
 	/**
@@ -89,12 +89,12 @@
 		osfArray = osc.getFields();
 		assertTrue("getOffset did not return reasonable values", osfArray[0]
 				.getOffset() != osfArray[1].getOffset());
-		assertTrue("getOffset for osfArray[0].getOffset() did not return 0",
-				osfArray[0].getOffset() == 0);
-		assertTrue("osfArray[1].getOffset() did not return	8", osfArray[1]
-				.getOffset() == 8);
-		assertTrue("osfArray[2].getOffset() did not return 12", osfArray[2]
-				.getOffset() == 12);
+		assertEquals("getOffset for osfArray[0].getOffset() did not return 0",
+				0, osfArray[0].getOffset());
+		assertEquals("osfArray[1].getOffset() did not return	8", 8, osfArray[1]
+				.getOffset());
+		assertEquals("osfArray[2].getOffset() did not return 12", 12, osfArray[2]
+				.getOffset());
 	}
 
 	/**
@@ -111,10 +111,10 @@
 	 */
 	public void test_getTypeCode() {
 		// Test for method char java.io.ObjectStreamField.getTypeCode()
-		assertTrue("getTypeCode on an Object field did not answer 'L'",
-				holaField.getTypeCode() == 'L');
-		assertTrue("getTypeCode on a long field did not answer 'J'", bamField
-				.getTypeCode() == 'J');
+		assertEquals("getTypeCode on an Object field did not answer 'L'",
+				'L', holaField.getTypeCode());
+		assertEquals("getTypeCode on a long field did not answer 'J'", 'J', bamField
+				.getTypeCode());
 	}
 
 	/**



Mime
View raw message