Author: wsmoak
Date: Tue May 12 00:35:39 2009
New Revision: 773741
URL: http://svn.apache.org/viewvc?rev=773741&view=rev
Log:
[MRM-1164] Improve the Selenium tests
Submitted by: Marecor Baclay
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
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/BrowseTest.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/ReportsTest.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/AbstractArtifactReportsTest.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/AbstractSearchTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties?rev=773741&r1=773740&r2=773741&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
Tue May 12 00:35:39 2009
@@ -15,12 +15,19 @@
# Search
SEARCH_BAD_ARTIFACT=asdf
# Existing Artifact
-ARTIFACT_GROUPID=test
-ARTIFACT_ARTIFACTID=test
+ARTIFACT_GROUPID=org.apache.maven.archiva.web.test
+ARTIFACT_ARTIFACTID=artifact-a
ARTIFACT_VERSION=1.0
ARTIFACT_PACKAGING=jar
# Reports
REPOSITORY_NAME=internal
START_DATE=04/01/2009
-END_DATE=04/30/2009
\ No newline at end of file
+END_DATE=04/30/2009
+
+# User Management
+GUEST_USERNAME=guest_user
+GUEST_FULLNAME=Guest User
[email protected]
+GUEST_PASSWORD=guest12
+GUEST_PASSWORD1=guest123
\ No newline at end of file
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=773741&r1=773740&r2=773741&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
Tue May 12 00:35:39 2009
@@ -20,7 +20,6 @@
*/
import org.apache.archiva.web.test.parent.AbstractArchivaTest;
-import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.BeforeTest;
@@ -30,16 +29,14 @@
public class ArchivaAdminTest
extends AbstractArchivaTest
{
- @BeforeSuite
+ @BeforeSuite
public void initializeContinuum()
throws Exception
{
super.open();
- System.out.println( "open" );
getSelenium().open( baseUrl );
- System.out.println( "URL" );
String title = getSelenium().getTitle();
- if ( title.equals( "Create Admin User" ) )
+ if ( title.equals( "Apache Archiva \\ Create Admin User" ) )
{
assertCreateAdmin();
String fullname = p.getProperty( "ADMIN_FULLNAME" );
@@ -47,8 +44,6 @@
String mail = p.getProperty( "ADMIN_EMAIL" );
String password = p.getProperty( "ADMIN_PASSWORD" );
submitAdminData( fullname, mail, password );
- assertLoginPage();
- submitUserData( username, password, false, true );
assertAuthenticatedPage( username );
submit();
clickLinkWithText( "Logout" );
@@ -62,11 +57,13 @@
{
super.open();
}
+
+
public void displayLandingPage()
{
- getSelenium().open( baseUrl + "index.action" );
+ getSelenium().open( baseUrl );
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
- Assert.assertEquals( "Apache Archiva \\ Quick Search",
getSelenium().getTitle() );
+ assertPage( "Apache Archiva \\ Quick Search" );
}
@Override
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java?rev=773741&r1=773740&r2=773741&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
Tue May 12 00:35:39 2009
@@ -42,4 +42,4 @@
assertTextPresent( "Artifacts" );
}
-}
+}
\ No newline at end of file
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=773741&r1=773740&r2=773741&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
Tue May 12 00:35:39 2009
@@ -107,4 +107,4 @@
{
super.close();
}
-}
+}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java?rev=773741&r1=773740&r2=773741&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java
Tue May 12 00:35:39 2009
@@ -100,4 +100,4 @@
//TODO As of the creation of the tests, GroupId is not a
required field in showing the reports of repository health. GroupId should be
required I think.
}
-}
+}
\ No newline at end of file
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=773741&r1=773740&r2=773741&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
Tue May 12 00:35:39 2009
@@ -25,7 +25,7 @@
public void assertCreateAdmin()
{
- assertPage( "Create Admin User" );
+ assertPage( "Apache Archiva \\ Create Admin User" );
assertTextPresent( "Username" );
assertFieldValue( "admin", "user.username" );
assertTextPresent( "Full Name*" );
@@ -42,7 +42,7 @@
public void submitAdminData( String fullname, String email, String
password )
{
setFieldValue( "user.fullName", fullname );
- setFieldValue( "user.emaim", email );
+ setFieldValue( "user.email", email );
setFieldValue( "user.password", password );
setFieldValue( "user.confirmPassword", password );
submit();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.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/AbstractArtifactReportsTest.java?rev=773741&r1=773740&r2=773741&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
Tue May 12 00:35:39 2009
@@ -77,4 +77,4 @@
clickButtonWithValue( "View Statistics" );
}
-}
+}
\ No newline at end of file
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=773741&r1=773740&r2=773741&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
Tue May 12 00:35:39 2009
@@ -37,4 +37,4 @@
assertTextPresent( "Groups" );
}
-}
+}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.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/AbstractSearchTest.java?rev=773741&r1=773740&r2=773741&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java
Tue May 12 00:35:39 2009
@@ -54,4 +54,4 @@
getSelenium().type( "dom=document.forms[1].elements[0]", artifactId );
clickButtonWithValue( "Search" );
}
-}
+}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml?rev=773741&r1=773740&r2=773741&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/testng-pom.xml
Tue May 12 00:35:39 2009
@@ -74,8 +74,14 @@
<dependency>
<groupId>org.openqa.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
- <version>0.8.1</version>
+ <version>1.0-SNAPSHOT</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Dependency for MavenConnectionTest -->
@@ -143,7 +149,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.0-rc-1</version>
<executions>
<execution>
<id>start-selenium</id>
@@ -273,7 +279,7 @@
<fileset dir="src/test/${container.name}" />
</copy>
<copy
-
todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.26/apache-tomcat-5.5.26/common/lib">
+
todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.27/apache-tomcat-5.5.27/common/lib">
<fileset
dir="${project.build.directory}/providedDependencies">
<include name="**/*.jar" />
</fileset>
@@ -366,7 +372,7 @@
</activation>
<properties>
<container.name>tomcat5x</container.name>
-
<container.url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.26/bin/apache-tomcat-5.5.26.zip</container.url>
+
<container.url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.27/bin/apache-tomcat-5.5.27.zip</container.url>
</properties>
</profile>
<profile>
