You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/29 14:53:01 UTC
svn commit: r1225529 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js: pom.xml
src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
src/test/testng/org/apache/archiva/web/test/LoginTest.java
Author: olamy
Date: Thu Dec 29 13:53:01 2011
New Revision: 1225529
URL: http://svn.apache.org/viewvc?rev=1225529&view=rev
Log:
fix selenium tests for webapp-js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/LoginTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml?rev=1225529&r1=1225528&r2=1225529&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml Thu Dec 29 13:53:01 2011
@@ -422,7 +422,7 @@
</property>
</activation>
<properties>
- <baseUrl>http://localhost:${container.test.port}/archiva/index.html</baseUrl>
+ <baseUrl>http://localhost:${container.test.port}/archiva/index.html?request_lang=en</baseUrl>
</properties>
</profile>
<profile>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java?rev=1225529&r1=1225528&r2=1225529&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java Thu Dec 29 13:53:01 2011
@@ -58,7 +58,7 @@ public class ArchivaAdminTest
getSelenium().open( baseUrl );
- getSelenium().refresh();
+ waitPage();
// if not admin user created create one
if ( isElementVisible( "create-admin-link" ) )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/LoginTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/LoginTest.java?rev=1225529&r1=1225528&r2=1225529&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/LoginTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/LoginTest.java Thu Dec 29 13:53:01 2011
@@ -29,80 +29,67 @@ import org.testng.annotations.Test;
* http://code.google.com/p/testng/source/browse/trunk/CHANGES.txt
* Waiting 5.9 release. It's comming soon.
*/
+
/**
* Based on LoginTest of Emmanuel Venisse test.
- *
+ *
* @author José Morales MartÃnez
* @version $Id$
*/
-@Test( groups = { "login" }, dependsOnGroups = {"about"})
+@Test( groups = { "login" }, dependsOnGroups = { "about" } )
public class LoginTest
extends AbstractArchivaTest
{
- @Test(alwaysRun = true)
+ @Test( alwaysRun = true )
public void testWithBadUsername()
{
goToLoginPage();
setFieldValue( "user-login-form-username", "badUsername" );
+ clickLinkWithLocator( "modal-login-ok", true );
+ assertTextPresent( "This field is required." );
- waitPage();
- assertElementPresent( "//ul[@class=\'errorMessage\']" );
- //assertTextPresent( "You have entered an incorrect username and/or password" );
}
@Test( dependsOnMethods = { "testWithBadUsername" }, alwaysRun = true )
public void testWithBadPassword()
{
goToLoginPage();
- setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
- setFieldValue( "loginForm_password", "badPassword" );
- getSelenium().click( "loginSubmit" );
- //getSelenium().waitForPageToLoad( maxWaitTimeInMs );
- waitPage();
- //assertTextPresent( "You have entered an incorrect username and/or password" );
- //<ul class="errorMessage"><li><span>
- assertElementPresent( "//ul[@class=\'errorMessage\']" );
+ setFieldValue( "user-login-form-username", getProperty( "ADMIN_USERNAME" ) );
+ setFieldValue( "user-login-form-password", "badPassword" );
+ clickLinkWithLocator( "modal-login-ok", true );
+ assertTextPresent( "You have entered an incorrect username and/or password" );
}
@Test( dependsOnMethods = { "testWithBadPassword" }, alwaysRun = true )
public void testWithEmptyUsername()
{
goToLoginPage();
- setFieldValue( "loginForm_password", "password" );
- getSelenium().click( "loginSubmit" );
- //getSelenium().waitForPageToLoad( maxWaitTimeInMs );
- waitPage();
+ setFieldValue( "user-login-form-password", "password" );
+ clickLinkWithLocator( "modal-login-ok", true );
//assertTextPresent( "User Name is required" );
- assertElementPresent( "//tr[@errorFor=\'loginForm_username\']");
+ assertTextPresent( "This field is required." );
}
@Test( dependsOnMethods = { "testWithEmptyUsername" }, alwaysRun = true )
public void testWithEmptyPassword()
{
goToLoginPage();
- setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
- getSelenium().click( "loginSubmit" );
- //getSelenium().waitForPageToLoad( maxWaitTimeInMs );
- waitPage();
+ setFieldValue( "user-login-form-username", getProperty( "ADMIN_USERNAME" ) );
+ clickLinkWithLocator( "modal-login-ok", true );
//assertTextPresent( "You have entered an incorrect username and/or password" );
- assertElementPresent( "//ul[@class=\'errorMessage\']" );
+ assertTextPresent( "This field is required." );
}
@Test( groups = { "loginSuccess" }, dependsOnMethods = { "testWithEmptyPassword" }, alwaysRun = true )
public void testWithCorrectUsernamePassword()
{
goToLoginPage();
- setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) );
- setFieldValue( "loginForm_password", getProperty( "ADMIN_PASSWORD" ) );
- getSelenium().click( "loginSubmit" );
- //getSelenium().waitForPageToLoad( maxWaitTimeInMs );
- waitPage();
- //assertTextPresent( "Logout" );
- assertElementPresent( "logoutLink" );
- //assertTextPresent( "Edit Details" );
- assertElementPresent( "editUserLink" );
- assertTextPresent( getProperty( "ADMIN_USERNAME" ) );
+ setFieldValue( "user-login-form-username", getProperty( "ADMIN_USERNAME" ) );
+ setFieldValue( "user-login-form-password", getProperty( "ADMIN_PASSWORD" ) );
+ clickLinkWithLocator( "modal-login-ok", true );
+
+ assertUserLoggedIn( getProperty( "ADMIN_USERNAME" ) );
}
@BeforeTest