[MRM-1164] Fix the Selenium tests

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798777 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 230 insertions, 189 deletions

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 63abdac4c..04a587dd3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
index 29b20155f..0f2fc735d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
@@ -20,6 +20,9 @@ under the License.
 -->
 
 <suite name="ArchivaTest" verbose="1">
+	<listeners>
+	        <listener class-name="org.apache.archiva.web.test.listener.CaptureScreenShotsListener"/>
+	</listeners>
 	<test name="BasicTest" enabled="true">
 		<groups>
 			<run>
@@ -34,17 +37,18 @@ under the License.
 		<groups>
 			<run>
 				<include name= "login" />
-				<include name= "userroles" />
+				<include name= "userroles" />	
 				<include name= "artifactmanagement" />
 				<include name= "search" />
 				<include name= "browse" />
 				<include name= "reports" />
 				<include name= "virtualrepository" />
-				<include name= "proxyconnectors" />
+				<include name= "networkproxies" />
+				<include name= "repository" />
 			</run>
 		</groups>
 		<packages>
 			<package name="org.apache.archiva.web.test" />
 		</packages>
 	</test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
index 0c357a4f3..0b43252a8 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
@@ -56,7 +56,7 @@ public class ArchivaAdminTest
     public static final String NEW_LOCAL_REPO_VALUE = "/target/local-repo";
 	
     @BeforeSuite
-    public void initializeContinuum()
+    public void initializeArchiva()
         throws Exception
     {
         super.open();
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
index b1781584b..d85dba173 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
@@ -1,5 +1,24 @@
 package org.apache.archiva.web.test;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import org.apache.archiva.web.test.parent.AbstractArtifactManagementTest;
 import org.testng.annotations.Test;
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java
index e0225de0e..c7ca47350 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java
@@ -1,5 +1,24 @@
 package org.apache.archiva.web.test;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import org.apache.archiva.web.test.parent.AbstractArchivaTest;
 import org.testng.annotations.Test;
 
@@ -7,7 +26,7 @@ import org.testng.annotations.Test;
 public class UserRolesTest 
 	extends AbstractArchivaTest
 {
-	
+
 	public void testBasicAddDeleteUser()
 	{
 		username = p.getProperty( "GUEST_USERNAME" );
@@ -16,6 +35,7 @@ public class UserRolesTest
 		createUser( username, fullname, getUserEmail(), getUserRolePassword(), true);
 		deleteUser( username, fullname, getUserEmail() );
 		clickLinkWithText( "Logout" );
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
 	@Test (dependsOnMethods = { "testBasicAddDeleteUser" } )
@@ -42,6 +62,7 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
 	@Test (dependsOnMethods = { "testUserWithGuestRole" } )
@@ -68,6 +89,7 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
 	@Test (dependsOnMethods = { "testUserWithRegisteredUserRole" } )
@@ -94,6 +116,7 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
 	@Test (dependsOnMethods = { "testUserWithSysAdminUserRole" } )
@@ -120,6 +143,7 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
 	@Test (dependsOnMethods = { "testUserWithUserAdminUserRole" } )
@@ -146,9 +170,10 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 
-	@Test (dependsOnMethods = { "testUserWithUserAdminUserRole" } )
+	@Test (dependsOnMethods = { "testUserWithGlobalRepoManagerRole" } )
 	public void testUserWithGlobalRepoObserverRole()
 	{
 		username = p.getProperty("GLOBALREPOOBSERVER_USERNAME");
@@ -172,9 +197,10 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
-	@Test (dependsOnMethods = { "testUserWithGlobalRepoManagerRole" } )
+	@Test (dependsOnMethods = { "testUserWithGlobalRepoObserverRole" } )
 	public void testUserWithRepoManagerInternalRole()
 	{
 		username = p.getProperty("REPOMANAGER_INTERNAL_USERNAME");
@@ -198,9 +224,10 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
-	@Test (dependsOnMethods = { "testUserWithGlobalRepoManagerRole" } )
+	/*@Test (dependsOnMethods = { "testUserWithRepoManagerInternalRole" } )
 	public void testUserWithRepoManagerSnapshotsRole()
 	{
 		username = p.getProperty("REPOMANAGER_SNAPSHOTS_USERNAME");
@@ -224,9 +251,10 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
-	}
+		login( getAdminUsername() , getAdminPassword() );
+	}*/
 	
-	@Test (dependsOnMethods = { "testUserWithGlobalRepoObserverRole" } )
+	@Test (dependsOnMethods = { "testUserWithRepoManagerInternalRole" } )
 	public void testUserWithRepoObserverInternalRole()
 	{
 		username = p.getProperty( "REPOOBSERVER_INTERNAL_USERNAME" );
@@ -250,9 +278,10 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
+		login( getAdminUsername() , getAdminPassword() );
 	}
 	
-	@Test (dependsOnMethods = { "testUserWithGlobalRepoObserverRole" } )
+	/*@Test (dependsOnMethods = { "testUserWithRepoObserverInternalRole" } )
 	public void testUserWithRepoObserverSnapshotsRole()
 	{
 		username = p.getProperty( "REPOOBSERVER_SNAPSHOTS_USERNAME" );
@@ -276,5 +305,6 @@ public class UserRolesTest
 		login(username, getUserRoleNewPassword());
 		assertLeftNavMenuWithRole( fullname );
 		clickLinkWithText("Logout");
-	}
+		login( getAdminUsername() , getAdminPassword() );
+	}*/
 }
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
index cecd7e44c..ddd42ec6e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
@@ -1,5 +1,24 @@
 package org.apache.archiva.web.test;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import org.apache.archiva.web.test.parent.AbstractRepositoryTest;
 import org.testng.annotations.Test;
 
@@ -7,14 +26,14 @@ import org.testng.annotations.Test;
 public class VirtualRepositoryTest 
 	extends AbstractRepositoryTest
 {
-	public void testAddRepositoryNullValue()
+	public void testAddRepositoryGroupNullValue()
 	{
 		addRepositoryGroup( " " );
 		assertTextPresent( "Identifier field is required." );
 	}
 	
 	@Test(dependsOnMethods = { "testWithCorrectUsernamePassword" } )
-	public void testAddRepositoryValidValue()
+	public void testAddRepositoryGroupValidValue()
 	{
 		addRepositoryGroup( "testing" );
 		//assertAddedRepositoryLink( "testing" );
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java
new file mode 100644
index 000000000..4e6ed3182
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java
@@ -0,0 +1,101 @@
+package org.apache.archiva.web.test.listener;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.regex.Pattern;
+
+import org.apache.archiva.web.test.parent.AbstractSeleniumTest;
+import org.testng.ITestResult;
+import org.testng.TestListenerAdapter;
+
+public class CaptureScreenShotsListener
+    extends TestListenerAdapter
+{
+    @Override
+    public void onTestFailure( ITestResult tr )
+    {
+        captureError( tr );
+        System.out.println( "Test " + tr.getName() + " -> Failed" );
+        super.onTestFailure( tr );
+    }
+
+    @Override
+    public void onTestSuccess( ITestResult tr )
+    {
+        System.out.println( "Test " + tr.getName() + " -> Success" );
+        super.onTestFailure( tr );
+    }
+
+    private void captureError( ITestResult tr )
+    {
+        try
+        {
+            captureScreenshot( tr );
+        }
+        catch ( RuntimeException e )
+        {
+            System.out.println( "Error when take screenshot for test " + tr.getName() );
+            e.printStackTrace();
+        }
+    }
+
+    // captureAssertionError() creates a 'target/screenshots' directory and saves '.png' page screenshot of the
+    // encountered error
+    private void captureScreenshot( ITestResult tr )
+    {
+        File f = new File( "" );
+        String filePath = f.getAbsolutePath();
+        Date d = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat( "yyyy.MM.dd-HH_mm_ss" );
+        String time = sdf.format( d );
+        String fs = File.separator;
+        File targetPath = new File( filePath + fs + "target" + fs + "screenshots" );
+        targetPath.mkdir();
+        String cName = tr.getTestClass().getName();
+        StackTraceElement stackTrace[] = tr.getThrowable().getStackTrace();
+        int index = getStackTraceIndexOfCallingClass( cName, stackTrace );
+        String methodName = stackTrace[index].getMethodName();
+        int lNumber = stackTrace[index].getLineNumber();
+        String lineNumber = Integer.toString( lNumber );
+        String className = cName.substring( cName.lastIndexOf( '.' ) + 1 );
+        String fileName =
+            targetPath.toString() + fs + methodName + "(" + className + ".java_" + lineNumber + ")-" + time + ".png";
+        AbstractSeleniumTest.getSelenium().windowMaximize();
+        AbstractSeleniumTest.getSelenium().captureEntirePageScreenshot( fileName, "" );
+    }
+
+    private int getStackTraceIndexOfCallingClass( String nameOfClass, StackTraceElement stackTrace[] )
+    {
+        boolean match = false;
+        int i = 0;
+        do
+        {
+            String className = stackTrace[i].getClassName();
+            match = Pattern.matches( nameOfClass, className );
+            i++;
+        }
+        while ( match == false );
+        i--;
+        return i;
+    }
+}
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
index c36512a56..6ea78711f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
@@ -202,7 +202,7 @@ public abstract class AbstractArchivaTest
 		assertTextPresent( "[Admin] User Roles" );
 		assertTextPresent( "Username" );
 		assertTextPresent( "Full Name" );
-		String userRoles = "Guest,Registered User,System Administrator,User Administrator,Global Repository Observer,Global Repository Manager,Repository Observer,Repository Manager,internal,snapshots";
+		String userRoles = "Guest,Registered User,System Administrator,User Administrator,Global Repository Observer,Global Repository Manager,Repository Observer,Repository Manager,internal";
 		String[] arrayRole = userRoles.split( "," );
 		for ( String userroles : arrayRole )
 			assertTextPresent( userroles );
@@ -224,7 +224,7 @@ public abstract class AbstractArchivaTest
 	
 	private void createUser( String userName, String fullName, String emailAd, String password, String confirmPassword, boolean valid ) 
 	{
-		login( getAdminUsername() , getAdminPassword() );
+		//login( getAdminUsername() , getAdminPassword() );
 		clickLinkWithText( "User Management" );
 		clickButtonWithValue( "Create New User" );
 		assertCreateUserPage();
@@ -463,4 +463,4 @@ public abstract class AbstractArchivaTest
 			assertElementPresent( uploadelements );
 		assertButtonWithValuePresent( "Submit" );
 	} */
-}
\ No newline at end of file
+}
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
index 7bd94dc17..029dc7b22 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
@@ -1,5 +1,7 @@
 package org.apache.archiva.web.test.parent;
 
+import java.io.File;
+
 public abstract class AbstractRepositoryTest 
 	extends AbstractArchivaTest
 {
@@ -179,9 +181,9 @@ public abstract class AbstractRepositoryTest
 		assertButtonWithValuePresent( "Save Network Proxy" );
 	}
 	
-	public void addNetworkProxyWithAccount( String identifier, String protocol, String hostname, String port, String username, String password )
+	public void addNetworkProxy( String identifier, String protocol, String hostname, String port, String username, String password )
 	{
-		goToNetworkProxiesPage();
+		//goToNetworkProxiesPage();
 		clickLinkWithText( "Add Network Proxy" );
 		assertAddNetworkProxy();
 		setFieldValue( "proxy.id" , identifier );
@@ -195,7 +197,7 @@ public abstract class AbstractRepositoryTest
 	
 	public void editNetworkProxies( String fieldName, String value)
 	{
-		goToNetworkProxiesPage();
+		//goToNetworkProxiesPage();
 		clickLinkWithText( "Edit Network Proxy" );
 		setFieldValue( fieldName, value);
 		clickButtonWithValue( "Save Network Proxy" );
@@ -203,9 +205,10 @@ public abstract class AbstractRepositoryTest
 	
 	public void deleteNetworkProxy()
 	{
-		goToNetworkProxiesPage();
+		//goToNetworkProxiesPage();
 		clickLinkWithText( "Delete Network Proxy" );
 		assertPage( "Apache Archiva \\ Admin: Delete Network Proxy" );
+		assertTextPresent( "WARNING: This operation can not be undone." );
 		clickButtonWithValue( "Delete" );
 	}
 	
@@ -252,8 +255,7 @@ public abstract class AbstractRepositoryTest
 	
 	public void addRemoteRepository( String identifier, String name, String url, String username, String password, String timeout, String type )
 	{
-			goToRepositoriesPage();
-			clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/a" );
+			//goToRepositoriesPage();
 			assertAddRemoteRepository();
 			setFieldValue( "addRemoteRepository_repository_id" ,  identifier );
 			setFieldValue( "addRemoteRepository_repository_name" , name );
@@ -284,8 +286,8 @@ public abstract class AbstractRepositoryTest
 	// managed repositories
 	public void addManagedRepository( String identifier, String name, String directory, String indexDirectory, String type, String cron, String daysOlder, String retentionCount )
 	{
-		goToRepositoriesPage();
-		clickLinkWithText( "Add" );
+		//goToRepositoriesPage();
+		//clickLinkWithText( "Add" );
 		setFieldValue( "repository.id" , identifier );
 		setFieldValue( "repository.name" , name );
 		setFieldValue( "repository.location" , directory );
@@ -300,8 +302,8 @@ public abstract class AbstractRepositoryTest
 	
 	public void editManagedRepository( String fieldName, String value )
 	{
-		goToRepositoriesPage();
-		clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/div[1]/a[1]/img" );
+		//goToRepositoriesPage();
+		clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
 		assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" );
 		setFieldValue(fieldName, value);
 		//TODO
@@ -310,9 +312,15 @@ public abstract class AbstractRepositoryTest
 	
 	public void deleteManagedRepository()
 	{
-		goToRepositoriesPage();
-		clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/div[1]/a[2]" );
+		clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[2]" );
 		assertPage( "Apache Archiva \\ Admin: Delete Managed Repository" );
 		clickButtonWithValue( "Delete Configuration Only" );
-	}	
-}
\ No newline at end of file
+	}
+	
+	public String getRepositoryDir()
+	{
+		File f = new File( "" );
+		String artifactFilePath = f.getAbsolutePath();
+		return artifactFilePath + "/target/";
+	}
+}
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
index e263d934a..50c6ec8e7 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
@@ -78,7 +78,7 @@ public abstract class AbstractSeleniumTest {
 	    getSelenium().start();
 	}
 	
-	protected static Selenium getSelenium()
+	public static Selenium getSelenium()
 	{
 	    return selenium.get();
 	}
@@ -92,44 +92,16 @@ public abstract class AbstractSeleniumTest {
 	// *******************************************************
 	// Auxiliar methods. This method help us and simplify test.
 	// *******************************************************
-	
-	public void captureScreenshot()
-	{
-		Date t = new Date();
-		File f = new File( "" );
-		String baseDir = f.getAbsolutePath();
-		String time = t.toString();
-		getSelenium().windowMaximize();
-		getSelenium().windowFocus();
-		getSelenium().captureScreenshot( baseDir + "/target/screenshots/" + getClass() + "-" + time + ".png" );
-	}
 	    
 	public void assertFieldValue( String fieldValue, String fieldName )
 	{
-		try 
-		{
-			assertElementPresent( fieldName );
-			Assert.assertEquals( fieldValue, getSelenium().getValue( fieldName ) );
-		}
-		catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
 			assertElementPresent( fieldName );
 			Assert.assertEquals( fieldValue, getSelenium().getValue( fieldName ) );
-		}
 	}
 	
 	public void assertPage( String title )
 	{
-	    try 
-	    {
-			Assert.assertEquals( getSelenium().getTitle(), title );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertEquals( getSelenium().getTitle(), title );
-		}
+		Assert.assertEquals( getSelenium().getTitle(), title );
 	}
 	
 	public String getTitle()
@@ -144,93 +116,37 @@ public abstract class AbstractSeleniumTest {
 	
 	public void assertTextPresent( String text )
 	{
-		try
-		{
-			Assert.assertTrue( getSelenium().isTextPresent( text ), "'" + text + "' isn't present." );
-		}
-		catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertTrue( getSelenium().isTextPresent( text ), "'" + text + "' isn't present." );
-		}
+	    Assert.assertTrue( getSelenium().isTextPresent( text ), "'" + text + "' isn't present." );
 	}
 	
 	public void assertTextNotPresent( String text )
 	{
-		try 
-	    {
-			Assert.assertFalse( getSelenium().isTextPresent( text ), "'" + text + "' is present." );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertFalse( getSelenium().isTextPresent( text ), "'" + text + "' is present." );
-		}
+	    Assert.assertFalse( getSelenium().isTextPresent( text ), "'" + text + "' is present." );
 	}
 	
 	public void assertElementPresent( String elementLocator )
 	{
-	    try 
-	    {
-			Assert.assertTrue( isElementPresent( elementLocator ), "'" + elementLocator + "' isn't present." );
-		} 
-	    catch ( java.lang.AssertionError e)
-	    {
-	    	captureScreenshot();
-	    	Assert.assertTrue( isElementPresent( elementLocator ), "'" + elementLocator + "' isn't present." );
-		}
+	   Assert.assertTrue( isElementPresent( elementLocator ), "'" + elementLocator + "' isn't present." );
 	}
 	
 	public void assertElementNotPresent( String elementLocator )
 	{
-	    try 
-	    {
-			Assert.assertFalse( isElementPresent( elementLocator ), "'" + elementLocator + "' is present." );
-		} 
-	    catch ( java.lang.AssertionError e) 
-	    {
-	    	captureScreenshot();
-	    	Assert.assertFalse( isElementPresent( elementLocator ), "'" + elementLocator + "' is present." );
-		}
+	   Assert.assertFalse( isElementPresent( elementLocator ), "'" + elementLocator + "' is present." );
 	}
 	
 	public void assertLinkPresent( String text )
 	{
-		try 
-		{
-			Assert.assertTrue( isElementPresent( "link=" + text ), "The link '" + text + "' isî't present." );
-		} 
-		catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertTrue( isElementPresent( "link=" + text ), "The link '" + text + "' isî't present." );
-		}
+	   Assert.assertTrue( isElementPresent( "link=" + text ), "The link '" + text + "' isî't present." );
 	}
 	
 	public void assertLinkNotPresent( String text )
 	{
-		try 
-		{
-			Assert.assertFalse( isElementPresent( "link=" + text ), "The link('" + text + "' is present." );
-		} 
-		catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertFalse( isElementPresent( "link=" + text ), "The link('" + text + "' is present." );
-		}
+	   Assert.assertFalse( isElementPresent( "link=" + text ), "The link('" + text + "' is present." );
 	}
 	
 	public void assertImgWithAlt( String alt )
 	{
-	    try 
-	    {
-			assertElementPresent( "/¯img[@alt='" + alt + "']" );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			assertElementPresent( "/¯img[@alt='" + alt + "']" );
-		}
+	   assertElementPresent( "/¯img[@alt='" + alt + "']" );
 	}
 	
 	public void assertImgWithAltAtRowCol( boolean isALink, String alt, int row, int column )
@@ -239,28 +155,12 @@ public abstract class AbstractSeleniumTest {
 	    locator += isALink ? "a/" : "";
 	    locator += "img[@alt='" + alt + "']";
 	
-	    try 
-	    {
-			assertElementPresent( locator );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			assertElementPresent( locator );
-		}
+	    assertElementPresent( locator );
 	}
 	
 	public void assertCellValueFromTable( String expected, String tableElement, int row, int column )
 	{
-	    try 
-	    {
-			Assert.assertEquals( expected, getCellValueFromTable( tableElement, row, column ) );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertEquals( expected, getCellValueFromTable( tableElement, row, column ) );
-		}
+	    Assert.assertEquals( expected, getCellValueFromTable( tableElement, row, column ) );
 	}
 	
 	public boolean isTextPresent( String text )
@@ -321,41 +221,17 @@ public abstract class AbstractSeleniumTest {
 	
 	public void assertButtonWithValuePresent( String text )
 	{
-	    try 
-	    {
-			Assert.assertTrue( isButtonWithValuePresent( text ), "'" + text + "' button isn't present" );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertTrue( isButtonWithValuePresent( text ), "'" + text + "' button isn't present" );
-		}
+	    Assert.assertTrue( isButtonWithValuePresent( text ), "'" + text + "' button isn't present" );
 	}
 	
 	public void assertButtonWithIdPresent( String id )
 	{
-	    try 
-	    {
-			Assert.assertTrue( isButtonWithIdPresent( id ), "'Button with id =" + id + "' isn't present" );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertTrue( isButtonWithIdPresent( id ), "'Button with id =" + id + "' isn't present" );
-		}
+	    Assert.assertTrue( isButtonWithIdPresent( id ), "'Button with id =" + id + "' isn't present" );
 	}
 	
 	public void assertButtonWithValueNotPresent( String text )
 	{
-	    try 
-	    {
-			Assert.assertFalse( isButtonWithValuePresent( text ), "'" + text + "' button is present" );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertFalse( isButtonWithValuePresent( text ), "'" + text + "' button is present" );
-		}
+	   Assert.assertFalse( isButtonWithValuePresent( text ), "'" + text + "' button is present" );
 	}
 	
 	public boolean isButtonWithValuePresent( String text )
@@ -472,28 +348,12 @@ public abstract class AbstractSeleniumTest {
 	
 	public void assertIsChecked( String locator )
 	{
-	    try 
-	    {
-			Assert.assertTrue( getSelenium().isChecked( locator ) );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertTrue( getSelenium().isChecked( locator ) );
-		}
+	    Assert.assertTrue( getSelenium().isChecked( locator ) );
 	}
 	
 	public void assertIsNotChecked( String locator )
 	{
-	    try 
-	    {
-			Assert.assertFalse( getSelenium().isChecked( locator ) );
-		} 
-	    catch ( java.lang.AssertionError e) 
-		{
-			captureScreenshot();
-			Assert.assertFalse( getSelenium().isChecked( locator ) );
-		}
+	   Assert.assertFalse( getSelenium().isChecked( locator ) );
 	}
 	    
-}
\ No newline at end of file
+}