Author: olamy
Date: Mon Jun 20 17:51:46 2011
New Revision: 1137718
URL: http://svn.apache.org/viewvc?rev=1137718&view=rev
Log:
start working on use id in selenium test rather than text which make tests
locale dependant
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/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/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
Mon Jun 20 17:51:46 2011
@@ -54,11 +54,13 @@ public class ArchivaAdminTest
@Optional( "localhost" ) String
seleniumHost, @Optional( "4444" ) int seleniumPort )
throws Exception
{
- super.open( baseUrl + "/index.action?" + forceLocaleParam , browser,
seleniumHost, seleniumPort, Integer.toString( maxWaitTimeInMs ) );
+ super.open( baseUrl , browser, seleniumHost, seleniumPort,
Integer.toString( maxWaitTimeInMs ) );
- getSelenium().open( baseUrl + "?" + forceLocaleParam );
+ getSelenium().open( baseUrl );
String title = getSelenium().getTitle();
- if ( title.endsWith( "Create Admin User" ) )
+ //assertElementPresent( "adminCreateForm" );
+ if (isElementPresent( "adminCreateForm" ))
+ //if ( title.endsWith( "Create Admin User" ) )
{
assertCreateAdmin();
String fullname = getProperty( "ADMIN_FULLNAME" );
@@ -67,8 +69,9 @@ public class ArchivaAdminTest
String password = getProperty( "ADMIN_PASSWORD" );
submitAdminData( fullname, mail, password );
assertUserLoggedIn( username );
- submit();
- clickLinkWithText( "Logout" );
+ //submit();
+ //clickLinkWithText( "Logout" );
+ clickLinkWithLocator( "logoutLink" );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
Mon Jun 20 17:51:46 2011
@@ -103,7 +103,7 @@ public class ArtifactManagementTest
addArtifact( groupId, artifactId, getVersion(), packaging,
getArtifactFilePath(), getRepositoryId() );
assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" +
getVersion()
+ "' was successfully deployed to repository 'internal'" );
- getSelenium().open( baseUrl + "/browse/" + groupId + "/" + artifactId
+ "/" + getVersion() + "?" + forceLocaleParam );
+ getSelenium().open( baseUrl + "/browse/" + groupId + "/" + artifactId
+ "/" + getVersion() );
waitPage();
assertTextPresent( "<type>library</type>" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
Mon Jun 20 17:51:46 2011
@@ -28,7 +28,7 @@ public class AuditLogsReportTest
{
private void goToAuditLogReports()
{
- getSelenium().open(
"/archiva/report/queryAuditLogReport.action?"+forceLocaleParam );
+ getSelenium().open( "/archiva/report/queryAuditLogReport.action" );
}
private void assertAuditLogsReportPage()
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/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/src/test/testng/org/apache/archiva/web/test/LoginTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
Mon Jun 20 17:51:46 2011
@@ -36,7 +36,7 @@ import org.testng.annotations.Test;
* @version $Id$
*/
-@Test( groups = { "login" } )
+@Test( groups = { "login" }, dependsOnGroups = {"about"})
public class LoginTest
extends AbstractArchivaTest
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
Mon Jun 20 17:51:46 2011
@@ -30,7 +30,7 @@ public class MergingRepositoriesTest
public void testAddStagingRepository()
{
goToRepositoriesPage();
- getSelenium().open( "/archiva/admin/addRepository.action?" +
forceLocaleParam );
+ getSelenium().open( "/archiva/admin/addRepository.action" );
addStagingRepository( "merging-repo", "merging-repo",
getRepositoryDir() + "merging-repo/", "",
"Maven 2.x Repository", "0 0 * * * ?", "", "" );
assertTextPresent( "merging-repo" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
Mon Jun 20 17:51:46 2011
@@ -75,18 +75,19 @@ public abstract class AbstractArchivaTes
public void assertCreateAdmin()
{
- assertPage( "Apache Archiva \\ Create Admin User" );
- assertTextPresent( "Username" );
+ assertElementPresent( "adminCreateForm" );
+ //assertPage( "Apache Archiva \\ Create Admin User" );
+ //assertTextPresent( "Username" );
assertFieldValue( "admin", "user.username" );
- assertTextPresent( "Full Name*" );
+ //assertTextPresent( "Full Name*" );
assertElementPresent( "user.fullName" );
- assertTextPresent( "Email Address*" );
+ //assertTextPresent( "Email Address*" );
assertElementPresent( "user.email" );
- assertTextPresent( "Password*" );
+ //assertTextPresent( "Password*" );
assertElementPresent( "user.password" );
- assertTextPresent( "Confirm Password*" );
+ //assertTextPresent( "Confirm Password*" );
assertElementPresent( "user.confirmPassword" );
- assertButtonWithValuePresent( "Create Admin" );
+ //assertButtonWithValuePresent( "Create Admin" );
}
public void submitAdminData( String fullname, String email, String
password )
@@ -101,8 +102,9 @@ public abstract class AbstractArchivaTes
// Go to Login Page
public void goToLoginPage()
{
- getSelenium().open( baseUrl + "?" + forceLocaleParam );
- clickLinkWithText( "Login" );
+ getSelenium().open( baseUrl );
+ //clickLinkWithText( "Login" );
+ clickLinkWithLocator( "loginLink" );
assertLoginPage();
}
@@ -315,11 +317,14 @@ public abstract class AbstractArchivaTes
protected void assertUserLoggedIn( String username )
{
- assertTextPresent( "Current User:" );
+ //assertTextPresent( "Current User:" );
assertTextPresent( username );
- assertLinkPresent( "Edit Details" );
- assertLinkPresent( "Logout" );
- assertTextNotPresent( "Login" );
+ //assertLinkPresent( "Edit Details" );
+ assertElementPresent( "editUserLink" );
+ assertElementPresent( "logoutLink" );
+ //assertLinkPresent( "Logout" );
+ //assertTextNotPresent( "Login" );
+ assertElementNotPresent( "loginLink" );
}
// User Roles
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
Mon Jun 20 17:51:46 2011
@@ -26,7 +26,7 @@ public abstract class AbstractBrowseTest
// Browse
public void goToBrowsePage()
{
- getSelenium().open( "/archiva/browse" + "?" + forceLocaleParam );
+ getSelenium().open( "/archiva/browse" );
assertBrowsePage();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java?rev=1137718&r1=1137717&r2=1137718&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Mon Jun 20 17:51:46 2011
@@ -44,8 +44,6 @@ public abstract class AbstractSeleniumTe
public static String baseUrl;
- public static String forceLocaleParam = "request_locale=en_US";
-
public static String maxWaitTimeInMs;
private static ThreadLocal<Selenium> selenium = new
ThreadLocal<Selenium>();
@@ -75,7 +73,7 @@ public abstract class AbstractSeleniumTe
if ( getSelenium() == null )
{
DefaultSelenium s =
- new DefaultSelenium( seleniumHost, seleniumPort, browser,
baseUrl + "?" + forceLocaleParam );
+ new DefaultSelenium( seleniumHost, seleniumPort, browser,
baseUrl );
s.start();
s.setTimeout( maxWaitTimeInMs );
selenium.set( s );
