Fix a test by syncing with upstream.

This test has been failing for us because of a local modification.

1 files changed, 3 insertions, 12 deletions

diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
index d53f078..069d46f 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
+++ b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
@@ -383,16 +383,9 @@ public class DriverManagerTest extends TestCase {
         } // end while
 
         // Check that all the drivers are in the list...
-        // BEGIN android-changed
-        // We have a ClassLoader issue in the DriverManager: The
-        // Drivermanager loads the System drivers in a static initialisation
-        // method loadInitialDrivers. This initialisation happens in the cts
-        // environment before the test sets the drivers via the system property
-        // "jdbc.drivers".
-        // Therefore the system drivers are not returned via getDrivers()
-        final int noOfSystemDriversLoaded = 2; //DRIVER4 + DRIVER5
-        assertEquals("testGetDrivers: Don't see all the loaded drivers - ", numberLoaded - noOfSystemDriversLoaded, i);
-        // END android-changed
+        // There might be other drivers loaded in other classes
+        assertTrue("testGetDrivers: Don't see all the loaded drivers - ",
+                i >= numberLoaded);
     } // end method testGetDrivers()
 
     static int timeout1 = 25;
@@ -759,5 +752,3 @@ public class DriverManagerTest extends TestCase {
     }
 
 } // end class DriverManagerTest
-
-