You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/02/12 15:47:09 UTC
svn commit: r909436 - in
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test:
./ src/test/testng/org/apache/archiva/web/test/
src/test/testng/org/apache/archiva/web/test/parent/
Author: brett
Date: Fri Feb 12 14:47:09 2010
New Revision: 909436
URL: http://svn.apache.org/viewvc?rev=909436&view=rev
Log:
merge -r909422:909434 from trunk to fix Selenium tests
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/ (props changed)
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/parent/AbstractArtifactManagementTest.java
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb 12 14:47:09 2010
@@ -0,0 +1,6 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp-test:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp-test:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp-test:699795-705848
+/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp-test:898632
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test:825850-909070,909423-909434
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=909436&r1=909435&r2=909436&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 14:47:09 2010
@@ -81,7 +81,7 @@
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 @@
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 @@
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 @@
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" ) );
}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java?rev=909436&r1=909435&r2=909436&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java Fri Feb 12 14:47:09 2010
@@ -41,6 +41,7 @@
public void goToDeleteArtifactPage()
{
+ login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) );
clickLinkWithText( "Delete Artifact" );
assertDeleteArtifactPage();
}