You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/09 21:47:00 UTC
svn commit: r583272 -
/geronimo/server/branches/2.0/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
Author: gawor
Date: Tue Oct 9 12:47:00 2007
New Revision: 583272
URL: http://svn.apache.org/viewvc?rev=583272&view=rev
Log:
more reliable web connector tests
Modified:
geronimo/server/branches/2.0/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
Modified: geronimo/server/branches/2.0/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java?rev=583272&r1=583271&r2=583272&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java (original)
+++ geronimo/server/branches/2.0/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java Tue Oct 9 12:47:00 2007
@@ -24,77 +24,51 @@
@Test
public class WebServerTest extends ConsoleTestSupport {
+
+ String TOMCAT = "Tomcat";
+ String JETTY = "Jetty";
+
@Test
public void testNewConnector() throws Exception {
try {
login();
- String TOMCAT = "Tomcat";
- String JETTY = "Jetty";
+ String name = "uniquename";
+ addConnector(name, 8081);
- selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
- String container = JETTY;
- if(selenium.isTextPresent(TOMCAT)) {
- container = TOMCAT;
- }
-
- selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
- selenium.click("link=" + container + " BIO HTTP Connector");
- selenium.waitForPageToLoad("30000");
- selenium.type("uniqueName", "uniquename");
- selenium.type("port", "8081");
- selenium.click("submit");
- selenium.waitForPageToLoad("30000");
- assertTrue(selenium.isTextPresent("uniquename"));
- selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete uniquename?');\"]");
- selenium.waitForPageToLoad("30000");
- assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete uniquename[\\s\\S]$"));
- } catch(Exception e) {
-
+ deleteConnector(name);
} finally {
logout();
}
}
-
+
@Test
public void testEditConnector() throws Exception{
try {
login();
- selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
-
- String TOMCAT = "Tomcat";
- String JETTY = "Jetty";
-
- selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
- String container = JETTY;
- if(selenium.isTextPresent(TOMCAT)) {
- container = TOMCAT;
- }
-
- // assuming there are at least three connectors
- selenium.click("//tr[2]/td[2]/table//tr[4]/td[5]/a[2]");
+ String name = "uniquename2";
+ addConnector(name, 8082);
+
+ String connectorSelector = "//tr[2]/td[2]/table//tr[td[1] = \"" + name + "\"]";
+ selenium.click(connectorSelector + "/td[5]/a[2]");
selenium.waitForPageToLoad("30000");
+
selenium.type("port", "8008");
selenium.click("submit");
selenium.waitForPageToLoad("30000");
assertTrue(selenium.isTextPresent("8008"));
- // assuming there are at least three connectors
- selenium.click("//tr[2]/td[2]/table//tr[4]/td[5]/a[2]");
-
+ selenium.click(connectorSelector + "/td[5]/a[2]");
+
selenium.waitForPageToLoad("30000");
selenium.type("port", "8009");
selenium.click("submit");
selenium.waitForPageToLoad("30000");
assertTrue(selenium.isTextPresent("8009"));
- } catch(Exception e) {
-
+
+ deleteConnector(name);
} finally {
logout();
}
@@ -105,20 +79,47 @@
try {
login();
- selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
- assertEquals("running", selenium.getText("//td[2]/table/tbody/tr[2]/td[4]"));
- selenium.click("//td[2]/table/tbody/tr[2]/td[5]/a[1]");
+ String name = "uniquename3";
+ addConnector(name, 8083);
+
+ String connectorSelector = "//tr[2]/td[2]/table//tr[td[1] = \"" + name + "\"]";
+
+ assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
+ selenium.click(connectorSelector + "/td[5]/a[1]");
selenium.waitForPageToLoad("30000");
- assertEquals("stopped", selenium.getText("//td[2]/table/tbody/tr[2]/td[4]"));
- selenium.click("//td[2]/table/tbody/tr[2]/td[5]/a[1]");
+ assertEquals("stopped", selenium.getText(connectorSelector + "/td[4]"));
+ selenium.click(connectorSelector + "/td[5]/a[1]");
selenium.waitForPageToLoad("30000");
- assertEquals("running", selenium.getText("//td[2]/table/tbody/tr[2]/td[4]"));
- } catch(Exception e) {
-
+ assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
+
+ deleteConnector(name);
} finally {
logout();
}
}
+
+ private void addConnector(String name, int port) throws Exception {
+ selenium.click("link=Web Server");
+ selenium.waitForPageToLoad("30000");
+ String container = JETTY;
+ if(selenium.isTextPresent(TOMCAT)) {
+ container = TOMCAT;
+ }
+
+ selenium.click("link=" + container + " BIO HTTP Connector");
+ selenium.waitForPageToLoad("30000");
+ selenium.type("uniqueName", name);
+ selenium.type("port", String.valueOf(port));
+ selenium.click("submit");
+ selenium.waitForPageToLoad("30000");
+ assertTrue(selenium.isTextPresent(name));
+ }
+
+ private void deleteConnector(String name) throws Exception {
+ selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete " + name + "?');\"]");
+ selenium.waitForPageToLoad("30000");
+ assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete " + name + "[\\s\\S]$"));
+ }
+
}