From 9d287570256b6a078cf5282ea78547b4d60001b2 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Thu, 26 Nov 2015 12:48:35 +0000 Subject: Fix BatchUpdateExceptionTest. Use array equality, not same-ness. bug: 25862966 Change-Id: Iff6cae3eb2d15abfcd82843aa16f1ff610c77398 --- .../tests/java/sql/BatchUpdateExceptionTest.java | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java index 5f1ccbd..e581317 100644 --- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java +++ b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java @@ -97,9 +97,8 @@ public class BatchUpdateExceptionTest extends TestCase { assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); - assertEquals(i + " Final state mismatch: ", - aBatchUpdateException.getUpdateCounts(), - theFinalStates2[i]); + assertTrue(i + " Final state mismatch: ", + Arrays.equals(aBatchUpdateException.getUpdateCounts(), theFinalStates2[i])); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getSQLState(), theFinalStates3[i]); assertEquals(i + " Final state mismatch: ", @@ -152,9 +151,8 @@ public class BatchUpdateExceptionTest extends TestCase { assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); - assertEquals(i + " Final state mismatch: ", - aBatchUpdateException.getUpdateCounts(), - theFinalStates2[i]); + assertTrue(i + " Final state mismatch: ", + Arrays.equals(aBatchUpdateException.getUpdateCounts(), theFinalStates2[i])); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getSQLState(), theFinalStates3[i]); assertEquals(i + " Final state mismatch: ", @@ -209,9 +207,8 @@ public class BatchUpdateExceptionTest extends TestCase { assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); - assertEquals(i + " Final state mismatch: ", - aBatchUpdateException.getUpdateCounts(), - theFinalStates2[i]); + assertTrue(i + " Final state mismatch: ", + Arrays.equals(aBatchUpdateException.getUpdateCounts(), theFinalStates2[i])); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getSQLState(), theFinalStates3[i]); assertEquals(i + " Final state mismatch: ", @@ -267,9 +264,8 @@ public class BatchUpdateExceptionTest extends TestCase { assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); - assertEquals(i + " Final state mismatch: ", - aBatchUpdateException.getUpdateCounts(), - theFinalStates2[i]); + assertTrue(i + " Final state mismatch: ", + Arrays.equals(aBatchUpdateException.getUpdateCounts(), theFinalStates2[i])); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getSQLState(), theFinalStates3[i]); assertEquals(i + " Final state mismatch: ", @@ -399,8 +395,7 @@ public class BatchUpdateExceptionTest extends TestCase { if (theExceptions[i] != null) { fail(i + "Exception missed"); } - assertEquals(i + "Return value mismatch", theReturn, - theReturns[i]); + assertTrue(i + "Return value mismatch", Arrays.equals(theReturn, theReturns[i])); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); -- cgit v1.2.3