You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/05/27 04:20:53 UTC
svn commit: r948654 - in /geronimo/server/branches/2.2:
testsuite/console-testsuite/advanced/
testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/
testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/...
Author: genspring
Date: Thu May 27 02:20:52 2010
New Revision: 948654
URL: http://svn.apache.org/viewvc?rev=948654&view=rev
Log:
GERONIMO-5316 console-testsuite failed most of the test cases
Modified:
geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
geronimo/server/branches/2.2/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml Thu May 27 02:20:52 2010
@@ -54,6 +54,9 @@
<suiteXmlFiles>
<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
</suiteXmlFiles>
+ <systemPropertyVariables>
+ <geronimoVersion>${version}</geronimoVersion>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java Thu May 27 02:20:52 2010
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
public class DeploymentTest extends TestSupport {
@Test
public void testEmptyDeployment() throws Exception {
- selenium.click("link=Deploy New");
+ selenium.click("link=Deployer");
waitForPageLoad();
selenium.click("//input[@value='Install']");
waitForPageLoad();
- assertTrue(selenium.isTextPresent("Deployment Failed"));
+ assertTrue(selenium.isTextPresent("The application was not deployed"));
}
}
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java Thu May 27 02:20:52 2010
@@ -53,12 +53,14 @@ public class JMSResourcesTest extends Te
selenium.click("//input[@value='Deploy Now']");
waitForPageLoad();
assertTrue(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/car)"));
+ selenium.open("/console");
selenium.click("link=J2EE Connectors");
waitForPageLoad();
selenium.click("link=Uninstall");
assertTrue("timed out waiting for button", waitForButton());
selenium.click("dijit_form_Button_0");
waitForPageLoad();
+ selenium.open("/console");
selenium.click("link=JMS Resources");
waitForPageLoad();
assertFalse(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/car)"));
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java Thu May 27 02:20:52 2010
@@ -37,14 +37,17 @@ public class PluginsTest extends TestSup
selenium.click("link=Update Repository List");
waitForPageLoad();
- assertTrue(selenium.isTextPresent(updatedLink));
+ assertTrue(selenium.isTextPresent(updatedLink));
- selenium.click("link=Add Repository");
+ selenium.open("/console");
+ selenium.click("link=Plugins");
+ waitForPageLoad();
+ selenium.click("link=Add repository");
waitForPageLoad();
assertTrue(selenium.isTextPresent(link));
selenium.type("newRepository", actualLink);
- selenium.click("//input[@value='Add Repository']");
+ selenium.click("//input[@value='Add repository']");
waitForPageLoad();
if (selenium.isTextPresent("Already have an entry for repository " + actualLink)) {
@@ -55,7 +58,7 @@ public class PluginsTest extends TestSup
selenium.select("repository", "label=" + actualLink);
selenium.type("username", "system");
selenium.type("password", "manager");
- selenium.click("//input[@value = 'Show Plugins in selected repository']");
+ selenium.click("//input[@value = 'Show plugins in selected repository']");
waitForPageLoad();
assertTrue(selenium.isTextPresent("Geronimo Assemblies :: Boilerplate"));
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java Thu May 27 02:20:52 2010
@@ -30,11 +30,11 @@ public class DeploymentPortletTest
extends BasicConsoleTestSupport
{
@Test
- public void testDeploymentLink() throws Exception {
- selenium.click("link=Deploy New");
+ public void testDeploymentLink() throws Exception {
+ selenium.click("link=Deployer");
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Install New Applications",
+ assertEquals("Install Application",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java Thu May 27 02:20:52 2010
@@ -34,10 +34,10 @@ public class DerbyLogViewerPortletTest
selenium.click("link=Server Logs");
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Derby Log Viewer",
- selenium.getText(getPortletTitleLocation(4)));
+ assertEquals("Log Manager",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click(getPortletHelpLocation(4));
+ selenium.click(getPortletHelpLocation());
waitForPageLoad();
selenium.isTextPresent("This portlet views the log file for Geronimo's internal database, Derby.");
}
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java Thu May 27 02:20:52 2010
@@ -34,22 +34,25 @@ public class SimpleLoginTest
logout();
}
- @Test
+ @Test(dependsOnMethods = { "testLoginAndLogout" })
public void testClickSomeLinks() throws Exception {
try {
login();
selenium.click("link=Information");
- waitForPageLoad();
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
+ selenium.open("/console");
selenium.click("link=Java System Info");
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
+ selenium.open("/console");
selenium.click("link=DB Info");
waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
+ assertEquals("Geronimo Console", selenium.getTitle());
+
} finally {
logout();
}
Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java Thu May 27 02:20:52 2010
@@ -33,6 +33,7 @@ public class WelcomePortletTest
public void testWelcomeLink() throws Exception {
selenium.click("link=Java System Info");
waitForPageLoad();
+ selenium.open("/console");
selenium.click("link=Welcome");
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
Modified: geronimo/server/branches/2.2/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java?rev=948654&r1=948653&r2=948654&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java (original)
+++ geronimo/server/branches/2.2/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java Thu May 27 02:20:52 2010
@@ -29,27 +29,22 @@ import org.apache.geronimo.testsupport.S
public abstract class ConsoleTestSupport
extends SeleniumTestSupport
{
- protected void login() throws Exception {
- selenium.open("/");
- waitForPageLoad();
-
+ protected void login() throws Exception {
+ selenium.open("/");
assertEquals("Apache Geronimo", selenium.getTitle());
-
selenium.deleteAllVisibleCookies();
-
selenium.click("link=Console");
- waitForPageLoad();
-
+ waitForPageLoad();
assertEquals("Geronimo Console Login", selenium.getTitle());
-
- selenium.type("j_username", "system");
- selenium.type("j_password", "manager");
+ selenium.type("//input[@name='j_username']", "system");
+ selenium.type("//input[@name='j_password']", "manager");
selenium.click("submit");
waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
}
protected void logout() throws Exception {
+ selenium.open("/console");
selenium.click("//a[contains(@href, '/console/logout.jsp')]");
waitForPageLoad();