svn commit: r1339007 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java

[kr...@apache.org]

Author: kristwaa
Date: Wed May 16 04:56:22 2012
New Revision: 1339007

URL: http://svn.apache.org/viewvc?rev=1339007&view=rev
Log:
DERBY-5764: Make DatabaseMetaDataTest more robust wrt changes made by other tests

Minor cleanups: removed unused imports, removed final from static method,
renamed method, and converted comment to Javadoc.

Patch file: derby-5764-1a-upgraderun_cleanup.diff

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java?rev=1339007&r1=1339006&r2=1339007&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java Wed May 16 04:56:22 2012
@@ -20,17 +20,10 @@ limitations under the License.
 */
 package org.apache.derbyTesting.functionTests.tests.upgradeTests;
 
-import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
 import java.util.Properties;
 
 import junit.extensions.TestSetup;
-import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -77,7 +70,7 @@ class UpgradeRun extends UpgradeClassLoa
         new AdditionalDb("BUILTIN_10_9", false),
     };
     
-    public final static Test suite(final int[] version, boolean useCreateOnUpgrade) {
+    public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
         
         ClassLoader oldLoader = makeClassLoader( version );
         
@@ -227,7 +220,7 @@ class UpgradeRun extends UpgradeClassLoa
             // of DatabaseMetaData should be available.
             case UpgradeChange.PH_SOFT_UPGRADE:
             case UpgradeChange.PH_HARD_UPGRADE:
-                RunDataBaseMetaDataTest(suite, oldMinor);
+                runDataBaseMetaDataTest(suite, oldMinor);
                 break;
             }
         }
@@ -291,11 +284,15 @@ class UpgradeRun extends UpgradeClassLoa
         return test;
     }
     
-    // We want to run DatabaseMetaDataTest, but it includes some
-    // features not supported in older versions, so we cannot just
-    // add the DatabaseMetaDataTest.class as is.
-    // Note also, that this does not execute fixture initialCompilationTest.
-    private static void RunDataBaseMetaDataTest (TestSuite suite, int oldMinor)
+    /**
+     * Adds a subset of the tests from DatabaseMetaDataTest to the test suite.
+     * <p>
+     * We want to run DatabaseMetaDataTest, but it includes some
+     * features not supported in older versions, so we cannot just
+     * add the DatabaseMetaDataTest.class as is.
+     * Note also, that this does not execute fixture initialCompilationTest.
+     */
+    private static void runDataBaseMetaDataTest (TestSuite suite, int oldMinor)
     {
         Method[] methods = DatabaseMetaDataTest.class.getMethods();
         for (int i = 0; i < methods.length; i++) {