You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/10/03 22:24:33 UTC

svn commit: r701520 - in /geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console: DBManagerTest.java DatabasePoolTest.java

Author: dwoods
Date: Fri Oct  3 13:24:33 2008
New Revision: 701520

URL: http://svn.apache.org/viewvc?rev=701520&view=rev
Log:
GERONIMO-4225 add additional testcases for datasource vs. database focused Run SQL portlet instances

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java?rev=701520&r1=701519&r2=701520&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java Fri Oct  3 13:24:33 2008
@@ -33,16 +33,14 @@
         selenium.click("//input[@value = 'Create']");
         waitForPageLoad();
         assertTrue(selenium.isTextPresent("MyUniqueDB"));
-        selenium.type("sqlStmts", "create table myTable ( id int primary key );");
-        selenium.select("useDB", "label=SystemDatabase");
         selenium.select("useDB", "label=MyUniqueDB");
+        selenium.type("sqlStmts", "create table myTable ( id int primary key );");
         selenium.click("//input[@value = 'Run SQL']");
         waitForPageLoad();
         //selenium.click("link=Application");
         selenium.click("//a[contains(@href, 'db=MyUniqueDB')]");
         waitForPageLoad();
         assertTrue(selenium.isTextPresent("MYTABLE"));
-        selenium.select("deleteDB", "label=SystemDatabase");
         selenium.select("deleteDB", "label=MyUniqueDB");
         selenium.click("//input[@value = 'Delete']");
         waitForPageLoad();
@@ -50,4 +48,15 @@
         waitForPageLoad();
         assertTrue(selenium.isTextPresent("Database deleted: MyUniqueDB"));
     }
+    
+    @Test
+    public void testRunSQL() throws Exception {
+        selenium.click("link=DB Manager");
+        waitForPageLoad();
+        selenium.select("useDB", "label=SystemDatabase");
+        selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
+        selenium.click("//input[@value = 'Run SQL']");
+        waitForPageLoad();
+        assertTrue(selenium.isTextPresent("SQL command/s successful"));
+    }
 }

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java?rev=701520&r1=701519&r2=701520&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java Fri Oct  3 13:24:33 2008
@@ -47,7 +47,18 @@
         waitForPageLoad();
         assertFalse(selenium.isTextPresent("UniquePool"));
     }
-    
+
+    @Test
+    public void testRunSQLDS() throws Exception {
+        selenium.click("link=Database Pools");
+        waitForPageLoad();
+        selenium.select("useDB", "label=SystemDatasource");
+        selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
+        selenium.click("//input[@value = 'Run SQL']");
+        waitForPageLoad();
+        assertTrue(selenium.isTextPresent("SQL command/s successful"));
+    }
+
     /*
     // cannot test yet. jetty is having problems rending the page