db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r617234 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests: Changes10_3.java Changes10_4.java UpgradeChange.java
Date Thu, 31 Jan 2008 20:53:05 GMT
Author: djd
Date: Thu Jan 31 12:52:59 2008
New Revision: 617234

URL: http://svn.apache.org/viewvc?rev=617234&view=rev
Log:
Remove upgrade test code that provided test cases for the PH_POST_HARD_UPGRADE phase, since
in that mode the old database engine is being against the upgraded database and hence the
connection will fail. (This is tested).
Added comments to the definition of PH_POST_HARD_UPGRADE indicating that no tests cases needed
be added for it.

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java?rev=617234&r1=617233&r2=617234&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
Thu Jan 31 12:52:59 2008
@@ -93,7 +93,6 @@
         {
             case PH_CREATE:
             case PH_POST_SOFT_UPGRADE:
-            case PH_POST_HARD_UPGRADE:
                 // 10.0-10.2 inclusive had the system schema incorrect.
                 if (!oldAtLeast(10, 3))
                     return;
@@ -323,7 +322,6 @@
                 break;
                 
             case PH_HARD_UPGRADE:
-            case PH_POST_HARD_UPGRADE:
                 assertPolicyReloaderExists();
                 break;
             
@@ -474,14 +472,6 @@
                 break;
             }
             case PH_HARD_UPGRADE:
-            {
-                checkNewHeap("testNewHeap1", "create");
-                checkNewHeap("testNewHeap2", "soft");
-                checkNewHeap("testNewHeap3", "hard");
-                break;
-            }
-
-            case PH_POST_HARD_UPGRADE:
             {
                 checkNewHeap("testNewHeap1", "create");
                 checkNewHeap("testNewHeap2", "soft");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java?rev=617234&r1=617233&r2=617234&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
Thu Jan 31 12:52:59 2008
@@ -114,7 +114,6 @@
         case PH_SOFT_UPGRADE:
         case PH_POST_SOFT_UPGRADE:
         case PH_HARD_UPGRADE:
-        case PH_POST_HARD_UPGRADE:
             Connection con = ds.getConnection();
         	//First make the current schema as a user schema. And then run a 
         	//metadata query to make sure that it runs fine. If it does (which
@@ -173,7 +172,6 @@
             break;
             
         case PH_HARD_UPGRADE:
-        case PH_POST_HARD_UPGRADE:
             s.execute( createTableFunctionText );
             break;
         }
@@ -212,7 +210,6 @@
                 break;
 
             case PH_HARD_UPGRADE:
-            case PH_POST_HARD_UPGRADE:
                 // not supported because SQL authorization not set
                 assertStatementError("42Z60", s, createRoleText );
                 break;
@@ -326,23 +323,6 @@
             conn.close();
 
             JDBCDataSource.clearStringBeanProperty(ds, "connectionAttributes");
-            JDBCDataSource.shutdownDatabase(ds);
-            break;
-
-        case PH_POST_HARD_UPGRADE:
-            conn = ds.getConnection();
-            s = conn.createStatement();
-
-            // should work now
-            try {
-                s.execute(createRoleText);
-            } catch (SQLException e) {
-                fail("can't create role post hard upgrade");
-            }
-
-            s.execute(dropRoleText);
-            conn.close();
-
             JDBCDataSource.shutdownDatabase(ds);
             break;
         }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java?rev=617234&r1=617233&r2=617234&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
Thu Jan 31 12:52:59 2008
@@ -74,7 +74,9 @@
     
     static final int PH_HARD_UPGRADE = 3;
     /**
-     * Boot the database with old release after hard upgrade
+     * Boot the database with old release after hard upgrade.
+     * Expected to fail to connect, so no tests need to have
+     * cases for this condition.
      */
     static final int PH_POST_HARD_UPGRADE = 4;
     



Mime
View raw message