Author: brett
Date: Fri Feb 12 11:02:02 2010
New Revision: 909354
URL: http://svn.apache.org/viewvc?rev=909354&view=rev
Log:
enable tests that only work on firefox, conditional on the firefox profile
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=909354&r1=909353&r2=909354&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
Fri Feb 12 11:02:02 2010
@@ -148,9 +148,21 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/testng/config/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
+ <properties>
+ <!--
+ Use this instead of suiteXmlFiles so that we can add the
exclusion, as it is only accepted if you use
+ the 'all command line parameters' mode.
+ -->
+ <property>
+ <name>suitename</name>
+ <value>${basedir}/src/test/testng/config/testng.xml</value>
+ </property>
+ <property>
+ <name>excludegroups</name>
+ <!-- Exclude on all browsers but Firefox, as it is the only one
that Selenium supports file uploads on -->
+ <value>${excluded.groups}</value>
+ </property>
+ </properties>
</configuration>
<executions>
<execution>
@@ -165,7 +177,7 @@
<name>browser</name>
<value>${selenium.browser}</value>
</property>
- <property>
+ <property>
<name>baseUrl</name>
<value>${baseUrl}</value>
</property>
@@ -404,6 +416,7 @@
</activation>
<properties>
<selenium.browser>*firefox</selenium.browser>
+ <excluded.groups />
</properties>
</profile>
<profile>
@@ -416,6 +429,7 @@
</activation>
<properties>
<selenium.browser>*iexplore</selenium.browser>
+ <excluded.groups>requiresUpload</excluded.groups>
</properties>
</profile>
<profile>
@@ -428,6 +442,7 @@
</activation>
<properties>
<selenium.browser>*safari</selenium.browser>
+ <excluded.groups>requiresUpload</excluded.groups>
</properties>
</profile>
<profile>
@@ -440,6 +455,7 @@
</activation>
<properties>
<selenium.browser>*custom ${browserPath}</selenium.browser>
+ <excluded.groups>requiresUpload</excluded.groups>
</properties>
</profile>
<profile>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.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/ArtifactManagementTest.java?rev=909354&r1=909353&r2=909354&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
Fri Feb 12 11:02:02 2010
@@ -83,7 +83,7 @@
assertTextPresent( "Please add a file to upload." );
}
- @Test( enabled = false )
+ @Test(groups = "requiresUpload")
public void testAddArtifactValidValues()
{
// TODO: disable test on non *chrome browsers, there is no way
to do file uploads (SEL-63)
@@ -92,7 +92,7 @@
}
//MRM-747
- @Test( enabled = false )
+ @Test(groups = "requiresUpload")
public void testAddArtifactBlockRedeployments()
{
// TODO: disable test on non *chrome browsers, there is no way to
do file uploads (SEL-63)
@@ -100,7 +100,7 @@
assertTextPresent( "Overwriting released artifacts in repository
'" + getRepositoryId() + "' is not allowed." );
}
- @Test( enabled = false )
+ @Test(groups = "requiresUpload")
public void testDeleteArtifact()
{
//prep
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.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/AuditLogsReportTest.java?rev=909354&r1=909353&r2=909354&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
Fri Feb 12 11:02:02 2010
@@ -69,7 +69,7 @@
// TODO: add test for adding via WebDAV
// TODO: disable if not running on *chrome
- @Test (dependsOnMethods = { "testAddArtifactValidValues" }, enabled =
false )
+ @Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups =
"requiresUpload")
public void testViewAuditLogsDataFound()
{
goToAuditLogReports();
@@ -90,7 +90,7 @@
// TODO: add test for adding via WebDAV
// TODO: disable if not running on *chrome
- @Test (dependsOnMethods = { "testAddArtifactValidValues" }, enabled =
false )
+ @Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups =
"requiresUpload")
public void testViewAuditLogsOnlyArtifactIdIsSpecified()
{
goToAuditLogReports();
@@ -111,7 +111,7 @@
// TODO: add test for adding via WebDAV
// TODO: disable if not running on *chrome
- @Test (dependsOnMethods = { "testAddArtifactValidValues" }, enabled =
false )
+ @Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups =
"requiresUpload")
public void testViewAuditLogsForAllRepositories()
{
goToAuditLogReports();
@@ -129,7 +129,7 @@
assertTextPresent( "admin" );
}
- @Test (dependsOnMethods = { "testAddArtifactValidValues",
"testUserWithRepoManagerInternalRole" }, enabled = false )
+ @Test (dependsOnMethods = { "testAddArtifactValidValues",
"testUserWithRepoManagerInternalRole" }, groups = "requiresUpload")
public void testViewAuditLogsViewAuditEventsForManageableRepositoriesOnly()
{
String groupId = getProperty( "SNAPSHOT_GROUPID" );
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.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/BrowseTest.java?rev=909354&r1=909353&r2=909354&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
Fri Feb 12 11:02:02 2010
@@ -45,7 +45,7 @@
}
// MRM-1278
- @Test( enabled = false )
+ @Test(groups = {"requiresUpload"})
public void testCorrectRepositoryInBrowse()
{
File artifact =
