From scm-return-42909-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Jun 02 16:52:34 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 21929 invoked from network); 2 Jun 2010 16:52:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 16:52:33 -0000 Received: (qmail 85180 invoked by uid 500); 2 Jun 2010 16:52:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 85118 invoked by uid 500); 2 Jun 2010 16:52:33 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 85111 invoked by uid 99); 2 Jun 2010 16:52:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 16:52:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 16:52:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6D2342388978; Wed, 2 Jun 2010 16:52:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950659 - in /geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security: TestConsoleSecurity.java TestSecurity.java Date: Wed, 02 Jun 2010 16:52:12 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100602165212.6D2342388978@eris.apache.org> Author: xiaming Date: Wed Jun 2 16:52:12 2010 New Revision: 950659 URL: http://svn.apache.org/viewvc?rev=950659&view=rev Log: GERONIMO-5329 Additional updates to fix selenium related failures Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java?rev=950659&r1=950658&r2=950659&view=diff ============================================================================== --- geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java (original) +++ geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java Wed Jun 2 16:52:12 2010 @@ -30,11 +30,11 @@ public class TestConsoleSecurity extends selenium.open("/console"); waitForPageLoad(); assertFalse(selenium.isTextPresent("Deploy New")); - 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(); - assertTrue(selenium.isTextPresent("Deploy New")); + assertEquals("Geronimo Console", selenium.getTitle()); selenium.click("//a[contains(@href, '/console/logout.jsp')]"); waitForPageLoad(); assertEquals("Geronimo Console Login", selenium.getTitle()); @@ -74,10 +74,12 @@ public class TestConsoleSecurity extends selenium.open("/console"); waitForPageLoad(); if (username != null) { - selenium.type("j_username", username); + //selenium.type("j_username", username); + selenium.type("//input[@name='j_username']", username); } if (password != null) { - selenium.type("j_password", password); + //selenium.type("j_password", password); + selenium.type("//input[@name='j_password']", password); } selenium.click("submit"); waitForPageLoad(); Modified: geronimo/server/branches/2.2/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.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java?rev=950659&r1=950658&r2=950659&view=diff ============================================================================== --- geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java (original) +++ geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java Wed Jun 2 16:52:12 2010 @@ -32,6 +32,7 @@ public class TestSecurity extends Seleni selenium.type("j_password", "bone"); selenium.click("submit"); waitForPageLoad(); + selenium.open("/demo/protect/hello.html"); assertEquals("hello world.", selenium.getText("xpath=/html")); selenium.deleteAllVisibleCookies(); }