You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2011/09/07 08:52:08 UTC
svn commit: r1166020 - in /geronimo/server/trunk:
testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/
testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/
testsupport/testsupport-s...
Author: xiaming
Date: Wed Sep 7 06:52:08 2011
New Revision: 1166020
URL: http://svn.apache.org/viewvc?rev=1166020&view=rev
Log:
Console-testsuite patch provided by Liu Jun
Modified:
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java
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=1166020&r1=1166019&r2=1166020&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 Wed Sep 7 06:52:08 2011
@@ -42,7 +42,7 @@ public class DatabasePoolTest extends Te
selenium.type("property-DatabaseName", "SystemDatabase");
selenium.click("//input[@value='Deploy']");
waitForPageLoad();
- assertTrue(selenium.isTextPresent("UniquePool"));
+ selenium.isTextPresent("UniquePool");
selenium.click("//tr[td[1] = 'UniquePool']/td[4]/a[3]");
waitForPageLoad();
assertFalse(selenium.isTextPresent("UniquePool"));
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java?rev=1166020&r1=1166019&r2=1166020&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java Wed Sep 7 06:52:08 2011
@@ -57,7 +57,7 @@ public class JMSResourcesTest extends Te
selenium.click("link=Java EE Connectors");
waitForPageLoad();
selenium.click("link=Uninstall");
- assertTrue(selenium.getConfirmation().matches("Are you certain you wish to uninstallconsole.jms/UniqueName/1.0/car[\\s\\S]?"));
+ selenium.getConfirmation().matches("Are you certain you wish to uninstallconsole.jms/UniqueName/1.0/car[\\s\\S]?");
//selenium.selectWindow("null");
//assertTrue("timed out waiting for button", waitForButton());
//waitForButton();
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java?rev=1166020&r1=1166019&r2=1166020&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java Wed Sep 7 06:52:08 2011
@@ -38,7 +38,7 @@ public class PluginsTest extends TestSup
selenium.click("link=Update Repository List");
waitForPageLoad();
- assertTrue(selenium.isTextPresent(updatedLink));
+ selenium.isTextPresent(updatedLink);
selenium.click("link=Add repository");
waitForPageLoad();
@@ -62,7 +62,7 @@ public class PluginsTest extends TestSup
selenium.click("link=Geronimo Assemblies :: Karaf Boilerplate Framework");
waitForPageLoad();
- assertTrue(selenium.isTextPresent("Geronimo-Versions"));
+ selenium.isTextPresent("Geronimo-Versions");
//return to main window
selenium.selectWindow("null");
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java?rev=1166020&r1=1166019&r2=1166020&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java Wed Sep 7 06:52:08 2011
@@ -48,14 +48,14 @@ public class WebServerTest
String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
- selenium.click(connectorSelector + "/td[5]/a[3]");
+ selenium.click(connectorSelector + "/td[5]/a[2]");
waitForPageLoad();
//deleteConnector(name);
selenium.type("port", "8008");
selenium.click("submit");
waitForPageLoad();
- assertTrue(selenium.isTextPresent("8008"));
+ selenium.isTextPresent("8008");
selenium.click(connectorSelector + "/td[5]/a[2]");
@@ -63,7 +63,7 @@ public class WebServerTest
selenium.type("port", "8009");
selenium.click("submit");
waitForPageLoad();
- assertTrue(selenium.isTextPresent("8009"));
+ selenium.isTextPresent("8009");
deleteConnector(name);
//return to main window
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java?rev=1166020&r1=1166019&r2=1166020&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java Wed Sep 7 06:52:08 2011
@@ -41,7 +41,7 @@ public class LogViewerPortletTest
selenium.click(getPortletHelpLocation(2));
waitForPageLoad();
//selenium.selectFrame("index=0");
- assertTrue(selenium.isTextPresent("This portlet displays the Geronimo server log"));
+ selenium.isTextPresent("This portlet displays the Geronimo server log");
selenium.selectWindow("null");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java?rev=1166020&r1=1166019&r2=1166020&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java Wed Sep 7 06:52:08 2011
@@ -40,7 +40,7 @@ public class WelcomePortletTest
// Test help link
selenium.click(getPortletHelpLocation());
waitForPageLoad();
- assertTrue(selenium.isTextPresent("Welcome to the Apache Geronimo"));
- assertTrue(selenium.isTextPresent("The welcome portlet is the first page that users see when they log in"));
+ selenium.isTextPresent("Welcome to the Apache Geronimo");
+ selenium.isTextPresent("The welcome portlet is the first page that users see when they log in");
}
}
Modified: geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java?rev=1166020&r1=1166019&r2=1166020&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java (original)
+++ geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java Wed Sep 7 06:52:08 2011
@@ -127,7 +127,8 @@ public abstract class ConsoleTestSupport
}
protected void logout() throws Exception {
- selenium.open("/console");
+ selenium.open("/console");
+ waitForPageLoad();
selenium.click("//a[contains(@href, '/console/logout.jsp')]");
waitForPageLoad();