svn commit: r1080557 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java

[ka...@apache.org]

Author: kahatlen
Date: Fri Mar 11 12:48:51 2011
New Revision: 1080557

URL: http://svn.apache.org/viewvc?rev=1080557&view=rev
Log:
DERBY-5102: GrantRevokeDDLTest depends on implicit ordering of test cases

More cleanup when the test cases complete.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java?rev=1080557&r1=1080556&r2=1080557&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java Fri Mar 11 12:48:51 2011
@@ -10070,8 +10070,10 @@ public final class GrantRevokeDDLTest ex
             new String [][] {{"1", "2"}, {"2", "3"}});
 
         st_mamta2.execute("drop table fkt2");
+        st_mamta2.execute("drop schema mamta2 restrict");
         st_mamta1.execute("drop table pkt2");
         st_mamta1.execute("drop table pkt1");
+        st_mamta1.execute("drop schema mamta1 restrict");
         st_mamta2.close();
         st_mamta1.close();
         mamta2.close();
@@ -10327,6 +10329,10 @@ public final class GrantRevokeDDLTest ex
         // close result sets
         rs.close();
 
+        // Drop the objects created in this test case
+        dboSt.execute("drop table session.t2");
+        dboSt.execute("drop schema session restrict");
+
         // close statements
         dboSt.close();
         georgeSt.close();
@@ -10350,6 +10356,10 @@ public final class GrantRevokeDDLTest ex
 
         st_mamta1.execute(
             "create view v_4502( a ) as select tablename from sys.systables");
+
+        // Clean up
+        st_mamta1.execute("drop view v_4502");
+        st_mamta1.execute("drop schema mamta1 restrict");
     }
     
 }