svn commit: r1476094 - /db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java

[ka...@apache.org]

Author: kahatlen
Date: Fri Apr 26 08:12:29 2013
New Revision: 1476094

URL: http://svn.apache.org/r1476094
Log:
DERBY-6203: Intermittent assert failure in StoredPage.initSlotTable()
when running upgrade tests on 10.9 branch

Make BasicSetup run tests in the same order each time. This makes it
less likely to hit DERBY-4577 by accident.

Modified:
    db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java

Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1476094&r1=1476093&r2=1476094&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java (original)
+++ db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java Fri Apr 26 08:12:29 2013
@@ -46,8 +46,17 @@ public class BasicSetup extends UpgradeC
     
     public static Test suite() {
         TestSuite suite = new TestSuite("Upgrade basic setup");
-        
-        suite.addTestSuite(BasicSetup.class);
+
+        // Make the test cases run in a fixed order so they become
+        // more deterministic. Some orderings may make them run into
+        // problems in old versions. Since it's too late to fix bugs
+        // in old versions, we have to work around them like this
+        // instead.
+        //
+        // Specifically, some test orderings may cause the test to
+        // run into DERBY-4577, which could prevent booting of the
+        // database in the upgrade phase.
+        suite.addTest(TestConfiguration.orderedSuite(BasicSetup.class));
 
         if (XML.classpathMeetsXMLReqs()) {
             // Only test XML operators if they are supported by the version