geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r955660 - in /geronimo/server/branches/2.1/testsuite: console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ security-testsuite/test-secur...
Date Thu, 17 Jun 2010 16:10:16 GMT
Author: xiaming
Date: Thu Jun 17 16:10:15 2010
New Revision: 955660

URL: http://svn.apache.org/viewvc?rev=955660&view=rev
Log:
Fix some testsuite cases failures in G 2.1 branch

Modified:
    geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
    geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
    geronimo/server/branches/2.1/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
    geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java

Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java?rev=955660&r1=955659&r2=955660&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
Thu Jun 17 16:10:15 2010
@@ -29,7 +29,7 @@ public class DeploymentTest extends Cons
         try {
             login();
 
-            selenium.click("link=Deploy New");
+            selenium.click("link=Deployer");
             selenium.waitForPageToLoad("30000");
             selenium.click("//input[@value='Install']");
             selenium.waitForPageToLoad("30000");

Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java?rev=955660&r1=955659&r2=955660&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
Thu Jun 17 16:10:15 2010
@@ -44,8 +44,13 @@ public class PluginsTest extends Console
             selenium.type("newRepository", actualLink);
             selenium.click("//input[@value='Add Repository']");
             selenium.waitForPageToLoad("30000");
+
+            if (selenium.isTextPresent("Already have an entry for repository " + actualLink))
{
+                selenium.click("link=Cancel");
+                waitForPageLoad();
+            }
             
-            selenium.select("repository", "label=" + actualLink);
+            selenium.select("repository", "label=" + actualLink);            
             selenium.type("username", "system");
             selenium.type("password", "manager");            
             selenium.click("//input[@value='Show Plugins in selected repository']");

Modified: geronimo/server/branches/2.1/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java?rev=955660&r1=955659&r2=955660&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
Thu Jun 17 16:10:15 2010
@@ -33,14 +33,14 @@ public class DeploymentPortletTest
 {
     @Test
     public void testDeploymentLink() throws Exception {
-        selenium.click("link=Deploy New");
+        selenium.click("link=Deployer");
         selenium.waitForPageToLoad("30000");
         assertEquals("Geronimo Console", selenium.getTitle());
-        assertEquals("Install New Applications", 
+        assertEquals("Install Application", 
                      selenium.getText(getPortletTitleLocation()));
         // Test help link
         selenium.click(getPortletHelpLocation());
         selenium.waitForPageToLoad("30000");
-        selenium.isTextPresent("This portlet allows the user to deploy new applications on
Geronimo.");
+        //assertTrue(selenium.isElementPresent("//input[contains(@name,'startApp')]"));
     }
 }

Modified: geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java?rev=955660&r1=955659&r2=955660&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
(original)
+++ geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
Thu Jun 17 16:10:15 2010
@@ -32,6 +32,7 @@ public class TestSecurity extends Seleni
         selenium.type("j_password", "bone");
         selenium.click("submit");
         selenium.waitForPageToLoad("30000");
+        selenium.open("/demo/protect/hello.html");
         assertEquals("hello world.", selenium.getText("xpath=/html"));
     }
 



Mime
View raw message