You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by mb...@apache.org on 2010/04/07 11:27:06 UTC
svn commit: r931475 [1/3] - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test:
./ listener/ parent/
Author: mbaclay
Date: Wed Apr 7 09:27:05 2010
New Revision: 931475
URL: http://svn.apache.org/viewvc?rev=931475&view=rev
Log:
[MRM-1276] Selenium tests need a clean up
- fixed poor formatting in the source code (tabs, etc) following the Maven Code Style
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java
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/ArtifactManagementTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.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/FindArtifactTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.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/NetworkProxiesTest.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/RepositoryScanningTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XPathExpressionUtil.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.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/AbstractArtifactManagementTest.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/AbstractRepositoryTest.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/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java Wed Apr 7 09:27:05 2010
@@ -23,29 +23,32 @@ import org.apache.archiva.web.test.paren
import org.testng.annotations.Test;
@Test( groups = { "appearance" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true )
-public class AppearanceTest extends AbstractArchivaTest
+public class AppearanceTest
+ extends AbstractArchivaTest
{
- public void testAddAppearanceNullValues()
- {
- goToAppearancePage();
- clickLinkWithText( "Edit" );
- addEditAppearance( "", "", "" );
- assertTextPresent( "You must enter a name" );
- }
-
- @Test( dependsOnMethods = { "testAddAppearanceNullValues" })
- public void testAddAppearanceValidValues()
- {
- addEditAppearance( "The Apache Software Foundation" , "http://www.apache.org/" , "http://www.apache.org/images/asf_logo_wide.gifs" );
- assertTextPresent( "The Apache Software Foundation" );
- }
-
- @Test( dependsOnMethods = { "testAddAppearanceValidValues" })
- public void testEditAppearance()
- {
- clickLinkWithText( "Edit" );
- addEditAppearance( "Apache Software Foundation" , "http://www.apache.org/" , "http://www.apache.org/images/asf_logo_wide.gifs" );
- assertTextPresent( "Apache Software Foundation" );
- }
-
+ public void testAddAppearanceNullValues()
+ {
+ goToAppearancePage();
+ clickLinkWithText( "Edit" );
+ addEditAppearance( "", "", "" );
+ assertTextPresent( "You must enter a name" );
+ }
+
+ @Test( dependsOnMethods = { "testAddAppearanceNullValues" } )
+ public void testAddAppearanceValidValues()
+ {
+ addEditAppearance( "The Apache Software Foundation", "http://www.apache.org/",
+ "http://www.apache.org/images/asf_logo_wide.gifs" );
+ assertTextPresent( "The Apache Software Foundation" );
+ }
+
+ @Test( dependsOnMethods = { "testAddAppearanceValidValues" } )
+ public void testEditAppearance()
+ {
+ clickLinkWithText( "Edit" );
+ addEditAppearance( "Apache Software Foundation", "http://www.apache.org/",
+ "http://www.apache.org/images/asf_logo_wide.gifs" );
+ assertTextPresent( "Apache Software Foundation" );
+ }
+
}
\ 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=931475&r1=931474&r2=931475&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 Wed Apr 7 09:27:05 2010
@@ -28,8 +28,8 @@ import org.testng.annotations.Parameters
import org.testng.annotations.Test;
@Test( groups = { "about" }, alwaysRun = true )
-public class ArchivaAdminTest
- extends AbstractArchivaTest
+public class ArchivaAdminTest
+ extends AbstractArchivaTest
{
@Override
@@ -47,10 +47,12 @@ public class ArchivaAdminTest
{
super.open();
}
-
+
@BeforeTest
@Parameters( { "baseUrl", "browser", "seleniumHost", "seleniumPort" } )
- public void initializeArchiva( String baseUrl, String browser, @Optional( "localhost" ) String seleniumHost, @Optional( "4444" ) int seleniumPort ) throws Exception
+ public void initializeArchiva( String baseUrl, String browser, @Optional( "localhost" ) String seleniumHost,
+ @Optional( "4444" ) int seleniumPort )
+ throws Exception
{
super.open( baseUrl, browser, seleniumHost, seleniumPort );
getSelenium().open( baseUrl );
@@ -66,7 +68,7 @@ public class ArchivaAdminTest
assertUserLoggedIn( username );
submit();
clickLinkWithText( "Logout" );
- }
+ }
}
-}
+}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java Wed Apr 7 09:27:05 2010
@@ -24,144 +24,145 @@ import org.testng.annotations.Test;
@Test( groups = { "artifactmanagement" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public class ArtifactManagementTest
- extends AbstractArtifactManagementTest
+ extends AbstractArtifactManagementTest
{
-
- public void testAddArtifactNullValues()
- {
- goToAddArtifactPage();
- clickButtonWithValue( "Submit" );
- assertTextPresent( "Please add a file to upload." );
- assertTextPresent( "Invalid version." );
- assertTextPresent( "You must enter a groupId." );
- assertTextPresent( "You must enter an artifactId." );
- assertTextPresent( "You must enter a version" );
- assertTextPresent( "You must enter a packaging" );
- }
-
- @Test(dependsOnMethods = { "testAddArtifactNullValues" } )
- public void testAddArtifactNoGroupId()
- {
- addArtifact( " " , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "You must enter a groupId." );
- }
-
- @Test(dependsOnMethods = { "testAddArtifactNoGroupId" } )
- public void testAddArtifactNoArtifactId()
- {
-
- addArtifact( getGroupId() , " ", getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "You must enter an artifactId." );
- }
-
- @Test(dependsOnMethods = { "testAddArtifactNoGroupId" } )
- public void testAddArtifactNoVersion()
- {
- addArtifact( getGroupId() , getArtifactId(), " ", getPackaging() , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "You must enter a version." );
- }
-
- @Test(dependsOnMethods = { "testAddArtifactNoGroupId" } )
- public void testAddArtifactInvalidVersion()
- {
- addArtifact( getGroupId() , getArtifactId(), "asdf", getPackaging() , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "Invalid version." );
- }
-
- @Test(dependsOnMethods = { "testAddArtifactNoGroupId" } )
- public void testAddArtifactNoPackaging()
- {
- addArtifact( getGroupId() , getArtifactId(), getVersion(), " " , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "You must enter a packaging." );
- }
-
- @Test(dependsOnMethods = { "testAddArtifactNoGroupId" } )
- public void testAddArtifactNoFilePath()
- {
- addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , " ", getRepositoryId() );
- assertTextPresent( "Please add a file to upload." );
- }
-
- @Test(groups = "requiresUpload")
- public void testAddArtifactValidValues()
- {
- String groupId = getProperty( "VALIDARTIFACT_GROUPID" );
- String artifactId = getProperty( "VALIDARTIFACT_ARTIFACTID" );
-
- addArtifact( groupId , artifactId, getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + getVersion() + "' was successfully deployed to repository 'internal'" );
- }
+ public void testAddArtifactNullValues()
+ {
+ goToAddArtifactPage();
+ clickButtonWithValue( "Submit" );
+ assertTextPresent( "Please add a file to upload." );
+ assertTextPresent( "Invalid version." );
+ assertTextPresent( "You must enter a groupId." );
+ assertTextPresent( "You must enter an artifactId." );
+ assertTextPresent( "You must enter a version" );
+ assertTextPresent( "You must enter a packaging" );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactNullValues" } )
+ public void testAddArtifactNoGroupId()
+ {
+ addArtifact( " ", getArtifactId(), getVersion(), getPackaging(), getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "You must enter a groupId." );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactNoGroupId" } )
+ public void testAddArtifactNoArtifactId()
+ {
+
+ addArtifact( getGroupId(), " ", getVersion(), getPackaging(), getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "You must enter an artifactId." );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactNoGroupId" } )
+ public void testAddArtifactNoVersion()
+ {
+ addArtifact( getGroupId(), getArtifactId(), " ", getPackaging(), getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "You must enter a version." );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactNoGroupId" } )
+ public void testAddArtifactInvalidVersion()
+ {
+ addArtifact( getGroupId(), getArtifactId(), "asdf", getPackaging(), getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "Invalid version." );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactNoGroupId" } )
+ public void testAddArtifactNoPackaging()
+ {
+ addArtifact( getGroupId(), getArtifactId(), getVersion(), " ", getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "You must enter a packaging." );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactNoGroupId" } )
+ public void testAddArtifactNoFilePath()
+ {
+ addArtifact( getGroupId(), getArtifactId(), getVersion(), getPackaging(), " ", getRepositoryId() );
+ assertTextPresent( "Please add a file to upload." );
+ }
+
+ @Test( groups = "requiresUpload" )
+ public void testAddArtifactValidValues()
+ {
+ String groupId = getProperty( "VALIDARTIFACT_GROUPID" );
+ String artifactId = getProperty( "VALIDARTIFACT_ARTIFACTID" );
+
+ addArtifact( groupId, artifactId, getVersion(), getPackaging(), getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + getVersion()
+ + "' was successfully deployed to repository 'internal'" );
+ }
@Test( groups = "requiresUpload" )
public void testDotNetTypes()
{
- String groupId = getProperty( "GROUPID_DOTNETARTIFACT" );
- String artifactId = getProperty( "ARTIFACTID_DOTNETARTIFACT" );
- String packaging = getProperty ( "PACKAGING_DOTNETARTIFACT" );
-
- addArtifact( groupId, artifactId, getVersion(), packaging, getArtifactFilePath(),
- getRepositoryId() );
- assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + getVersion() + "' was successfully deployed to repository 'internal'" );
+ String groupId = getProperty( "GROUPID_DOTNETARTIFACT" );
+ String artifactId = getProperty( "ARTIFACTID_DOTNETARTIFACT" );
+ String packaging = getProperty( "PACKAGING_DOTNETARTIFACT" );
+
+ addArtifact( groupId, artifactId, getVersion(), packaging, getArtifactFilePath(), getRepositoryId() );
+ assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + getVersion()
+ + "' was successfully deployed to repository 'internal'" );
getSelenium().open( baseUrl + "/browse/" + groupId + "/" + artifactId + "/" + getVersion() );
waitPage();
assertTextPresent( "<type>library</type>" );
String basePath =
- "/archiva/repository/internal/" + groupId + "/" + artifactId + "/" + getVersion() + "/" + artifactId + "-" +
- getVersion();
+ "/archiva/repository/internal/" + groupId + "/" + artifactId + "/" + getVersion() + "/" + artifactId + "-"
+ + getVersion();
assertLinkPresent( ".NET Library" );
assertElementPresent( "//a[@href='" + basePath + ".dll']" );
assertElementPresent( "//a[@href='" + basePath + ".pom']" );
}
- //MRM-747
- @Test(groups = "requiresUpload")
- public void testAddArtifactBlockRedeployments()
- {
- addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
- assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." );
- }
-
- @Test(groups = "requiresUpload")
- public void testDeleteArtifact()
- {
- //prep
- String groupId = getProperty( "GROUPID1" );
- String artifactId = getProperty( "ARTIFACTID1" );
- String version = getProperty( "VERSION1" );
- String packaging = getProperty( "PACKAGING1" );
- String repositoryId = getProperty( "REPOSITORYID1" );
- // TODO: do this differently as it only works in Firefox's chrome mode
- addArtifact( groupId , artifactId, version, packaging , getArtifactFilePath(), repositoryId );
- assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deployed to repository 'internal'" );
-
- deleteArtifact( "delete", "delete", "1.0", "internal");
- assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deleted from repository 'internal'" );
- }
-
- public void testDeleteArtifactNoGroupId()
- {
- deleteArtifact( " ", "delete", "1.0", "internal");
- assertTextPresent( "You must enter a groupId." );
- }
-
- public void testDeleteArtifactNoArtifactId()
- {
- deleteArtifact( "delete", " ", "1.0", "internal");
- assertTextPresent( "You must enter an artifactId." );
- }
-
- public void testDeleteArtifactNoVersion()
- {
- deleteArtifact( "delete", "delete", " ", "internal");
- assertTextPresent( "Invalid version." );
- assertTextPresent( "You must enter a version." );
- }
-
- public void testDeleteArtifactInvalidVersion()
- {
- deleteArtifact( "delete", "delete", "asdf", "internal");
- assertTextPresent( "Invalid version." );
- }
-}
+ // MRM-747
+ @Test( groups = "requiresUpload" )
+ public void testAddArtifactBlockRedeployments()
+ {
+ addArtifact( getGroupId(), getArtifactId(), getVersion(), getPackaging(), getArtifactFilePath(),
+ getRepositoryId() );
+ assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." );
+ }
+
+ @Test( groups = "requiresUpload" )
+ public void testDeleteArtifact()
+ {
+ // prep
+ String groupId = getProperty( "GROUPID1" );
+ String artifactId = getProperty( "ARTIFACTID1" );
+ String version = getProperty( "VERSION1" );
+ String packaging = getProperty( "PACKAGING1" );
+ String repositoryId = getProperty( "REPOSITORYID1" );
+ // TODO: do this differently as it only works in Firefox's chrome mode
+ addArtifact( groupId, artifactId, version, packaging, getArtifactFilePath(), repositoryId );
+ assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deployed to repository 'internal'" );
+
+ deleteArtifact( "delete", "delete", "1.0", "internal" );
+ assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deleted from repository 'internal'" );
+ }
+
+ public void testDeleteArtifactNoGroupId()
+ {
+ deleteArtifact( " ", "delete", "1.0", "internal" );
+ assertTextPresent( "You must enter a groupId." );
+ }
+
+ public void testDeleteArtifactNoArtifactId()
+ {
+ deleteArtifact( "delete", " ", "1.0", "internal" );
+ assertTextPresent( "You must enter an artifactId." );
+ }
+
+ public void testDeleteArtifactNoVersion()
+ {
+ deleteArtifact( "delete", "delete", " ", "internal" );
+ assertTextPresent( "Invalid version." );
+ assertTextPresent( "You must enter a version." );
+ }
+
+ public void testDeleteArtifactInvalidVersion()
+ {
+ deleteArtifact( "delete", "delete", "asdf", "internal" );
+ assertTextPresent( "Invalid version." );
+ }
+}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java Wed Apr 7 09:27:05 2010
@@ -28,14 +28,14 @@ public class AuditLogsReportTest
{
private void goToAuditLogReports()
{
- clickLinkWithText( "Audit Log Report" );
+ clickLinkWithText( "Audit Log Report" );
}
-
+
private void assertAuditLogsReportPage()
- {
+ {
assertPage( "Apache Archiva \\ Audit Log Report" );
assertTextPresent( "Audit Log Report" );
-
+
assertElementPresent( "repository" );
assertElementPresent( "groupId" );
assertElementPresent( "artifactId" );
@@ -44,91 +44,91 @@ public class AuditLogsReportTest
assertElementPresent( "rowCount" );
assertButtonWithValuePresent( "View Audit Log" );
}
-
- @Test(dependsOnMethods = { "testWithCorrectUsernamePassword" } )
+
+ @Test( dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public void testAuditLogsReport()
{
- goToAuditLogReports();
+ goToAuditLogReports();
assertAuditLogsReportPage();
assertTextPresent( "Latest Events" );
}
-
- @Test(dependsOnMethods = { "testWithCorrectUsernamePassword" } )
+
+ @Test( dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public void testViewAuditLogsNoDataFound()
{
- goToAuditLogReports();
+ goToAuditLogReports();
assertAuditLogsReportPage();
-
+
setFieldValue( "groupId", "non.existing" );
submit();
-
- assertPage( "Apache Archiva \\ Audit Log Report" );
+
+ assertPage( "Apache Archiva \\ Audit Log Report" );
assertTextPresent( "Results" );
assertTextPresent( "No audit logs found." );
- }
-
+ }
+
// TODO: add test for adding via WebDAV
- @Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload")
+ @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" )
public void testViewAuditLogsDataFound()
{
- goToAuditLogReports();
+ goToAuditLogReports();
assertAuditLogsReportPage();
-
+
selectValue( "repository", "internal" );
setFieldValue( "groupId", getProperty( "VALIDARTIFACT_GROUPID" ) );
submit();
-
+
assertAuditLogsReportPage();
assertTextPresent( "Results" );
assertTextNotPresent( "No audit logs found." );
- assertTextPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) +
- "." + getProperty( "ARTIFACT_PACKAGING" ) );
+ assertTextPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "."
+ + getProperty( "ARTIFACT_PACKAGING" ) );
assertTextPresent( "Uploaded File" );
assertTextPresent( "internal" );
assertTextPresent( "admin" );
}
-
+
// TODO: add test for adding via WebDAV
- @Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload")
+ @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" )
public void testViewAuditLogsOnlyArtifactIdIsSpecified()
{
- goToAuditLogReports();
+ goToAuditLogReports();
assertAuditLogsReportPage();
-
+
selectValue( "repository", "internal" );
setFieldValue( "artifactId", getProperty( "AUDITLOGARTIFACT_ARTIFACTID" ) );
submit();
-
+
assertAuditLogsReportPage();
assertTextPresent( "If you specify an artifact ID, you must specify a group ID" );
assertTextNotPresent( "Results" );
assertTextNotPresent( "No audit logs found." );
- assertTextNotPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) +
- "." + getProperty( "ARTIFACT_PACKAGING" ) );
+ assertTextNotPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "."
+ + getProperty( "ARTIFACT_PACKAGING" ) );
assertTextNotPresent( "Uploaded File" );
}
-
+
// TODO: add test for adding via WebDAV
- @Test (dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload")
+ @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" )
public void testViewAuditLogsForAllRepositories()
{
- goToAuditLogReports();
+ goToAuditLogReports();
assertAuditLogsReportPage();
-
+
selectValue( "repository", "all" );
submit();
-
+
assertAuditLogsReportPage();
assertTextPresent( "Results" );
assertTextNotPresent( "No audit logs found." );
- assertTextPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) +
- "." + getProperty( "ARTIFACT_PACKAGING" ) );
+ assertTextPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "."
+ + getProperty( "ARTIFACT_PACKAGING" ) );
assertTextPresent( "Uploaded File" );
assertTextPresent( "internal" );
assertTextPresent( "admin" );
}
-
- @Test (dependsOnMethods = { "testAddArtifactValidValues", "testUserWithRepoManagerInternalRole" }, groups = "requiresUpload")
+
+ @Test( dependsOnMethods = { "testAddArtifactValidValues", "testUserWithRepoManagerInternalRole" }, groups = "requiresUpload" )
public void testViewAuditLogsViewAuditEventsForManageableRepositoriesOnly()
{
String groupId = getProperty( "SNAPSHOT_GROUPID" );
@@ -136,13 +136,13 @@ public class AuditLogsReportTest
String version = getProperty( "SNAPSHOT_VERSION" );
String repo = getProperty( "SNAPSHOT_REPOSITORYID" );
String packaging = getProperty( "SNAPSHOT_PACKAGING" );
-
- addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repo );
- assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + version +
- "' was successfully deployed to repository '" + repo + "'" );
-
+
+ addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repo );
+ assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + version
+ + "' was successfully deployed to repository '" + repo + "'" );
+
clickLinkWithText( "Logout" );
-
+
login( getProperty( "REPOMANAGER_INTERNAL_USERNAME" ), getUserRoleNewPassword() );
goToAuditLogReports();
@@ -154,7 +154,8 @@ public class AuditLogsReportTest
assertAuditLogsReportPage();
assertTextPresent( "Results" );
assertTextNotPresent( "No audit logs found." );
- assertTextPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "." + packaging );
+ assertTextPresent( getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "."
+ + packaging );
assertTextPresent( "Uploaded File" );
assertTextPresent( "internal" );
assertTextPresent( "admin" );
@@ -163,7 +164,7 @@ public class AuditLogsReportTest
clickLinkWithText( "Logout" );
login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) );
}
-
+
// MRM-1304
@Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" )
public void testViewAuditLogsReportForGroupId()
@@ -187,4 +188,4 @@ public class AuditLogsReportTest
assertTextPresent( expectedArtifact );
assertTextPresent( repositoryId );
}
-}
+}
\ No newline at end of file
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=931475&r1=931474&r2=931475&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 Wed Apr 7 09:27:05 2010
@@ -25,46 +25,48 @@ import org.apache.archiva.web.test.paren
import org.testng.annotations.Test;
@Test( groups = { "browse" }, dependsOnMethods = { "testAddArtifactNullValues" } )
-public class BrowseTest
- extends AbstractBrowseTest
+public class BrowseTest
+ extends AbstractBrowseTest
{
-
- public void testBrowseArtifact()
- {
- goToBrowsePage();
- assertBrowsePage();
- }
-
- public void testClickArtifactFromBrowse()
- {
- goToBrowsePage();
- assertBrowsePage();
- clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" );
- assertPage( "Apache Archiva \\ Browse Repository" );
- assertTextPresent( "Artifacts" );
- }
+
+ public void testBrowseArtifact()
+ {
+ goToBrowsePage();
+ assertBrowsePage();
+ }
+
+ public void testClickArtifactFromBrowse()
+ {
+ goToBrowsePage();
+ assertBrowsePage();
+ clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" );
+ assertPage( "Apache Archiva \\ Browse Repository" );
+ assertTextPresent( "Artifacts" );
+ }
// MRM-1278
- @Test(groups = {"requiresUpload"})
+ @Test( groups = { "requiresUpload" } )
public void testCorrectRepositoryInBrowse()
{
String releasesRepo = getProperty( "RELEASES_REPOSITORY" );
-
+
// create releases repository first
goToRepositoriesPage();
clickLinkWithText( "Add" );
addManagedRepository( getProperty( "RELEASES_REPOSITORY" ), "Releases Repository",
- new File( getBasedir(), "target/repository/releases" ).getPath(), "", "Maven 2.x Repository",
- "0 0 * * * ?", "", "" );
+ new File( getBasedir(), "target/repository/releases" ).getPath(), "",
+ "Maven 2.x Repository", "0 0 * * * ?", "", "" );
assertTextPresent( "Releases Repository" );
-
+
String snapshotsRepo = getProperty( "SNAPSHOTS_REPOSITORY" );
- String path = "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
+ String path =
+ "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
// TODO: do this differently as uploading doesn't work on browsers other than *chrome (below as well)
- // upload a snapshot artifact to repository 'releases'
+ // upload a snapshot artifact to repository 'releases'
addArtifact( "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar", path, releasesRepo );
- assertTextPresent( "Artifact 'archiva:archiva-webapp:1.0-SNAPSHOT' was successfully deployed to repository '" + releasesRepo + "'" );
+ assertTextPresent( "Artifact 'archiva:archiva-webapp:1.0-SNAPSHOT' was successfully deployed to repository '"
+ + releasesRepo + "'" );
goToBrowsePage();
assertBrowsePage();
@@ -72,9 +74,10 @@ public class BrowseTest
assertArtifactsPage( "archiva-webapp/" );
assertArtifactInfoPage( "1.0-SNAPSHOT/", releasesRepo, "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar" );
- // upload a snapshot artifact to repository 'snapshots'
+ // upload a snapshot artifact to repository 'snapshots'
addArtifact( "continuum", "continuum-core", "1.0-SNAPSHOT", "jar", path, snapshotsRepo );
- assertTextPresent( "Artifact 'continuum:continuum-core:1.0-SNAPSHOT' was successfully deployed to repository '" + snapshotsRepo + "'" );
+ assertTextPresent( "Artifact 'continuum:continuum-core:1.0-SNAPSHOT' was successfully deployed to repository '"
+ + snapshotsRepo + "'" );
goToBrowsePage();
assertBrowsePage();
@@ -84,7 +87,8 @@ public class BrowseTest
}
private void assertArtifactInfoPage( String version, String artifactInfoRepositoryId, String artifactInfoGroupId,
- String artifactInfoArtifactId, String artifactInfoVersion, String artifactInfoPackaging )
+ String artifactInfoArtifactId, String artifactInfoVersion,
+ String artifactInfoPackaging )
{
clickLinkWithText( version );
assertPage( "Apache Archiva \\ Browse Repository" );
@@ -108,4 +112,4 @@ public class BrowseTest
assertPage( "Apache Archiva \\ Browse Repository" );
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/FindArtifactTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java Wed Apr 7 09:27:05 2010
@@ -24,22 +24,22 @@ import org.testng.annotations.Test;
@Test( groups = { "findartifact" }, sequential = true )
public class FindArtifactTest
- extends AbstractArchivaTest
+ extends AbstractArchivaTest
{
- public void testFindArtifactNullValues()
- {
- goToFindArtifactPage();
- clickButtonWithValue( "Search" );
- assertTextPresent( "You must select a file, or enter the checksum. If the file was given and you receive this message, there may have been an error generating the checksum." );
- }
-
- public void testFindArtifactUsingChecksum()
- {
- goToFindArtifactPage();
- setFieldValue( "checksumSearch_q" , "8e896baea663a45d7bd2737f8e464481" );
- clickButtonWithValue( "Search" );
- assertTextPresent( "No results found" );
- }
+ public void testFindArtifactNullValues()
+ {
+ goToFindArtifactPage();
+ clickButtonWithValue( "Search" );
+ assertTextPresent( "You must select a file, or enter the checksum. If the file was given and you receive this message, there may have been an error generating the checksum." );
+ }
+
+ public void testFindArtifactUsingChecksum()
+ {
+ goToFindArtifactPage();
+ setFieldValue( "checksumSearch_q", "8e896baea663a45d7bd2737f8e464481" );
+ clickButtonWithValue( "Search" );
+ assertTextPresent( "No results found" );
+ }
// TODO: test using file upload on Firefox versions that support getAsBinary (ie, no applet)
-}
+}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java Wed Apr 7 09:27:05 2010
@@ -23,53 +23,53 @@ import org.apache.archiva.web.test.paren
import org.testng.annotations.Test;
@Test( groups = { "legacysupport" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true )
-public class LegacySupportTest
- extends AbstractArtifactManagementTest
+public class LegacySupportTest
+ extends AbstractArtifactManagementTest
{
- public void testAddLegacyArtifact_NullValues()
- {
- goToLegacySupportPage();
- clickLinkWithText( "Add" );
- addLegacyArtifactPath( "" , "" , "" , "" , "" , "");
- assertTextPresent( "You must enter a legacy path." );
- assertTextPresent( "You must enter a groupId." );
- assertTextPresent( "You must enter an artifactId." );
- assertTextPresent( "You must enter a version." );
- assertTextPresent( "You must enter a type." );
- }
-
- @Test( dependsOnMethods = { "testAddLegacyArtifact_NullValues" })
- public void testAddLegacyArtifact_NullLegacyPath()
- {
- addLegacyArtifactPath( "" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "jar");
- assertTextPresent( "You must enter a legacy path." );
- }
-
- @Test( dependsOnMethods = { "testAddLegacyArtifact_NullLegacyPath" })
- public void testAddLegacyArtifact_NullGroupId()
- {
- addLegacyArtifactPath( "test" , "" , "test" , "1.0-SNAPSHOT" , "testing" , "jar");
- assertTextPresent( "You must enter a groupId." );
- }
-
- @Test( dependsOnMethods = { "testAddLegacyArtifact_NullGroupId" })
- public void testAddLegacyArtifact_NullArtifactId()
- {
- addLegacyArtifactPath( "test" , "test" , "" , "1.0-SNAPSHOT" , "testing" , "jar");
- assertTextPresent( "You must enter an artifactId." );
- }
-
- @Test( dependsOnMethods = { "testAddLegacyArtifact_NullArtifactId" })
- public void testAddLegacyArtifact_NullVersion()
- {
- addLegacyArtifactPath( "test" , "test" , "test" , "" , "testing" , "jar");
- assertTextPresent( "You must enter a version." );
- }
-
- @Test( dependsOnMethods = { "testAddLegacyArtifact_NullVersion" })
- public void testAddLegacyArtifact_NullType()
- {
- addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "");
- assertTextPresent( "You must enter a type." );
- }
-}
+ public void testAddLegacyArtifact_NullValues()
+ {
+ goToLegacySupportPage();
+ clickLinkWithText( "Add" );
+ addLegacyArtifactPath( "", "", "", "", "", "" );
+ assertTextPresent( "You must enter a legacy path." );
+ assertTextPresent( "You must enter a groupId." );
+ assertTextPresent( "You must enter an artifactId." );
+ assertTextPresent( "You must enter a version." );
+ assertTextPresent( "You must enter a type." );
+ }
+
+ @Test( dependsOnMethods = { "testAddLegacyArtifact_NullValues" } )
+ public void testAddLegacyArtifact_NullLegacyPath()
+ {
+ addLegacyArtifactPath( "", "test", "test", "1.0-SNAPSHOT", "testing", "jar" );
+ assertTextPresent( "You must enter a legacy path." );
+ }
+
+ @Test( dependsOnMethods = { "testAddLegacyArtifact_NullLegacyPath" } )
+ public void testAddLegacyArtifact_NullGroupId()
+ {
+ addLegacyArtifactPath( "test", "", "test", "1.0-SNAPSHOT", "testing", "jar" );
+ assertTextPresent( "You must enter a groupId." );
+ }
+
+ @Test( dependsOnMethods = { "testAddLegacyArtifact_NullGroupId" } )
+ public void testAddLegacyArtifact_NullArtifactId()
+ {
+ addLegacyArtifactPath( "test", "test", "", "1.0-SNAPSHOT", "testing", "jar" );
+ assertTextPresent( "You must enter an artifactId." );
+ }
+
+ @Test( dependsOnMethods = { "testAddLegacyArtifact_NullArtifactId" } )
+ public void testAddLegacyArtifact_NullVersion()
+ {
+ addLegacyArtifactPath( "test", "test", "test", "", "testing", "jar" );
+ assertTextPresent( "You must enter a version." );
+ }
+
+ @Test( dependsOnMethods = { "testAddLegacyArtifact_NullVersion" } )
+ public void testAddLegacyArtifact_NullType()
+ {
+ addLegacyArtifactPath( "test", "test", "test", "1.0-SNAPSHOT", "testing", "" );
+ assertTextPresent( "You must enter a type." );
+ }
+}
\ 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=931475&r1=931474&r2=931475&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 Wed Apr 7 09:27:05 2010
@@ -36,11 +36,11 @@ import org.testng.annotations.Test;
* @version $Id$
*/
-@Test ( groups = { "login" } )
-public class LoginTest
- extends AbstractArchivaTest
+@Test( groups = { "login" } )
+public class LoginTest
+ extends AbstractArchivaTest
{
- public void testWithBadUsername()
+ public void testWithBadUsername()
{
goToLoginPage();
getSelenium().type( "loginForm_username", "badUsername" );
@@ -92,8 +92,8 @@ public class LoginTest
assertTextPresent( "Logout" );
assertTextPresent( getProperty( "ADMIN_USERNAME" ) );
}
-
- @BeforeTest
+
+ @BeforeTest
public void open()
throws Exception
{
@@ -107,4 +107,4 @@ public class LoginTest
{
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/NetworkProxiesTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java Wed Apr 7 09:27:05 2010
@@ -23,74 +23,74 @@ import org.apache.archiva.web.test.paren
import org.testng.annotations.Test;
@Test( groups = { "networkproxies" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
-public class NetworkProxiesTest
- extends AbstractRepositoryTest
+public class NetworkProxiesTest
+ extends AbstractRepositoryTest
{
- @Test (dependsOnMethods = { "testDeleteRepositoryGroup" } )
- public void testAddNetworkProxyNullValues()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "", "", "", "", "", "");
- assertTextPresent( "You must enter an identifier." );
- assertTextPresent( "You must enter a protocol." );
- assertTextPresent( "You must enter a host." );
- }
-
- @Test (dependsOnMethods = { "testAddNetworkProxyNullValues" } )
- public void testAddNetworkProxyNullIdentifier()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "", "http", "localhost", "8080", "", "");
- assertTextPresent( "You must enter an identifier." );
- }
-
- @Test (dependsOnMethods = { "testAddNetworkProxyNullIdentifier" } )
- public void testAddNetworkProxyNullProtocol()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "testing123", "", "localhost", "8080", "", "");
- assertTextPresent( "You must enter a protocol." );
- }
-
- @Test (dependsOnMethods = { "testAddNetworkProxyNullProtocol" } )
- public void testAddNetworkProxiesNullHostname()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "testing123", "http", "", "8080", "", "");
- assertTextPresent( "You must enter a host." );
- }
-
- @Test (dependsOnMethods = { "testAddNetworkProxiesNullHostname" } )
- public void testAddNetworkProxiesValidValues()
- {
- goToNetworkProxiesPage();
- addNetworkProxy( "testing123", "http", "localhost", "8080", "", "");
- assertPage( "Apache Archiva \\ Administration - Network Proxies" );
- assertTextPresent( "testing123" );
- }
-
- @Test (dependsOnMethods = { "testAddNetworkProxiesValidValues" } )
- public void testEditNetworkProxy()
- {
- editNetworkProxies( "proxy.host", "localhost" );
- assertPage( "Apache Archiva \\ Administration - Network Proxies" );
- assertTextPresent( "localhost" );
- }
-
- @Test (dependsOnMethods = { "testEditNetworkProxy" } )
- public void testDeleteNetworkProxy()
- {
- deleteNetworkProxy();
- assertPage( "Apache Archiva \\ Administration - Network Proxies" );
- assertTextPresent( "There are no network proxies configured yet." );
- }
-
- @Test (dependsOnMethods = { "testDeleteNetworkProxy" } )
- public void testAddNetworkProxyAfterDelete()
- {
- addNetworkProxy( "testing123", "http", "localhost", "8080", "", "");
- assertPage( "Apache Archiva \\ Administration - Network Proxies" );
- assertTextPresent( "testing123" );
- }
-
-}
+ @Test( dependsOnMethods = { "testDeleteRepositoryGroup" } )
+ public void testAddNetworkProxyNullValues()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "", "", "", "", "", "" );
+ assertTextPresent( "You must enter an identifier." );
+ assertTextPresent( "You must enter a protocol." );
+ assertTextPresent( "You must enter a host." );
+ }
+
+ @Test( dependsOnMethods = { "testAddNetworkProxyNullValues" } )
+ public void testAddNetworkProxyNullIdentifier()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "", "http", "localhost", "8080", "", "" );
+ assertTextPresent( "You must enter an identifier." );
+ }
+
+ @Test( dependsOnMethods = { "testAddNetworkProxyNullIdentifier" } )
+ public void testAddNetworkProxyNullProtocol()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "testing123", "", "localhost", "8080", "", "" );
+ assertTextPresent( "You must enter a protocol." );
+ }
+
+ @Test( dependsOnMethods = { "testAddNetworkProxyNullProtocol" } )
+ public void testAddNetworkProxiesNullHostname()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "testing123", "http", "", "8080", "", "" );
+ assertTextPresent( "You must enter a host." );
+ }
+
+ @Test( dependsOnMethods = { "testAddNetworkProxiesNullHostname" } )
+ public void testAddNetworkProxiesValidValues()
+ {
+ goToNetworkProxiesPage();
+ addNetworkProxy( "testing123", "http", "localhost", "8080", "", "" );
+ assertPage( "Apache Archiva \\ Administration - Network Proxies" );
+ assertTextPresent( "testing123" );
+ }
+
+ @Test( dependsOnMethods = { "testAddNetworkProxiesValidValues" } )
+ public void testEditNetworkProxy()
+ {
+ editNetworkProxies( "proxy.host", "localhost" );
+ assertPage( "Apache Archiva \\ Administration - Network Proxies" );
+ assertTextPresent( "localhost" );
+ }
+
+ @Test( dependsOnMethods = { "testEditNetworkProxy" } )
+ public void testDeleteNetworkProxy()
+ {
+ deleteNetworkProxy();
+ assertPage( "Apache Archiva \\ Administration - Network Proxies" );
+ assertTextPresent( "There are no network proxies configured yet." );
+ }
+
+ @Test( dependsOnMethods = { "testDeleteNetworkProxy" } )
+ public void testAddNetworkProxyAfterDelete()
+ {
+ addNetworkProxy( "testing123", "http", "localhost", "8080", "", "" );
+ assertPage( "Apache Archiva \\ Administration - Network Proxies" );
+ assertTextPresent( "testing123" );
+ }
+
+}
\ 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=931475&r1=931474&r2=931475&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 Wed Apr 7 09:27:05 2010
@@ -23,79 +23,61 @@ import org.apache.archiva.web.test.paren
import org.testng.annotations.Test;
@Test( groups = { "reports" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
-public class ReportsTest
- extends AbstractArtifactReportsTest
+public class ReportsTest
+ extends AbstractArtifactReportsTest
{
- //TODO Tests for repository with defects
-
- public void testRepoStatisticsWithoutRepoCompared()
- {
- goToReportsPage();
- clickButtonWithValue( "View Statistics" );
- assertTextPresent( "Please select a repository (or repositories) from the list." );
- }
-
- @Test(dependsOnMethods = { "testRepoStatisticsWithoutRepoCompared" } )
- public void testRepositoryStatisticsWithoutDate()
- {
- String repositoryName = getProperty( "REPOSITORY_NAME" ) ;
- compareRepositories( "label=" + repositoryName, "", "" );
- //TODO
- //assertTextPresent( "Statistics Report" );
- }
-
- @Test(dependsOnMethods = { "testRepoStatisticsWithoutRepoCompared" } )
- public void testRepositoryStatisticsEndEarlierThanStart()
- {
- String repositoryName = getProperty( "REPOSITORY_NAME" ) ;
- String startDate = getProperty( "END_DATE" );
- String endDate = getProperty( "START_DATE" );
- compareRepositories( "label=" + repositoryName, startDate, endDate );
- //assertTextPresent( "Statistics for Repository '" + repositoryName + "'" );
- assertPage( "Apache Archiva \\ Reports" );
- assertTextPresent( "Start Date must be earlier than the End Date" );
- }
-
- public void testRepositoryStatistics()
- {
- String repositoryName = getProperty( "REPOSITORY_NAME" ) ;
- String startDate = getProperty( "START_DATE" );
- String endDate = getProperty( "END_DATE" );
- compareRepositories( "label=" + repositoryName, startDate, endDate );
- //assertTextPresent( "Statistics for Repository '" + repositoryName + "'" );
- //assertPage( "Apache Archiva \\ Reports" );
- //assertTextPresent( "Statistics Report" );
- }
-
- /* @Test( dependsOnMethods = { "testRepositoryStatistics" } )
- public void testRepositoriesStatisticComparisonReport()
- {
- //goToReportsPage();
- clickButtonWithValue( "-->>" , false );
- clickButtonWithValue( "View Statistics" );
- assertTextPresent( "Statistics Report" );
- }
-
- public void testRepositoryHealthWithoutDefect()
- {
- goToReportsPage();
- String groupId = getProperty( "ARTIFACT_GROUPID" );
- getSelenium().type( "generateReport_groupId" , groupId );
- clickButtonWithValue( "Show Report" );
- assertPage( "Apache Archiva \\ Reports" );
- assertTextPresent( "The operation generated an empty report." );
- }
-
- public void testRepositoryHealthWithoutGroupId()
- {
- goToReportsPage();
- clickButtonWithValue( "Show Report" );
- assertPage( "Apache Archiva \\ Reports" );
- assertTextPresent( "The operation generated an empty report." );
-
- //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.
- }*/
-
-
-
-}
+ // TODO Tests for repository with defects
+
+ public void testRepoStatisticsWithoutRepoCompared()
+ {
+ goToReportsPage();
+ clickButtonWithValue( "View Statistics" );
+ assertTextPresent( "Please select a repository (or repositories) from the list." );
+ }
+
+ @Test( dependsOnMethods = { "testRepoStatisticsWithoutRepoCompared" } )
+ public void testRepositoryStatisticsWithoutDate()
+ {
+ String repositoryName = getProperty( "REPOSITORY_NAME" );
+ compareRepositories( "label=" + repositoryName, "", "" );
+ // TODO
+ // assertTextPresent( "Statistics Report" );
+ }
+
+ @Test( dependsOnMethods = { "testRepoStatisticsWithoutRepoCompared" } )
+ public void testRepositoryStatisticsEndEarlierThanStart()
+ {
+ String repositoryName = getProperty( "REPOSITORY_NAME" );
+ String startDate = getProperty( "END_DATE" );
+ String endDate = getProperty( "START_DATE" );
+ compareRepositories( "label=" + repositoryName, startDate, endDate );
+ // assertTextPresent( "Statistics for Repository '" + repositoryName + "'" );
+ assertPage( "Apache Archiva \\ Reports" );
+ assertTextPresent( "Start Date must be earlier than the End Date" );
+ }
+
+ public void testRepositoryStatistics()
+ {
+ String repositoryName = getProperty( "REPOSITORY_NAME" );
+ String startDate = getProperty( "START_DATE" );
+ String endDate = getProperty( "END_DATE" );
+ compareRepositories( "label=" + repositoryName, startDate, endDate );
+ // assertTextPresent( "Statistics for Repository '" + repositoryName + "'" );
+ // assertPage( "Apache Archiva \\ Reports" );
+ // assertTextPresent( "Statistics Report" );
+ }
+
+ /*
+ * @Test( dependsOnMethods = { "testRepositoryStatistics" } ) public void
+ * testRepositoriesStatisticComparisonReport() { //goToReportsPage(); clickButtonWithValue( "-->>" , false );
+ * clickButtonWithValue( "View Statistics" ); assertTextPresent( "Statistics Report" ); } public void
+ * testRepositoryHealthWithoutDefect() { goToReportsPage(); String groupId = getProperty( "ARTIFACT_GROUPID" );
+ * getSelenium().type( "generateReport_groupId" , groupId ); clickButtonWithValue( "Show Report" ); assertPage(
+ * "Apache Archiva \\ Reports" ); assertTextPresent( "The operation generated an empty report." ); } public void
+ * testRepositoryHealthWithoutGroupId() { goToReportsPage(); clickButtonWithValue( "Show Report" ); assertPage(
+ * "Apache Archiva \\ Reports" ); assertTextPresent( "The operation generated an empty report." ); //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/RepositoryScanningTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java Wed Apr 7 09:27:05 2010
@@ -24,159 +24,165 @@ import org.testng.Assert;
import org.testng.annotations.Test;
@Test( groups = { "reposcan" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true )
-public class RepositoryScanningTest
- extends AbstractRepositoryTest
+public class RepositoryScanningTest
+ extends AbstractRepositoryTest
{
- public void testAddArtifactFileType_NullValue()
- {
- goToRepositoryScanningPage();
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
- assertTextPresent( "Unable to process blank pattern." );
- }
-
- @Test (dependsOnMethods = { "testAddArtifactFileType_NullValue" } )
- public void testAddArtifactFileType()
- {
- setFieldValue( "newpattern_0" , "**/*.dll" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[1]/table.13.0"), "**/*.dll" );
- }
-
- @Test (dependsOnMethods = { "testAddArtifactFileType" } )
- public void testAddArtifactFileType_ExistingValue()
- {
- setFieldValue( "newpattern_0" , "**/*.zip" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[15]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*.zip\" to filetype artifacts as it already exists." );
- }
-
- @Test (dependsOnMethods = { "testAddArtifactFileType_ExistingValue" } )
- public void testDeleteArtifactFileType()
- {
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[1]/table.13.0"), "**/*.dll" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[1]/table.13.0"), "" );
- }
-
- @Test (dependsOnMethods = { "testDeleteArtifactFileType" } )
- public void testAddAutoRemove_NullValue()
- {
- setFieldValue( "newpattern_1" , "" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
- assertTextPresent( "Unable to process blank pattern." );
- }
-
- @Test (dependsOnMethods = { "testAddAutoRemove_NullValue" } )
- public void testAddAutoRemove_ExistingValue()
- {
- setFieldValue( "newpattern_1" , "**/*-" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*-\" to filetype auto-remove as it already exists." );
- }
-
- @Test (dependsOnMethods = { "testAddAutoRemove_ExistingValue" } )
- public void testAddAutoRemove()
- {
- setFieldValue( "newpattern_1" , "**/*.test" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[2]/table.3.0"), "**/*.test" );
- }
-
- @Test (dependsOnMethods = { "testAddAutoRemove" } )
- public void testDeleteAutoRemove()
- {
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[2]/table.3.0"), "**/*.test" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[2]/table.3.0"), "" );
- }
-
- @Test (dependsOnMethods = { "testDeleteAutoRemove" } )
- public void testAddIgnoredArtifacts_NullValue()
- {
- setFieldValue( "newpattern_2" , "" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Unable to process blank pattern." );
- }
-
- @Test (dependsOnMethods = { "testAddIgnoredArtifacts_NullValue" } )
- public void testAddIgnoredArtifacts_ExistingValue()
- {
- setFieldValue( "newpattern_2" , "**/*.sh" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*.sh\" to filetype ignored as it already exists." );
- }
-
- @Test (dependsOnMethods = { "testAddIgnoredArtifacts_ExistingValue" } )
- public void testAddIgnoredArtifacts()
- {
- setFieldValue( "newpattern_2" , "**/*.log" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[3]/table.6.0"), "**/*.log" );
- }
-
- @Test (dependsOnMethods = { "testAddIgnoredArtifacts" } )
- public void testDeleteIgnoredArtifacts()
- {
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[3]/table.6.0"), "**/*.log" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[3]/table.6.0"), "" );
- }
-
- //
- @Test (dependsOnMethods = { "testDeleteIgnoredArtifacts" } )
- public void testAddIndexableContent_NullValue()
- {
- setFieldValue( "newpattern_3" , "" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Unable to process blank pattern." );
- }
-
- @Test (dependsOnMethods = { "testAddIndexableContent_NullValue" } )
- public void testAddIndexableContent_ExistingValue()
- {
- setFieldValue( "newpattern_3" , "**/*.xml" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getText("//span[@class='errorMessage']"), "Not adding pattern \"**/*.xml\" to filetype indexable-content as it already exists." );
- }
-
- @Test (dependsOnMethods = { "testAddIndexableContent_ExistingValue" } )
- public void testAddIndexableContent()
- {
- setFieldValue( "newpattern_3" , "**/*.html" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[4]/table.9.0"), "**/*.html" );
- }
-
- @Test (dependsOnMethods = { "testAddIndexableContent" } )
- public void testDeleteIndexableContent()
- {
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[4]/table.9.0"), "**/*.html" );
- clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
- Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[4]/table.9.0"), "" );
- }
-
- @Test (dependsOnMethods = { "testDeleteIndexableContent" } )
- public void testUpdateConsumers()
- {
- checkField( "enabledKnownContentConsumers" );
- checkField( "//input[@name='enabledKnownContentConsumers' and @value='auto-rename']" );
- clickButtonWithValue( "Update Consumers" );
- assertPage( "Apache Archiva \\ Administration - Repository Scanning" );
- }
-
- @Test (dependsOnMethods = { "testUpdateConsumers" } )
- public void testUpdateConsumers_UnsetAll()
- {
- getSelenium().uncheck( "enabledKnownContentConsumers" );
- getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='auto-rename']" );
- getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='create-missing-checksums']" );
- getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='index-content']" );
- getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='metadata-updater']" );
- getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='repository-purge']" );
- getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='validate-checksums']" );
- clickButtonWithValue( "Update Consumers" );
-
- assertPage( "Apache Archiva \\ Administration - Repository Scanning" );
- }
-
-}
+ public void testAddArtifactFileType_NullValue()
+ {
+ goToRepositoryScanningPage();
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
+ assertTextPresent( "Unable to process blank pattern." );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactFileType_NullValue" } )
+ public void testAddArtifactFileType()
+ {
+ setFieldValue( "newpattern_0", "**/*.dll" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[1]/table.13.0" ), "**/*.dll" );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactFileType" } )
+ public void testAddArtifactFileType_ExistingValue()
+ {
+ setFieldValue( "newpattern_0", "**/*.zip" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[15]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ "Not adding pattern \"**/*.zip\" to filetype artifacts as it already exists." );
+ }
+
+ @Test( dependsOnMethods = { "testAddArtifactFileType_ExistingValue" } )
+ public void testDeleteArtifactFileType()
+ {
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[1]/table.13.0" ), "**/*.dll" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[1]/table.13.0" ), "" );
+ }
+
+ @Test( dependsOnMethods = { "testDeleteArtifactFileType" } )
+ public void testAddAutoRemove_NullValue()
+ {
+ setFieldValue( "newpattern_1", "" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ assertTextPresent( "Unable to process blank pattern." );
+ }
+
+ @Test( dependsOnMethods = { "testAddAutoRemove_NullValue" } )
+ public void testAddAutoRemove_ExistingValue()
+ {
+ setFieldValue( "newpattern_1", "**/*-" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ "Not adding pattern \"**/*-\" to filetype auto-remove as it already exists." );
+ }
+
+ @Test( dependsOnMethods = { "testAddAutoRemove_ExistingValue" } )
+ public void testAddAutoRemove()
+ {
+ setFieldValue( "newpattern_1", "**/*.test" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[2]/table.3.0" ), "**/*.test" );
+ }
+
+ @Test( dependsOnMethods = { "testAddAutoRemove" } )
+ public void testDeleteAutoRemove()
+ {
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[2]/table.3.0" ), "**/*.test" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[2]/table.3.0" ), "" );
+ }
+
+ @Test( dependsOnMethods = { "testDeleteAutoRemove" } )
+ public void testAddIgnoredArtifacts_NullValue()
+ {
+ setFieldValue( "newpattern_2", "" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ "Unable to process blank pattern." );
+ }
+
+ @Test( dependsOnMethods = { "testAddIgnoredArtifacts_NullValue" } )
+ public void testAddIgnoredArtifacts_ExistingValue()
+ {
+ setFieldValue( "newpattern_2", "**/*.sh" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ "Not adding pattern \"**/*.sh\" to filetype ignored as it already exists." );
+ }
+
+ @Test( dependsOnMethods = { "testAddIgnoredArtifacts_ExistingValue" } )
+ public void testAddIgnoredArtifacts()
+ {
+ setFieldValue( "newpattern_2", "**/*.log" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[3]/table.6.0" ), "**/*.log" );
+ }
+
+ @Test( dependsOnMethods = { "testAddIgnoredArtifacts" } )
+ public void testDeleteIgnoredArtifacts()
+ {
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[3]/table.6.0" ), "**/*.log" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[3]/table.6.0" ), "" );
+ }
+
+ //
+ @Test( dependsOnMethods = { "testDeleteIgnoredArtifacts" } )
+ public void testAddIndexableContent_NullValue()
+ {
+ setFieldValue( "newpattern_3", "" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ "Unable to process blank pattern." );
+ }
+
+ @Test( dependsOnMethods = { "testAddIndexableContent_NullValue" } )
+ public void testAddIndexableContent_ExistingValue()
+ {
+ setFieldValue( "newpattern_3", "**/*.xml" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ "Not adding pattern \"**/*.xml\" to filetype indexable-content as it already exists." );
+ }
+
+ @Test( dependsOnMethods = { "testAddIndexableContent_ExistingValue" } )
+ public void testAddIndexableContent()
+ {
+ setFieldValue( "newpattern_3", "**/*.html" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[4]/table.9.0" ), "**/*.html" );
+ }
+
+ @Test( dependsOnMethods = { "testAddIndexableContent" } )
+ public void testDeleteIndexableContent()
+ {
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[4]/table.9.0" ), "**/*.html" );
+ clickLinkWithXPath( "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[4]/table.9.0" ), "" );
+ }
+
+ @Test( dependsOnMethods = { "testDeleteIndexableContent" } )
+ public void testUpdateConsumers()
+ {
+ checkField( "enabledKnownContentConsumers" );
+ checkField( "//input[@name='enabledKnownContentConsumers' and @value='auto-rename']" );
+ clickButtonWithValue( "Update Consumers" );
+ assertPage( "Apache Archiva \\ Administration - Repository Scanning" );
+ }
+
+ @Test( dependsOnMethods = { "testUpdateConsumers" } )
+ public void testUpdateConsumers_UnsetAll()
+ {
+ getSelenium().uncheck( "enabledKnownContentConsumers" );
+ getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='auto-rename']" );
+ getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='create-missing-checksums']" );
+ getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='index-content']" );
+ getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='metadata-updater']" );
+ getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='repository-purge']" );
+ getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='validate-checksums']" );
+ clickButtonWithValue( "Update Consumers" );
+
+ assertPage( "Apache Archiva \\ Administration - Repository Scanning" );
+ }
+
+}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java Wed Apr 7 09:27:05 2010
@@ -24,137 +24,142 @@ import org.testng.annotations.Test;
@Test( groups = { "repository" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true )
public class RepositoryTest
- extends AbstractRepositoryTest
+ extends AbstractRepositoryTest
{
- public void testAddManagedRepoValidValues()
- {
- goToRepositoriesPage();
- getSelenium().open( "/archiva/admin/addRepository.action" );
- addManagedRepository( "managedrepo1", "Managed Repository Sample 1" , getRepositoryDir() + "repository/" , "", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
- clickButtonWithValue( "Save" );
- assertTextPresent( "Managed Repository Sample 1" );
- assertRepositoriesPage();
- }
-
- @Test(dependsOnMethods = { "testAddManagedRepoValidValues" } )
- public void testAddManagedRepoInvalidValues()
- {
- goToRepositoriesPage();
- getSelenium().open( "/archiva/admin/addRepository.action" );
- addManagedRepository( "", "" , "" , "", "Maven 2.x Repository", "", "", "" );
- assertTextPresent( "You must enter a repository identifier." );
- assertTextPresent( "You must enter a repository name." );
- assertTextPresent( "You must enter a directory." );
- assertTextPresent( "Invalid cron expression." );
- }
-
- @Test(dependsOnMethods = { "testAddManagedRepoInvalidValues" } )
- public void testAddManagedRepoNoIdentifier()
- {
- addManagedRepository( "", "name" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
- assertTextPresent( "You must enter a repository identifier." );
- }
-
- @Test(dependsOnMethods = { "testAddManagedRepoNoIdentifier" } )
- public void testAddManagedRepoNoRepoName()
- {
- addManagedRepository( "identifier", "" , "/home" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
- assertTextPresent( "You must enter a repository name." );
- }
-
- @Test(dependsOnMethods = { "testAddManagedRepoNoRepoName" } )
- public void testAddManagedRepoNoDirectory()
- {
- addManagedRepository( "identifier", "name" , "" , "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
- assertTextPresent( "You must enter a directory." );
- }
-
- @Test(dependsOnMethods = { "testAddManagedRepoNoDirectory" } )
- public void testAddManagedRepoNoCron()
- {
- addManagedRepository( "identifier", "name" , "/home" , "/.index", "Maven 2.x Repository", "", "", "" );
- assertTextPresent( "Invalid cron expression." );
- }
-
- @Test(dependsOnMethods = { "testAddManagedRepoNoCron" } )
- public void testAddManagedRepoForEdit()
- {
- goToRepositoriesPage();
- getSelenium().open( "/archiva/admin/addRepository.action" );
- addManagedRepository( "managedrepo", "Managed Repository Sample" , getRepositoryDir() + "local-repo/", "", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
- clickButtonWithValue( "Save" );
- assertTextPresent( "Managed Repository Sample" );
- }
-
- //TODO
- @Test(dependsOnMethods = { "testAddManagedRepoForEdit" } )
- public void testEditManagedRepo()
- {
- editManagedRepository( "repository.name" , "Managed Repo" );
- assertTextPresent( "Managed Repository Sample" );
- }
-
- //TODO
- @Test(dependsOnMethods = { "testEditManagedRepo" } )
- public void testDeleteManageRepo()
- {
- deleteManagedRepository();
- //assertTextNotPresent( "managedrepo" );
- }
-
- @Test(dependsOnMethods = { "testAddRemoteRepoValidValues" } )
- public void testAddRemoteRepoNullValues()
- {
- getSelenium().open( "/archiva/admin/addRemoteRepository.action" );
- addRemoteRepository( "" , "" , "" , "" , "" , "" , "Maven 2.x Repository" );
- assertTextPresent( "You must enter a repository identifier." );
- assertTextPresent( "You must enter a repository name." );
- assertTextPresent( "You must enter a url." );
- }
-
- @Test(dependsOnMethods = { "testAddRemoteRepoNullValues" } )
- public void testAddRemoteRepositoryNullIdentifier()
- {
- addRemoteRepository( "" , "Remote Repository Sample" , "http://repository.codehaus.org/org/codehaus/mojo/" , "" , "" , "" , "Maven 2.x Repository" );
- assertTextPresent( "You must enter a repository identifier." );
- }
-
- @Test(dependsOnMethods = { "testAddRemoteRepositoryNullIdentifier" } )
- public void testAddRemoteRepoNullName()
- {
- addRemoteRepository( "remoterepo" , "" , "http://repository.codehaus.org/org/codehaus/mojo/" , "" , "" , "" , "Maven 2.x Repository" );
- assertTextPresent( "You must enter a repository name." );
- }
-
- @Test(dependsOnMethods = { "testAddRemoteRepoNullName" } )
- public void testAddRemoteRepoNullURL()
- {
- addRemoteRepository( "remoterepo" , "Remote Repository Sample" , "" , "" , "" , "" , "Maven 2.x Repository" );
- assertTextPresent( "You must enter a url." );
- }
-
- @Test(dependsOnMethods = { "testDeleteManageRepo" } )
- public void testAddRemoteRepoValidValues()
- {
- getSelenium().open( "/archiva/admin/addRemoteRepository.action" );
- addRemoteRepository( "remoterepo" , "Remote Repository Sample" , "http://repository.codehaus.org/org/codehaus/mojo/" , "" , "" , "" , "Maven 2.x Repository" );
- assertTextPresent( "Remote Repository Sample" );
- }
-
+ public void testAddManagedRepoValidValues()
+ {
+ goToRepositoriesPage();
+ getSelenium().open( "/archiva/admin/addRepository.action" );
+ addManagedRepository( "managedrepo1", "Managed Repository Sample 1", getRepositoryDir() + "repository/", "",
+ "Maven 2.x Repository", "0 0 * * * ?", "", "" );
+ clickButtonWithValue( "Save" );
+ assertTextPresent( "Managed Repository Sample 1" );
+ assertRepositoriesPage();
+ }
+
+ @Test( dependsOnMethods = { "testAddManagedRepoValidValues" } )
+ public void testAddManagedRepoInvalidValues()
+ {
+ goToRepositoriesPage();
+ getSelenium().open( "/archiva/admin/addRepository.action" );
+ addManagedRepository( "", "", "", "", "Maven 2.x Repository", "", "", "" );
+ assertTextPresent( "You must enter a repository identifier." );
+ assertTextPresent( "You must enter a repository name." );
+ assertTextPresent( "You must enter a directory." );
+ assertTextPresent( "Invalid cron expression." );
+ }
+
+ @Test( dependsOnMethods = { "testAddManagedRepoInvalidValues" } )
+ public void testAddManagedRepoNoIdentifier()
+ {
+ addManagedRepository( "", "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
+ assertTextPresent( "You must enter a repository identifier." );
+ }
+
+ @Test( dependsOnMethods = { "testAddManagedRepoNoIdentifier" } )
+ public void testAddManagedRepoNoRepoName()
+ {
+ addManagedRepository( "identifier", "", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
+ assertTextPresent( "You must enter a repository name." );
+ }
+
+ @Test( dependsOnMethods = { "testAddManagedRepoNoRepoName" } )
+ public void testAddManagedRepoNoDirectory()
+ {
+ addManagedRepository( "identifier", "name", "", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "" );
+ assertTextPresent( "You must enter a directory." );
+ }
+
+ @Test( dependsOnMethods = { "testAddManagedRepoNoDirectory" } )
+ public void testAddManagedRepoNoCron()
+ {
+ addManagedRepository( "identifier", "name", "/home", "/.index", "Maven 2.x Repository", "", "", "" );
+ assertTextPresent( "Invalid cron expression." );
+ }
+
+ @Test( dependsOnMethods = { "testAddManagedRepoNoCron" } )
+ public void testAddManagedRepoForEdit()
+ {
+ goToRepositoriesPage();
+ getSelenium().open( "/archiva/admin/addRepository.action" );
+ addManagedRepository( "managedrepo", "Managed Repository Sample", getRepositoryDir() + "local-repo/", "",
+ "Maven 2.x Repository", "0 0 * * * ?", "", "" );
+ clickButtonWithValue( "Save" );
+ assertTextPresent( "Managed Repository Sample" );
+ }
+
+ // TODO
+ @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } )
+ public void testEditManagedRepo()
+ {
+ editManagedRepository( "repository.name", "Managed Repo" );
+ assertTextPresent( "Managed Repository Sample" );
+ }
+
+ // TODO
+ @Test( dependsOnMethods = { "testEditManagedRepo" } )
+ public void testDeleteManageRepo()
+ {
+ deleteManagedRepository();
+ // assertTextNotPresent( "managedrepo" );
+ }
+
+ @Test( dependsOnMethods = { "testAddRemoteRepoValidValues" } )
+ public void testAddRemoteRepoNullValues()
+ {
+ getSelenium().open( "/archiva/admin/addRemoteRepository.action" );
+ addRemoteRepository( "", "", "", "", "", "", "Maven 2.x Repository" );
+ assertTextPresent( "You must enter a repository identifier." );
+ assertTextPresent( "You must enter a repository name." );
+ assertTextPresent( "You must enter a url." );
+ }
+
+ @Test( dependsOnMethods = { "testAddRemoteRepoNullValues" } )
+ public void testAddRemoteRepositoryNullIdentifier()
+ {
+ addRemoteRepository( "", "Remote Repository Sample", "http://repository.codehaus.org/org/codehaus/mojo/", "",
+ "", "", "Maven 2.x Repository" );
+ assertTextPresent( "You must enter a repository identifier." );
+ }
+
+ @Test( dependsOnMethods = { "testAddRemoteRepositoryNullIdentifier" } )
+ public void testAddRemoteRepoNullName()
+ {
+ addRemoteRepository( "remoterepo", "", "http://repository.codehaus.org/org/codehaus/mojo/", "", "", "",
+ "Maven 2.x Repository" );
+ assertTextPresent( "You must enter a repository name." );
+ }
+
+ @Test( dependsOnMethods = { "testAddRemoteRepoNullName" } )
+ public void testAddRemoteRepoNullURL()
+ {
+ addRemoteRepository( "remoterepo", "Remote Repository Sample", "", "", "", "", "Maven 2.x Repository" );
+ assertTextPresent( "You must enter a url." );
+ }
+
+ @Test( dependsOnMethods = { "testDeleteManageRepo" } )
+ public void testAddRemoteRepoValidValues()
+ {
+ getSelenium().open( "/archiva/admin/addRemoteRepository.action" );
+ addRemoteRepository( "remoterepo", "Remote Repository Sample",
+ "http://repository.codehaus.org/org/codehaus/mojo/", "", "", "", "Maven 2.x Repository" );
+ assertTextPresent( "Remote Repository Sample" );
+ }
+
// *** BUNDLED REPOSITORY TEST ***
-
- @Test ( dependsOnMethods = { "testWithCorrectUsernamePassword" }, alwaysRun = true )
- public void testBundledRepository()
+
+ @Test( dependsOnMethods = { "testWithCorrectUsernamePassword" }, alwaysRun = true )
+ public void testBundledRepository()
{
String repo1 = baseUrl + "repository/internal/";
String repo2 = baseUrl + "repository/snapshots/";
-
+
assertRepositoryAccess( repo1 );
assertRepositoryAccess( repo2 );
-
- getSelenium().open( "/archiva" );
+
+ getSelenium().open( "/archiva" );
}
-
+
private void assertRepositoryAccess( String repo )
{
getSelenium().open( "/archiva" );
@@ -164,4 +169,4 @@ public class RepositoryTest
assertPage( "Collection: /" );
assertTextPresent( "Collection: /" );
}
-}
+}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java?rev=931475&r1=931474&r2=931475&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java Wed Apr 7 09:27:05 2010
@@ -25,39 +25,39 @@ import org.apache.archiva.web.test.paren
import org.testng.annotations.Test;
@Test( groups = { "search" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
-public class SearchTest
- extends AbstractSearchTest
+public class SearchTest
+ extends AbstractSearchTest
{
-
- public void testSearchNonExistingArtifact()
- throws Exception
- {
- searchForArtifact( getProperty( "SEARCH_BAD_ARTIFACT" ) );
- assertTextPresent( "No results found" );
- }
-
- // TODO: make search tests more robust especially when comparing/asserting number of hits
- public void testSearchExistingArtifact()
- {
- searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) );
- assertTextPresent( "Results" );
- assertTextPresent( "Hits: 1 to 1 of 1" );
- assertLinkPresent( "test" );
- }
-
- public void testViewSearchedArtifact()
- {
- searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) );
- clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) );
- assertPage( "Apache Archiva \\ Browse Repository" );
- assertTextPresent( getProperty( "ARTIFACT_ARTIFACTID" ) );
- clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" );
- assertPage( "Apache Archiva \\ Browse Repository" );
+
+ public void testSearchNonExistingArtifact()
+ throws Exception
+ {
+ searchForArtifact( getProperty( "SEARCH_BAD_ARTIFACT" ) );
+ assertTextPresent( "No results found" );
}
-
- public void testSearchNonExistingArtifactInAdvancedSearch()
+
+ // TODO: make search tests more robust especially when comparing/asserting number of hits
+ public void testSearchExistingArtifact()
+ {
+ searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) );
+ assertTextPresent( "Results" );
+ assertTextPresent( "Hits: 1 to 1 of 1" );
+ assertLinkPresent( "test" );
+ }
+
+ public void testViewSearchedArtifact()
{
- searchForArtifactAdvancedSearch( null, getProperty( "SEARCH_BAD_ARTIFACT"), null, null, null, null );
+ searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) );
+ clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) );
+ assertPage( "Apache Archiva \\ Browse Repository" );
+ assertTextPresent( getProperty( "ARTIFACT_ARTIFACTID" ) );
+ clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" );
+ assertPage( "Apache Archiva \\ Browse Repository" );
+ }
+
+ public void testSearchNonExistingArtifactInAdvancedSearch()
+ {
+ searchForArtifactAdvancedSearch( null, getProperty( "SEARCH_BAD_ARTIFACT" ), null, null, null, null );
assertTextPresent( "No results found" );
}
@@ -69,27 +69,28 @@ public class SearchTest
public void testSearchExistingArtifactUsingAdvancedSearchArtifactId()
{
- searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, getProperty( "REPOSITORYID" ), null, null );
- assertTextPresent( "Results" );
- assertTextPresent( "Hits: 1 to 1 of 1" );
- assertLinkPresent( "test" );
+ searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null,
+ getProperty( "REPOSITORYID" ), null, null );
+ assertTextPresent( "Results" );
+ assertTextPresent( "Hits: 1 to 1 of 1" );
+ assertLinkPresent( "test" );
}
-
+
public void testSearchExistingArtifactUsingAdvancedSearchGroupId()
{
- searchForArtifactAdvancedSearch( getProperty( "GROUPID" ), null, null, getProperty( "REPOSITORYID" ), null, null );
+ searchForArtifactAdvancedSearch( getProperty( "GROUPID" ), null, null, getProperty( "REPOSITORYID" ), null,
+ null );
assertTextPresent( "Results" );
assertTextPresent( "Hits: 1 to 1 of 1" );
- assertLinkPresent( "test" );
+ assertLinkPresent( "test" );
}
-
+
public void testSearchExistingArtifactUsingAdvancedSearchNotInRepository()
{
searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, "snapshots", null, null );
assertTextPresent( "No results found" );
assertTextNotPresent( "Results" );
assertTextNotPresent( "Hits: 1 to 1 of 1" );
- assertLinkNotPresent( "test" );
+ assertLinkNotPresent( "test" );
}
}
-