Author: jzurbano
Date: Sun Jul 4 11:27:10 2010
New Revision: 960322
URL: http://svn.apache.org/viewvc?rev=960322&view=rev
Log:
[MRM-1394] - Replace the use of clickLinkWithText() with getSelenium().open()
for accessing navigation menu pages
merge -r 960310:960311 from 1.3.x branch
Modified:
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/RepositoryScanningTest.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/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
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=960322&r1=960321&r2=960322&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
Sun Jul 4 11:27:10 2010
@@ -28,7 +28,7 @@ public class AuditLogsReportTest
{
private void goToAuditLogReports()
{
- clickLinkWithText( "Audit Log Report" );
+ getSelenium().open( "/archiva/report/queryAuditLogReport.action" );
}
private void assertAuditLogsReportPage()
@@ -188,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=960322&r1=960321&r2=960322&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
Sun Jul 4 11:27:10 2010
@@ -50,6 +50,7 @@ public class BrowseTest
assertBrowsePage();
}
+ @Test( dependsOnMethods = { "testAddArtifactValidValues" } )
public void testClickArtifactFromBrowse()
{
goToBrowsePage();
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=960322&r1=960321&r2=960322&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
Sun Jul 4 11:27:10 2010
@@ -30,7 +30,7 @@ public class RepositoryScanningTest
public void testAddArtifactFileType_NullValue()
{
goToRepositoryScanningPage();
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
+ clickAddIcon( "newpattern_0" );
assertTextPresent( "Unable to process blank pattern." );
}
@@ -38,7 +38,7 @@ public class RepositoryScanningTest
public void testAddArtifactFileType()
{
setFieldValue( "newpattern_0", "**/*.dll" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
+ clickAddIcon( "newpattern_0" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[1]/table.13.0" ), "**/*.dll" );
}
@@ -46,7 +46,7 @@ public class RepositoryScanningTest
public void testAddArtifactFileType_ExistingValue()
{
setFieldValue( "newpattern_0", "**/*.zip" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[1]/table/tbody/tr[15]/td[2]/a/img" );
+ clickAddIcon( "newpattern_0" );
Assert.assertEquals( getSelenium().getText(
"//sp...@class='errorMessage']" ),
"Not adding pattern \"**/*.zip\" to filetype
artifacts as it already exists." );
}
@@ -55,7 +55,7 @@ public class RepositoryScanningTest
public void testDeleteArtifactFileType()
{
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[1]/table.13.0" ), "**/*.dll" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[1]/table/tbody/tr[14]/td[2]/a/img" );
+ clickDeleteIcon( "**/*.dll" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[1]/table.13.0" ), "" );
}
@@ -63,7 +63,7 @@ public class RepositoryScanningTest
public void testAddAutoRemove_NullValue()
{
setFieldValue( "newpattern_1", "" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ clickAddIcon( "newpattern_1" );
assertTextPresent( "Unable to process blank pattern." );
}
@@ -71,7 +71,7 @@ public class RepositoryScanningTest
public void testAddAutoRemove_ExistingValue()
{
setFieldValue( "newpattern_1", "**/*-" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ clickAddIcon( "newpattern_1" );
Assert.assertEquals( getSelenium().getText(
"//sp...@class='errorMessage']" ),
"Not adding pattern \"**/*-\" to filetype
auto-remove as it already exists." );
}
@@ -80,7 +80,7 @@ public class RepositoryScanningTest
public void testAddAutoRemove()
{
setFieldValue( "newpattern_1", "**/*.test" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ clickAddIcon( "newpattern_1" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[2]/table.3.0" ), "**/*.test" );
}
@@ -88,7 +88,7 @@ public class RepositoryScanningTest
public void testDeleteAutoRemove()
{
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[2]/table.3.0" ), "**/*.test" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[2]/table/tbody/tr[4]/td[2]/a/img" );
+ clickDeleteIcon( "**/*.test" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[2]/table.3.0" ), "" );
}
@@ -96,7 +96,7 @@ public class RepositoryScanningTest
public void testAddIgnoredArtifacts_NullValue()
{
setFieldValue( "newpattern_2", "" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ clickAddIcon( "newpattern_2" );
Assert.assertEquals( getSelenium().getText(
"//sp...@class='errorMessage']" ),
"Unable to process blank pattern." );
}
@@ -105,7 +105,7 @@ public class RepositoryScanningTest
public void testAddIgnoredArtifacts_ExistingValue()
{
setFieldValue( "newpattern_2", "**/*.sh" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ clickAddIcon( "newpattern_2" );
Assert.assertEquals( getSelenium().getText(
"//sp...@class='errorMessage']" ),
"Not adding pattern \"**/*.sh\" to filetype
ignored as it already exists." );
}
@@ -114,7 +114,7 @@ public class RepositoryScanningTest
public void testAddIgnoredArtifacts()
{
setFieldValue( "newpattern_2", "**/*.log" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ clickAddIcon( "newpattern_2" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[3]/table.6.0" ), "**/*.log" );
}
@@ -122,7 +122,7 @@ public class RepositoryScanningTest
public void testDeleteIgnoredArtifacts()
{
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[3]/table.6.0" ), "**/*.log" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[3]/table/tbody/tr[7]/td[2]/a/img" );
+ clickDeleteIcon( "**/*.log" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[3]/table.6.0" ), "" );
}
@@ -131,7 +131,7 @@ public class RepositoryScanningTest
public void testAddIndexableContent_NullValue()
{
setFieldValue( "newpattern_3", "" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ clickAddIcon( "newpattern_3" );
Assert.assertEquals( getSelenium().getText(
"//sp...@class='errorMessage']" ),
"Unable to process blank pattern." );
}
@@ -140,7 +140,7 @@ public class RepositoryScanningTest
public void testAddIndexableContent_ExistingValue()
{
setFieldValue( "newpattern_3", "**/*.xml" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ clickAddIcon( "newpattern_3" );
Assert.assertEquals( getSelenium().getText(
"//sp...@class='errorMessage']" ),
"Not adding pattern \"**/*.xml\" to filetype
indexable-content as it already exists." );
}
@@ -149,7 +149,7 @@ public class RepositoryScanningTest
public void testAddIndexableContent()
{
setFieldValue( "newpattern_3", "**/*.html" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ clickAddIcon( "newpattern_3" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[4]/table.9.0" ), "**/*.html" );
}
@@ -157,7 +157,7 @@ public class RepositoryScanningTest
public void testDeleteIndexableContent()
{
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[4]/table.9.0" ), "**/*.html" );
- clickLinkWithXPath(
"//d...@id='contentArea']/div/div[4]/table/tbody/tr[10]/td[2]/a/img" );
+ clickDeleteIcon( "**/*.html" );
Assert.assertEquals( getSelenium().getTable(
"//d...@id='contentArea']/div/div[4]/table.9.0" ), "" );
}
@@ -184,5 +184,17 @@ public class RepositoryScanningTest
assertPage( "Apache Archiva \\ Administration - Repository Scanning" );
}
+
+ private void clickAddIcon( String fieldId )
+ {
+ String xPath = "//preceding::td/inp...@id='" + fieldId +
"']//following::td/a/img";
+ clickLinkWithLocator( xPath );
+ }
+
+ private void clickDeleteIcon( String pattern )
+ {
+ String xPath = "//preceding::td/code[contains(text(),'" + pattern +
"')]//following::td/a/img";
+ clickLinkWithLocator( xPath );
+ }
-}
\ No newline at end of file
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java?rev=960322&r1=960321&r2=960322&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
Sun Jul 4 11:27:10 2010
@@ -51,6 +51,7 @@ public class VirtualRepositoryTest
@Test( dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } )
public void testDeleteRepositoryOfRepositoryGroup()
{
+ goToRepositoryGroupsPage();
deleteRepositoryInRepositoryGroups();
assertTextPresent( "Repository Groups" );
assertTextNotPresent( "No Repository Groups Defined." );
@@ -65,4 +66,4 @@ public class VirtualRepositoryTest
assertTextPresent( "No Repository Groups Defined." );
}
-}
\ No newline at end of file
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=960322&r1=960321&r2=960322&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
Sun Jul 4 11:27:10 2010
@@ -147,7 +147,7 @@ public abstract class AbstractArchivaTes
// User Management
public void goToUserManagementPage()
{
- clickLinkWithText( "User Management" );
+ getSelenium().open( "/archiva/security/userlist.action" );
assertUserManagementPage();
}
@@ -216,7 +216,7 @@ public abstract class AbstractArchivaTes
boolean valid )
{
// login( getAdminUsername() , getAdminPassword() );
- clickLinkWithText( "User Management" );
+ getSelenium().open( "/archiva/security/userlist.action" );
clickButtonWithValue( "Create New User" );
assertCreateUserPage();
setFieldValue( "user.username", userName );
@@ -418,7 +418,7 @@ public abstract class AbstractArchivaTes
// Find Artifact
public void goToFindArtifactPage()
{
- clickLinkWithText( "Find Artifact" );
+ getSelenium().open( "/archiva/findArtifact.action" );
assertFindArtifactPage();
}
@@ -435,7 +435,7 @@ public abstract class AbstractArchivaTes
// Appearance
public void goToAppearancePage()
{
- clickLinkWithText( "Appearance" );
+ getSelenium().open( "/archiva/admin/configureAppearance.action" );
assertAppearancePage();
}
@@ -462,7 +462,7 @@ public abstract class AbstractArchivaTes
// Upload Artifact
public void goToAddArtifactPage()
{
- clickLinkWithText( "Upload Artifact" );
+ getSelenium().open( "/archiva/upload.action" );
assertAddArtifactPage();
}
@@ -532,7 +532,7 @@ public abstract class AbstractArchivaTes
{
if ( !getTitle().equals( "Apache Archiva \\ Administration -
Repositories" ) )
{
- clickLinkWithText( "Repositories" );
+ getSelenium().open( "/archiva/admin/repositories.action" );
}
assertRepositoriesPage();
}
@@ -570,4 +570,4 @@ public abstract class AbstractArchivaTes
assertLinkNotPresent( "Logout" );
assertLinkPresent( "Login" );
}
-}
\ No newline at end of file
+}
Modified:
archiva/trunk/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/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java?rev=960322&r1=960321&r2=960322&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
Sun Jul 4 11:27:10 2010
@@ -61,7 +61,7 @@ public abstract class AbstractArtifactMa
public void goToDeleteArtifactPage()
{
login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD"
) );
- clickLinkWithText( "Delete Artifact" );
+ getSelenium().open( "/archiva/deleteArtifact.action" );
assertDeleteArtifactPage();
}
@@ -93,7 +93,7 @@ public abstract class AbstractArtifactMa
// Legacy Support
public void goToLegacySupportPage()
{
- clickLinkWithText( "Legacy Support" );
+ getSelenium().open( "/archiva/admin/legacyArtifactPath.action" );
assertLegacySupportPage();
}
@@ -130,4 +130,4 @@ public abstract class AbstractArtifactMa
assertElementPresent( arrayelement );
assertButtonWithValuePresent( "Add Legacy Artifact Path" );
}
-}
\ No newline at end of file
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java?rev=960322&r1=960321&r2=960322&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
Sun Jul 4 11:27:10 2010
@@ -26,7 +26,7 @@ public abstract class AbstractArtifactRe
// Reports
public void goToReportsPage()
{
- clickLinkWithText( "Reports" );
+ getSelenium().open( "/archiva/report/pickReport.action" );
assertReportsPage();
}
@@ -77,4 +77,4 @@ public abstract class AbstractArtifactRe
clickButtonWithValue( "View Statistics" );
}
-}
\ No newline at end of file
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java?rev=960322&r1=960321&r2=960322&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
Sun Jul 4 11:27:10 2010
@@ -26,7 +26,7 @@ public abstract class AbstractBrowseTest
// Browse
public void goToBrowsePage()
{
- clickLinkWithText( "Browse" );
+ getSelenium().open( "/archiva/browse" );
assertBrowsePage();
}
@@ -37,4 +37,4 @@ public abstract class AbstractBrowseTest
assertTextPresent( "Groups" );
}
-}
\ No newline at end of file
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=960322&r1=960321&r2=960322&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
Sun Jul 4 11:27:10 2010
@@ -30,7 +30,7 @@ public abstract class AbstractRepository
{
if ( !getTitle().equals( "Apache Archiva \\ Administration -
Repository Groups" ) )
{
- clickLinkWithText( "Repository Groups" );
+ getSelenium().open( "/archiva/admin/repositoryGroups.action" );
}
assertRepositoryGroupsPage();
}
@@ -383,4 +383,4 @@ public abstract class AbstractRepository
assertTextPresent( "Database - Unprocessed Artifacts Scanning" );
assertTextPresent( "Database - Artifact Cleanup Scanning" );
}
-}
\ No newline at end of file
+}
