Author: brett
Date: Mon Oct 3 03:34:40 2011
New Revision: 1178289
URL: http://svn.apache.org/viewvc?rev=1178289&view=rev
Log:
fix tests that check duplicate artifacts are not added to the lists
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.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/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java?rev=1178289&r1=1178288&r2=1178289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
Mon Oct 3 03:34:40 2011
@@ -82,11 +82,12 @@ public abstract class AbstractRepository
}
catch ( RegistryException e )
{
- throw new RepositoryAdminException( "Error occurred in the
registry.", e );
+ throw new RepositoryAdminException( "Error occurred in the
registry: " + e.getLocalizedMessage(), e );
}
catch ( IndeterminateConfigurationException e )
{
- throw new RepositoryAdminException( "Error occurred while saving
the configuration.", e );
+ throw new RepositoryAdminException(
+ "Error occurred while saving the configuration: " +
e.getLocalizedMessage(), e );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java?rev=1178289&r1=1178288&r2=1178289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
Mon Oct 3 03:34:40 2011
@@ -110,6 +110,11 @@ public class DefaultArchivaAdministratio
{
return;
}
+
+ if ( fileType.getPatterns().contains( pattern ) )
+ {
+ throw new RepositoryAdminException( "File type [" + fileTypeId +
"] already contains pattern [" + pattern + "]" );
+ }
fileType.addPattern( pattern );
saveConfiguration( configuration );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java?rev=1178289&r1=1178288&r2=1178289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
Mon Oct 3 03:34:40 2011
@@ -114,6 +114,22 @@ public class ArchivaAdministrationTest
mockAuditListener.clearEvents();
}
+ @Test(expected = RepositoryAdminException.class)
+ public void addFileTypePatternAgain()
+ throws RepositoryAdminException
+ {
+ try
+ {
+ archivaAdministration.addFileTypePattern( "artifacts", "**/*.jar",
getFakeAuditInformation() );
+ }
+ catch ( RepositoryAdminException e )
+ {
+ // check the message
+ assertEquals( "File type [artifacts] already contains pattern
[**/*.jar]", e.getMessage() );
+ throw e;
+ }
+ }
+
@Test
public void knownContentConsumersTest()
throws Exception
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=1178289&r1=1178288&r2=1178289&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
Mon Oct 3 03:34:40 2011
@@ -43,15 +43,13 @@ public class RepositoryScanningTest
Assert.assertEquals( getSelenium().getTable(
"//div[@id='contentArea']/div/div[1]/table.13.0" ), "**/*.dll" );
}
- @Test( dependsOnMethods = { "testAddArtifactFileType" }, enabled = false )
+ @Test( dependsOnMethods = { "testAddArtifactFileType" } )
public void testAddArtifactFileType_ExistingValue()
{
goToRepositoryScanningPage();
- // FIXME: broken
setFieldValue( "newpattern_0", "**/*.zip" );
clickAddIcon( "newpattern_0" );
- Assert.assertEquals( getErrorMessageText(),
- "Not adding pattern \"**/*.zip\" to filetype
artifacts as it already exists." );
+ Assert.assertEquals( getErrorMessageText(), "File type [artifacts]
already contains pattern [**/*.zip]" );
}
@Test( dependsOnMethods = { "testAddArtifactFileType" } )
@@ -74,15 +72,13 @@ public class RepositoryScanningTest
assertTextPresent( "Unable to process blank pattern." );
}
- @Test( dependsOnMethods = { "testAddAutoRemove_NullValue" }, enabled =
false )
+ @Test( dependsOnMethods = { "testAddAutoRemove_NullValue" } )
public void testAddAutoRemove_ExistingValue()
{
goToRepositoryScanningPage();
setFieldValue( "newpattern_1", "**/*-" );
clickAddIcon( "newpattern_1" );
- // FIXME: broken
- Assert.assertEquals( getErrorMessageText(),
- "Not adding pattern \"**/*-\" to filetype
auto-remove as it already exists." );
+ Assert.assertEquals( getErrorMessageText(), "File type [auto-remove]
already contains pattern [**/*-]" );
}
@Test( dependsOnMethods = { "testAddAutoRemove_NullValue" } )
@@ -115,15 +111,13 @@ public class RepositoryScanningTest
"Unable to process blank pattern." );
}
- @Test(enabled = false)
+ @Test
public void testAddIgnoredArtifacts_ExistingValue()
{
goToRepositoryScanningPage();
setFieldValue( "newpattern_2", "**/*.sh" );
clickAddIcon( "newpattern_2" );
- // FIXME: broken
- Assert.assertEquals( getErrorMessageText(),
- "Not adding pattern \"**/*.sh\" to filetype
ignored as it already exists." );
+ Assert.assertEquals( getErrorMessageText(), "File type [ignored]
already contains pattern [**/*.sh]" );
}
@Test
@@ -158,15 +152,14 @@ public class RepositoryScanningTest
"Unable to process blank pattern." );
}
- @Test( enabled = false )
+ @Test
public void testAddIndexableContent_ExistingValue()
{
goToRepositoryScanningPage();
setFieldValue( "newpattern_3", "**/*.xml" );
clickAddIcon( "newpattern_3" );
- // FIXME: broken
Assert.assertEquals( getErrorMessageText(),
- "Not adding pattern \"**/*.xml\" to filetype
indexable-content as it already exists." );
+ "File type [indexable-content] already contains
pattern [**/*.xml]" );
}
@Test
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java?rev=1178289&r1=1178288&r2=1178289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java
Mon Oct 3 03:34:40 2011
@@ -117,7 +117,7 @@ public class RepositoryScanningAction
}
catch ( RepositoryAdminException e )
{
- addActionError( "error adding file type pattern " + e.getMessage()
);
+ addActionError( e.getMessage() );
return INPUT;
}
return SUCCESS;
