Index: src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java =================================================================== --- src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java (revision 469053) +++ src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java (working copy) @@ -42,10 +42,10 @@ SQLPermission thePermission = new SQLPermission(validName, validActions); assertNotNull(thePermission); - assertTrue(thePermission.getName().equals(validName)); + assertEquals(validName, thePermission.getName()); // System.out.println("The actions: " + thePermission.getActions() + "." // ); - assertTrue(thePermission.getActions().equals("")); + assertEquals("", thePermission.getActions()); } // end method testSQLPermissionStringString /* @@ -57,7 +57,7 @@ SQLPermission thePermission = new SQLPermission(validName); assertNotNull(thePermission); - assertTrue(thePermission.getName().equals(validName)); + assertEquals(validName, thePermission.getName()); // Set an invalid name ... String invalidName = "foo"; @@ -65,8 +65,8 @@ thePermission = new SQLPermission(invalidName); assertNotNull(thePermission); - assertTrue(thePermission.getName().equals(invalidName)); - assertTrue(thePermission.getActions().equals("")); + assertEquals(invalidName, thePermission.getName()); + assertEquals("", thePermission.getActions()); } // end method testSQLPermissionString } // end class SQLPermissionTest Index: src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java =================================================================== --- src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java (revision 469053) +++ src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java (working copy) @@ -18,6 +18,7 @@ package org.apache.harmony.sql.tests.java.sql; import java.sql.DriverPropertyInfo; +import java.util.Arrays; import junit.framework.TestCase; @@ -72,11 +73,11 @@ DriverPropertyInfo aDriverPropertyInfo = new DriverPropertyInfo( validName, validValue); - assertTrue(aDriverPropertyInfo.choices == testChoices); - assertTrue(aDriverPropertyInfo.value == testValue); - assertTrue(aDriverPropertyInfo.required == testRequired); - assertTrue(aDriverPropertyInfo.description == testDescription); - assertTrue(aDriverPropertyInfo.name == testName); + assertTrue(Arrays.equals(testChoices, aDriverPropertyInfo.choices)); + assertEquals(testValue, aDriverPropertyInfo.value); + assertEquals(testRequired, aDriverPropertyInfo.required); + assertEquals(testDescription, aDriverPropertyInfo.description); + assertEquals(testName, aDriverPropertyInfo.name); aDriverPropertyInfo.choices = updateChoices; aDriverPropertyInfo.value = updateValue; @@ -84,11 +85,11 @@ aDriverPropertyInfo.description = updateDescription; aDriverPropertyInfo.name = updateName; - assertTrue(aDriverPropertyInfo.choices == updateChoices); - assertTrue(aDriverPropertyInfo.value == updateValue); - assertTrue(aDriverPropertyInfo.required == updateRequired); - assertTrue(aDriverPropertyInfo.description == updateDescription); - assertTrue(aDriverPropertyInfo.name == updateName); + assertTrue(Arrays.equals(updateChoices, aDriverPropertyInfo.choices)); + assertEquals(updateValue, aDriverPropertyInfo.value); + assertEquals(updateRequired, aDriverPropertyInfo.required); + assertEquals(updateDescription, aDriverPropertyInfo.description); + assertEquals(updateName, aDriverPropertyInfo.name); } // end method testPublicFields