Author: oching
Date: Mon Jun 7 09:56:57 2010
New Revision: 952174
URL: http://svn.apache.org/viewvc?rev=952174&view=rev
Log:
[MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a
"generic metadata" plugin
o updated selenium test for deleting metadata
o added selenium tests for adding generic metadata property
Modified:
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/parent/AbstractSeleniumTest.java
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=952174&r1=952173&r2=952174&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
Mon Jun 7 09:56:57 2010
@@ -139,84 +139,67 @@ public class BrowseTest
Assert.assertTrue( secondSnapshotVersion.endsWith( "-2" ) );
}
- public void testMetadataPageDisplay()
+ public void testAddMetadataPropertyEmpty()
{
goToBrowsePage();
clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" );
clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" );
clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" );
clickLinkWithText( "Metadata" );
-
- assertMinimalMetadataDisplay();
- }
-
- public void testDeleteMetadataDependency()
- {
- String depArtifactId = "testArtifactId";
-
- goToBrowsePage();
- clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" );
- clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" );
- clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" );
- clickLinkWithText( "Metadata" );
-
- assertMinimalMetadataDisplay();
- assertTextPresent( "dependencies" );
- assertTextPresent( depArtifactId );
-
- String xPath = "//li[contains(text(),'" + depArtifactId +
"')]/a/img[contains(@src,'delete.gif')]";
- clickLinkWithXPath( xPath );
-
- assertTextNotPresent( depArtifactId );
+
+ assertTextPresent( "No metadata content." );
+ assertButtonWithValuePresent( "Add" );
+
+ clickButtonWithValue( "Add" );
+
+ waitPage();
+
+ assertTextPresent( "Property Name and Property Value are required." );
}
-
- public void testDeleteMetadataMailingList()
+
+ @Test( dependsOnMethods = { "testAddMetadataPropertyEmpty" } )
+ public void testAddMetadataProperty()
{
- String listName = "test user list";
-
goToBrowsePage();
clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" );
clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" );
clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" );
clickLinkWithText( "Metadata" );
-
- assertMinimalMetadataDisplay();
- assertTextPresent( "mailingLists" );
- assertTextPresent( listName );
-
- String xPath = "//li[contains(text(),'" + listName +
"')]/a/img[contains(@src,'delete.gif')]";
- clickLinkWithXPath( xPath );
-
- assertTextNotPresent( listName );
+
+ assertTextPresent( "No metadata content." );
+ assertButtonWithValuePresent( "Add" );
+
+ setFieldValue( "propertyName", "foo" );
+ setFieldValue( "propertyValue", "bar" );
+
+ clickButtonWithValue( "Add" );
+
+ waitPage();
+
+ assertTextNotPresent( "No metadata content." );
+ assertTextPresent( "foo=bar" );
}
-
- public void testDeleteMetadataLicense()
+
+ @Test( dependsOnMethods = { "testAddMetadataProperty" } )
+ public void testDeleteMetadataProperty()
{
- String licenseName = "Test License";
-
goToBrowsePage();
clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" );
clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" );
clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" );
clickLinkWithText( "Metadata" );
-
- assertMinimalMetadataDisplay();
- assertTextPresent( "licenses" );
- assertTextPresent( licenseName );
-
- String xPath = "//li[contains(text(),'" + licenseName +
"')]/a/img[contains(@src,'delete.gif')]";
- clickLinkWithXPath( xPath );
-
- assertTextNotPresent( licenseName );
- assertTextNotPresent( "licenses" );
- }
-
- private void assertMinimalMetadataDisplay()
- {
- assertTextPresent( "project.metadata.id=" );
- assertTextPresent( "project.url=" );
- assertTextPresent( "project.name=" );
- assertTextPresent( "project.description=" );
+
+ assertTextPresent( "foo=bar" );
+ assertButtonWithValuePresent( "Add" );
+
+ clickImgWithAlt( "Delete" );
+
+ waitPage();
+
+ assertTextNotPresent( "foo=bar" );
+ assertTextPresent( "Property successfully deleted." );
+ assertImgWithAltNotPresent( "Delete" );
+ assertTextPresent( "No metadata content." );
}
private void assertArtifactInfoPage( String version, String
artifactInfoRepositoryId, String artifactInfoGroupId,
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.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/AbstractSeleniumTest.java?rev=952174&r1=952173&r2=952174&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Mon Jun 7 09:56:57 2010
@@ -201,6 +201,11 @@ public abstract class AbstractSeleniumTe
assertElementPresent( locator );
}
+
+ public void assertImgWithAltNotPresent( String alt )
+ {
+ assertElementNotPresent( "/¯i...@alt='" + alt + "']" );
+ }
public void assertCellValueFromTable( String expected, String
tableElement, int row, int column )
{
