Author: brett
Date: Tue Jan 19 16:25:11 2010
New Revision: 900833
URL: http://svn.apache.org/viewvc?rev=900833&view=rev
Log:
[MRM-1025] remove database related Selenium tests
Removed:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml?rev=900833&r1=900832&r2=900833&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
Tue Jan 19 16:25:11 2010
@@ -42,7 +42,6 @@
<include name= "appearance" />
<include name= "findartifact" />
<include name= "legacysupport" />
- <include name= "database" />
</run>
</groups>
<packages>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java?rev=900833&r1=900832&r2=900833&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
Tue Jan 19 16:25:11 2010
@@ -20,8 +20,8 @@
*/
import org.apache.archiva.web.test.parent.AbstractRepositoryTest;
-import org.testng.annotations.Test;
import org.testng.Assert;
+import org.testng.annotations.Test;
@Test( groups = { "reposcan" }, dependsOnMethods = {
"testWithCorrectUsernamePassword" }, sequential = true )
public class RepositoryScanningTest
@@ -173,7 +173,6 @@
getSelenium().uncheck(
"//inp...@name='enabledKnownContentConsumers' and @value='index-content']" );
getSelenium().uncheck(
"//inp...@name='enabledKnownContentConsumers' and @value='metadata-updater']" );
getSelenium().uncheck(
"//inp...@name='enabledKnownContentConsumers' and @value='repository-purge']" );
- getSelenium().uncheck(
"//inp...@name='enabledKnownContentConsumers' and @value='update-db-artifact']"
);
getSelenium().uncheck(
"//inp...@name='enabledKnownContentConsumers' and @value='validate-checksums']"
);
clickButtonWithValue( "Update Consumers" );
Modified:
archiva/branches/MRM-1025/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/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=900833&r1=900832&r2=900833&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
Tue Jan 19 16:25:11 2010
@@ -399,7 +399,7 @@
else
{
assertTextPresent( "Search" );
- String navMenu = "Find Artifact,Browse,Reports,User
Management,User Roles,Appearance,Upload Artifact,Delete Artifact,Repository
Groups,Repositories,Proxy Connectors,Legacy Support,Network Proxies,Repository
Scanning,Database";
+ String navMenu = "Find Artifact,Browse,Reports,User
Management,User Roles,Appearance,Upload Artifact,Delete Artifact,Repository
Groups,Repositories,Proxy Connectors,Legacy Support,Network Proxies,Repository
Scanning";
String[] arrayMenu = navMenu.split( "," );
for (String navmenu : arrayMenu )
assertLinkPresent( navmenu );
Modified:
archiva/branches/MRM-1025/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/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java?rev=900833&r1=900832&r2=900833&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Tue Jan 19 16:25:11 2010
@@ -26,14 +26,13 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Map.Entry;
-
-import org.apache.commons.io.IOUtils;
-import org.testng.Assert;
+import java.util.Properties;
import com.thoughtworks.selenium.DefaultSelenium;
import com.thoughtworks.selenium.Selenium;
+import org.apache.commons.io.IOUtils;
+import org.testng.Assert;
/**
* @author <a href="mailto:[email protected]";>Emmanuel Venisse</a>
@@ -176,7 +175,7 @@
public void assertLinkPresent( String text )
{
- Assert.assertTrue( isElementPresent( "link=" + text ), "The link '"
+ text + "' isî't present." );
+ Assert.assertTrue( isElementPresent( "link=" + text ), "The link '"
+ text + "' isn't present." );
}
public void assertLinkNotPresent( String text )
