diff options
| author | Brett Porter <brett@apache.org> | 2010-02-12 14:47:09 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2010-02-12 14:47:09 +0000 |
| commit | 5bb1dbf6f2c01958fc22bab0e0a9b584fa588fa3 (patch) | |
| tree | 7b88f2dbbd713cdb7c34bdb14429ebebe9a10f44 /archiva-modules | |
| parent | 378090d19855d0acc4b9613f8569a8a7d52d31ee (diff) | |
| download | archiva-5bb1dbf6f2c01958fc22bab0e0a9b584fa588fa3.tar.gz archiva-5bb1dbf6f2c01958fc22bab0e0a9b584fa588fa3.zip | |
merge -r909422:909434 from trunk to fix Selenium tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@909436 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
2 files changed, 11 insertions, 10 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java index 2b5e4abd9..fdc26b789 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java @@ -81,7 +81,7 @@ public class AuditLogsReportTest assertAuditLogsReportPage(); assertTextPresent( "Results" ); assertTextNotPresent( "No audit logs found." ); - assertTextPresent( "test-1.0.jar" ); + assertTextPresent( "testAddArtifactValidValues-1.0.jar" ); assertTextPresent( "Uploaded File" ); assertTextPresent( "internal" ); assertTextPresent( "admin" ); @@ -101,7 +101,7 @@ public class AuditLogsReportTest assertAuditLogsReportPage(); assertTextPresent( "Results" ); assertTextNotPresent( "No audit logs found." ); - assertTextPresent( "test-1.0.jar" ); + assertTextPresent( "testAddArtifactValidValues-1.0.jar" ); assertTextPresent( "Uploaded File" ); assertTextPresent( "internal" ); assertTextPresent( "admin" ); @@ -120,7 +120,7 @@ public class AuditLogsReportTest assertAuditLogsReportPage(); assertTextPresent( "Results" ); assertTextNotPresent( "No audit logs found." ); - assertTextPresent( "test-1.0.jar" ); + assertTextPresent( "testAddArtifactValidValues-1.0.jar" ); assertTextPresent( "Uploaded File" ); assertTextPresent( "internal" ); assertTextPresent( "admin" ); @@ -141,23 +141,23 @@ public class AuditLogsReportTest clickLinkWithText( "Logout" ); - login( getProperty( "REPOMANAGER_INTERNAL_USERNAME" ), getUserRolePassword() ); - goToAuditLogReports(); + login( getProperty( "REPOMANAGER_INTERNAL_USERNAME" ), getUserRoleNewPassword() ); + + goToAuditLogReports(); assertAuditLogsReportPage(); - + selectValue( "repository", "all" ); submit(); - + assertAuditLogsReportPage(); assertTextPresent( "Results" ); assertTextNotPresent( "No audit logs found." ); - assertTextPresent( "test-1.0.jar" ); + assertTextPresent( "testAddArtifactValidValues-1.0.jar" ); assertTextPresent( "Uploaded File" ); assertTextPresent( "internal" ); assertTextPresent( "admin" ); - + assertTextNotPresent( artifactId + "-" + version + "." + packaging ); - clickLinkWithText( "Logout" ); login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) ); } diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java index 29486cd10..04f5242a7 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java @@ -41,6 +41,7 @@ public abstract class AbstractArtifactManagementTest public void goToDeleteArtifactPage() { + login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) ); clickLinkWithText( "Delete Artifact" ); assertDeleteArtifactPage(); } |