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 2012/02/29 23:06:12 UTC
svn commit: r1295309 - in /archiva/trunk/archiva-modules/archiva-web: ./
archiva-webapp-test-js/
archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/
archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/
Author: olamy
Date: Wed Feb 29 22:06:12 2012
New Revision: 1295309
URL: http://svn.apache.org/viewvc?rev=1295309&view=rev
Log:
start to cleanup it test 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
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/RolesManagementTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/UserManagementTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
archiva/trunk/archiva-modules/archiva-web/pom.xml
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=1295309&r1=1295308&r2=1295309&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 Wed Feb 29 22:06:12 2012
@@ -233,6 +233,8 @@
<browser>${selenium.browser}</browser>
<baseUrl>${baseUrl}</baseUrl>
<maxWaitTimeInMs>${maxWaitTimeInMs}</maxWaitTimeInMs>
+ <seleniumHost>${seleniumHost}</seleniumHost>
+ <seleniumPort>${seleniumPort}</seleniumPort>
</systemPropertyVariables>
</configuration>
</execution>
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=1295309&r1=1295308&r2=1295309&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 Wed Feb 29 22:06:12 2012
@@ -20,71 +20,12 @@ package org.apache.archiva.web.test;
*/
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;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
public class ArchivaAdminTest
extends AbstractArchivaTest
{
- @Override
- @AfterTest
- public void close()
- throws Exception
- {
- super.close();
- }
-
- @Override
- @BeforeSuite
- public void open()
- throws Exception
- {
- super.open();
- }
-
- @BeforeTest
- @Parameters( { "baseUrl", "browser", "maxWaitTimeInMs", "seleniumHost", "seleniumPort" } )
- public void initializeArchiva( String baseUrl, String browser, int maxWaitTimeInMs,
- @Optional( "localhost" ) String seleniumHost, @Optional( "4444" ) int seleniumPort )
- throws Exception
- {
-
- super.open( baseUrl, browser, seleniumHost, seleniumPort, Integer.toString( maxWaitTimeInMs ) );
-
- getSelenium().open( baseUrl );
-
- waitPage();
-
- // if not admin user created create one
- if ( isElementVisible( "create-admin-link" ) )
- {
- Assert.assertFalse( getSelenium().isVisible( "login-link-a" ) );
- Assert.assertFalse( getSelenium().isVisible( "register-link-a" ) );
- clickLinkWithLocator( "create-admin-link-a", false );
- assertCreateAdmin();
- String fullname = getProperty( "ADMIN_FULLNAME" );
- String username = getProperty( "ADMIN_USERNAME" );
- String mail = getProperty( "ADMIN_EMAIL" );
- String password = getProperty( "ADMIN_PASSWORD" );
- submitAdminData( fullname, mail, password );
- assertUserLoggedIn( username );
- clickLinkWithLocator( "logout-link-a" );
- }
- else
- {
- Assert.assertTrue( getSelenium().isVisible( "login-link-a" ) );
- Assert.assertTrue( getSelenium().isVisible( "register-link-a" ) );
- login( getAdminUsername(), getAdminPassword() );
- }
-
- }
-
@Test( groups = { "about" }, alwaysRun = true )
public void testHome()
{
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=1295309&r1=1295308&r2=1295309&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 Wed Feb 29 22:06:12 2012
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
public class LoginTest
extends AbstractArchivaTest
{
- @Test( alwaysRun = true )
+ @Test
public void testWithBadUsername()
{
goToLoginPage();
@@ -45,7 +45,7 @@ public class LoginTest
}
- @Test( dependsOnMethods = { "testWithBadUsername" }, alwaysRun = true )
+ @Test
public void testWithBadPassword()
{
goToLoginPage();
@@ -55,27 +55,25 @@ public class LoginTest
assertTextPresent( "You have entered an incorrect username and/or password" );
}
- @Test( dependsOnMethods = { "testWithBadPassword" }, alwaysRun = true )
+ @Test
public void testWithEmptyUsername()
{
goToLoginPage();
setFieldValue( "user-login-form-password", "password" );
clickLinkWithLocator( "modal-login-ok", true );
- //assertTextPresent( "User Name is required" );
assertTextPresent( "This field is required." );
}
- @Test( dependsOnMethods = { "testWithEmptyUsername" }, alwaysRun = true )
+ @Test( alwaysRun = true )
public void testWithEmptyPassword()
{
goToLoginPage();
setFieldValue( "user-login-form-username", getProperty( "ADMIN_USERNAME" ) );
clickLinkWithLocator( "modal-login-ok", true );
- //assertTextPresent( "You have entered an incorrect username and/or password" );
assertTextPresent( "This field is required." );
}
- @Test( groups = { "loginSuccess" }, dependsOnMethods = { "testWithEmptyPassword" }, alwaysRun = true )
+ @Test
public void testWithCorrectUsernamePassword()
{
goToLoginPage();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/RolesManagementTest.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/RolesManagementTest.java?rev=1295309&r1=1295308&r2=1295309&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/RolesManagementTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/RolesManagementTest.java Wed Feb 29 22:06:12 2012
@@ -26,13 +26,15 @@ import org.testng.annotations.Test;
/**
* @author Olivier Lamy
*/
-@Test( groups = { "usermanagement" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
+@Test( groups = { "usermanagement" }, dependsOnGroups = "about" )
public class RolesManagementTest
extends AbstractArchivaTest
{
+ @Test
public void testReadRolesAndUpdateDescription()
throws Exception
{
+ login( getAdminUsername(), getAdminPassword() );
clickLinkWithLocator( "menu-roles-list-a", true );
assertTextPresent( "Archiva System Administrator " );
Assert.assertTrue( StringUtils.isEmpty( getText( "role-description-Guest" ) ) );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/UserManagementTest.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/UserManagementTest.java?rev=1295309&r1=1295308&r2=1295309&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/UserManagementTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/UserManagementTest.java Wed Feb 29 22:06:12 2012
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
/**
* @author Olivier Lamy
*/
-@Test( groups = { "usermanagement" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
+@Test( groups = { "usermanagement" }, dependsOnGroups = { "about" } )
public class UserManagementTest
extends AbstractArchivaTest
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/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-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=1295309&r1=1295308&r2=1295309&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java Wed Feb 29 22:06:12 2012
@@ -1,6 +1,11 @@
package org.apache.archiva.web.test.parent;
import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
import java.io.File;
import java.io.IOException;
@@ -31,6 +36,67 @@ public abstract class AbstractArchivaTes
protected String fullname;
+ @Override
+ @AfterTest
+ public void close()
+ throws Exception
+ {
+ super.close();
+ }
+
+ @Override
+ @BeforeSuite
+ public void open()
+ throws Exception
+ {
+ super.open();
+ }
+
+ public void assertAdminCreated()
+ throws Exception
+ {
+ initializeArchiva( System.getProperty( "baseUrl" ), System.getProperty( "browser" ),
+ Integer.getInteger( "maxWaitTimeInMs" ), System.getProperty( "seleniumHost" ),
+ Integer.getInteger( "seleniumPort" ) );
+ }
+
+ @BeforeTest
+ @Parameters( { "baseUrl", "browser", "maxWaitTimeInMs", "seleniumHost", "seleniumPort" } )
+ public void initializeArchiva( String baseUrl, String browser, int maxWaitTimeInMs,
+ @Optional( "localhost" ) String seleniumHost, @Optional( "4444" ) int seleniumPort )
+ throws Exception
+ {
+
+ super.open( baseUrl, browser, seleniumHost, seleniumPort, Integer.toString( maxWaitTimeInMs ) );
+
+ getSelenium().open( baseUrl );
+
+ waitPage();
+
+ // if not admin user created create one
+ if ( isElementVisible( "create-admin-link" ) )
+ {
+ Assert.assertFalse( getSelenium().isVisible( "login-link-a" ) );
+ Assert.assertFalse( getSelenium().isVisible( "register-link-a" ) );
+ clickLinkWithLocator( "create-admin-link-a", false );
+ assertCreateAdmin();
+ String fullname = getProperty( "ADMIN_FULLNAME" );
+ String username = getAdminUsername();
+ String mail = getProperty( "ADMIN_EMAIL" );
+ String password = getProperty( "ADMIN_PASSWORD" );
+ submitAdminData( fullname, mail, password );
+ assertUserLoggedIn( username );
+ clickLinkWithLocator( "logout-link-a" );
+ }
+ else
+ {
+ Assert.assertTrue( getSelenium().isVisible( "login-link-a" ) );
+ Assert.assertTrue( getSelenium().isVisible( "register-link-a" ) );
+ login( getAdminUsername(), getAdminPassword() );
+ }
+
+ }
+
protected static String getErrorMessageText()
{
return getSelenium().getText( "//ul[@class='errorMessage']/li/span" );
@@ -487,7 +553,7 @@ public abstract class AbstractArchivaTes
public void goToHomePage()
{
- getSelenium().open( "" );
+ getSelenium().open( baseUrl );
}
// Upload Artifact
@@ -729,4 +795,9 @@ public abstract class AbstractArchivaTes
assertLinkNotVisible( "Logout" );
assertLinkVisible( "Login" );
}
+
+ protected String getAdminUserName()
+ {
+ return getProperty( "ADMIN_FULLNAME" );
+ }
}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=1295309&r1=1295308&r2=1295309&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Wed Feb 29 22:06:12 2012
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.2.1</version>
+ <version>6.4</version>
<scope>test</scope>
</dependency>
<dependency>