Author: jzurbano
Date: Sun Jul 4 09:28:02 2010
New Revision: 960311
URL: http://svn.apache.org/viewvc?rev=960311&view=rev
Log:
[MRM-1394] - Replace the use of clickLinkWithText() with getSelenium().open()
for accessing navigation menu pages
* replaced clickLinkWithText() with getSelenium().open()
* added clickAddIcon() and clickDeleteIcon() to be used instead of
clickLinkWithXPath() in RepositoryScanningTest
* added dependsOnMethods in testClickArtifactFromBrowse of BrowseTest
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
Modified:
archiva/branches/archiva-1.3.x/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/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
Sun Jul 4 09:28:02 2010
@@ -28,7 +28,7 @@ public class AuditLogsReportTest
{
private void goToAuditLogReports()
{
- clickLinkWithText( "Audit Log Report" );
+ getSelenium().open( "/archiva/report/queryAuditLogReport.action" );
}
private void assertAuditLogsReportPage()
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
Sun Jul 4 09:28:02 2010
@@ -36,6 +36,7 @@ public class BrowseTest
assertBrowsePage();
}
+ @Test( dependsOnMethods = { "testAddArtifactValidValues" } )
public void testClickArtifactFromBrowse()
{
goToBrowsePage();
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
Sun Jul 4 09:28:02 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." );
}
@@ -54,7 +54,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"),
"" );
}
@@ -62,7 +62,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." );
}
@@ -70,7 +70,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." );
}
@@ -78,7 +78,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" );
}
@@ -86,7 +86,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"),
"" );
}
@@ -94,7 +94,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." );
}
@@ -102,7 +102,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." );
}
@@ -110,7 +110,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" );
}
@@ -118,7 +118,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"),
"" );
}
@@ -127,7 +127,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." );
}
@@ -135,7 +135,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." );
}
@@ -143,7 +143,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" );
}
@@ -151,7 +151,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"),
"" );
}
@@ -180,4 +180,16 @@ 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 );
+ }
+
}
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
Sun Jul 4 09:28:02 2010
@@ -29,7 +29,7 @@ public class RepositoryTest
public void testAddManagedRepoValidValues()
{
goToRepositoriesPage();
- clickLinkWithLocator(
"//d...@id='contentArea']/div/div/a...@href='/archiva/admin/addRepository.action']"
);
+ 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" );
@@ -40,7 +40,7 @@ public class RepositoryTest
public void testAddManagedRepoInvalidValues()
{
goToRepositoriesPage();
- clickLinkWithLocator(
"//d...@id='contentArea']/div/div/a...@href='/archiva/admin/addRepository.action']"
);
+ 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." );
@@ -105,7 +105,7 @@ public class RepositoryTest
@Test(dependsOnMethods = { "testAddRemoteRepoValidValues" } )
public void testAddRemoteRepoNullValues()
{
- clickLinkWithLocator(
"//d...@id='contentArea']/div/div/a...@href='/archiva/admin/addRemoteRepository.action']"
);
+ 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." );
@@ -136,7 +136,7 @@ public class RepositoryTest
@Test(dependsOnMethods = { "testDeleteManageRepo" } )
public void testAddRemoteRepoValidValues()
{
- clickLinkWithLocator(
"//d...@id='contentArea']/div/div/a...@href='/archiva/admin/addRemoteRepository.action']"
);
+ 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" );
}
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
Sun Jul 4 09:28:02 2010
@@ -53,6 +53,7 @@ public class VirtualRepositoryTest
@Test(dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } )
public void testDeleteRepositoryOfRepositoryGroup()
{
+ goToRepositoryGroupsPage();
deleteRepositoryInRepositoryGroups();
assertTextPresent( "Repository Groups" );
assertTextNotPresent( "No Repository Groups Defined." );
Modified:
archiva/branches/archiva-1.3.x/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/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
Sun Jul 4 09:28:02 2010
@@ -146,7 +146,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
private void createUser( String userName, String fullName, String
emailAd, String password, String confirmPassword, boolean valid )
{
//login( getAdminUsername() , getAdminPassword() );
- clickLinkWithText( "User Management" );
+ getSelenium().open( "/archiva/security/userlist.action" );
clickButtonWithValue( "Create New User" );
assertCreateUserPage();
setFieldValue( "user.username", userName );
@@ -409,7 +409,7 @@ public abstract class AbstractArchivaTes
//Find Artifact
public void goToFindArtifactPage()
{
- clickLinkWithText( "Find Artifact" );
+ getSelenium().open( "/archiva/findArtifact.action" );
assertFindArtifactPage();
}
@@ -426,7 +426,7 @@ public abstract class AbstractArchivaTes
//Appearance
public void goToAppearancePage()
{
- clickLinkWithText( "Appearance" );
+ getSelenium().open( "/archiva/admin/configureAppearance.action"
);
assertAppearancePage();
}
@@ -452,7 +452,7 @@ public abstract class AbstractArchivaTes
// Upload Artifact
public void goToAddArtifactPage()
{
- clickLinkWithText( "Upload Artifact" );
+ getSelenium().open( "/archiva/upload.action" );
assertAddArtifactPage();
}
@@ -522,7 +522,7 @@ public abstract class AbstractArchivaTes
{
if( !getTitle().equals( "Apache Archiva \\ Administration -
Repositories" ) )
{
- clickLinkWithText( "Repositories" );
+ getSelenium().open( "/archiva/admin/repositories.action" );
}
assertRepositoriesPage();
}
Modified:
archiva/branches/archiva-1.3.x/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/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
Sun Jul 4 09:28:02 2010
@@ -42,7 +42,7 @@ public abstract class AbstractArtifactMa
public void goToDeleteArtifactPage()
{
login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD"
) );
- clickLinkWithText( "Delete Artifact" );
+ getSelenium().open( "/archiva/deleteArtifact.action" );
assertDeleteArtifactPage();
}
@@ -74,7 +74,7 @@ public abstract class AbstractArtifactMa
// Legacy Support
public void goToLegacySupportPage()
{
- clickLinkWithText( "Legacy Support" );
+ getSelenium().open( "/archiva/admin/legacyArtifactPath.action"
);
assertLegacySupportPage();
}
Modified:
archiva/branches/archiva-1.3.x/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/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
Sun Jul 4 09:28:02 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/branches/archiva-1.3.x/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/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
Sun Jul 4 09:28:02 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/branches/archiva-1.3.x/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/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=960311&r1=960310&r2=960311&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
Sun Jul 4 09:28:02 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();
}
@@ -67,7 +67,7 @@ public abstract class AbstractRepository
assertPage( "Apache Archiva \\ Admin: Delete Repository Group"
);
assertTextPresent( "WARNING: This operation can not be undone."
);
assertTextPresent( "Are you sure you want to delete the
following repository group?" );
- assertTextPresent( "ID: " + repositoryName );
+ assertElementPresent(
"//preceding::td[text()='ID:']//following::td/code[text()='" + repositoryName +
"']" );
assertButtonWithValuePresent( "Confirm" );
assertButtonWithValuePresent( "Cancel" );
}
