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 2011/04/13 05:28:46 UTC
svn commit: r1091636 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
Author: brett
Date: Wed Apr 13 03:28:45 2011
New Revision: 1091636
URL: http://svn.apache.org/viewvc?rev=1091636&view=rev
Log:
[MRM-1111] fix xpath after reverting to default freemarker templates
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java
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=1091636&r1=1091635&r2=1091636&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 Wed Apr 13 03:28:45 2011
@@ -47,10 +47,15 @@ public class RepositoryScanningTest
{
setFieldValue( "newpattern_0", "**/*.zip" );
clickAddIcon( "newpattern_0" );
- Assert.assertEquals( getSelenium().getText( "//ul[@class='errorMessage']/li/span" ),
+ Assert.assertEquals( getErrorMessageText(),
"Not adding pattern \"**/*.zip\" to filetype artifacts as it already exists." );
}
+ private static String getErrorMessageText()
+ {
+ return getSelenium().getText( "//ul[@class='errorMessage']/li/span" );
+ }
+
@Test( dependsOnMethods = { "testAddArtifactFileType_ExistingValue" } )
public void testDeleteArtifactFileType()
{
@@ -72,7 +77,7 @@ public class RepositoryScanningTest
{
setFieldValue( "newpattern_1", "**/*-" );
clickAddIcon( "newpattern_1" );
- Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ Assert.assertEquals( getErrorMessageText(),
"Not adding pattern \"**/*-\" to filetype auto-remove as it already exists." );
}
@@ -97,7 +102,7 @@ public class RepositoryScanningTest
{
setFieldValue( "newpattern_2", "" );
clickAddIcon( "newpattern_2" );
- Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ Assert.assertEquals( getErrorMessageText(),
"Unable to process blank pattern." );
}
@@ -106,7 +111,7 @@ public class RepositoryScanningTest
{
setFieldValue( "newpattern_2", "**/*.sh" );
clickAddIcon( "newpattern_2" );
- Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ Assert.assertEquals( getErrorMessageText(),
"Not adding pattern \"**/*.sh\" to filetype ignored as it already exists." );
}
@@ -132,7 +137,7 @@ public class RepositoryScanningTest
{
setFieldValue( "newpattern_3", "" );
clickAddIcon( "newpattern_3" );
- Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ Assert.assertEquals( getErrorMessageText(),
"Unable to process blank pattern." );
}
@@ -141,7 +146,7 @@ public class RepositoryScanningTest
{
setFieldValue( "newpattern_3", "**/*.xml" );
clickAddIcon( "newpattern_3" );
- Assert.assertEquals( getSelenium().getText( "//span[@class='errorMessage']" ),
+ Assert.assertEquals( getErrorMessageText(),
"Not adding pattern \"**/*.xml\" to filetype indexable-content as it already exists." );
}