Author: olamy
Date: Thu Oct 11 22:43:15 2012
New Revision: 1397345
URL: http://svn.apache.org/viewvc?rev=1397345&view=rev
Log:
add unit test for new method in MetadataRepository and fix compilation for some
impls/mocks
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
Thu Oct 11 22:43:15 2012
@@ -201,4 +201,10 @@ public class TestMetadataRepository
{
}
+
+ public void removeProjectVersion( String repoId, String namespace, String
projectId, String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
Thu Oct 11 22:43:15 2012
@@ -260,6 +260,13 @@ public class MockRepositorySessionFactor
{
}
+
+ public void removeProjectVersion( String repoId, String
namespace, String projectId,
+ String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
};
}
};
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
Thu Oct 11 22:43:15 2012
@@ -206,4 +206,10 @@ public class TestMetadataRepository
{
}
+
+ public void removeProjectVersion( String repoId, String namespace, String
projectId, String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.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/mock/MockRepositorySessionFactory.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
Thu Oct 11 22:43:15 2012
@@ -260,6 +260,13 @@ public class MockRepositorySessionFactor
{
}
+
+ public void removeProjectVersion( String repoId, String
namespace, String projectId,
+ String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
};
}
};
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
Thu Oct 11 22:43:15 2012
@@ -260,6 +260,13 @@ public class MockRepositorySessionFactor
{
}
+
+ public void removeProjectVersion( String repoId, String
namespace, String projectId,
+ String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
};
}
};
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
Thu Oct 11 22:43:15 2012
@@ -337,5 +337,11 @@ public class NewArtifactsRssFeedProcesso
{
}
+
+ public void removeProjectVersion( String repoId, String namespace,
String projectId, String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
Thu Oct 11 22:43:15 2012
@@ -241,4 +241,10 @@ public class TestMetadataRepository
{
}
+
+ public void removeProjectVersion( String repoId, String namespace, String
projectId, String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
Thu Oct 11 22:43:15 2012
@@ -202,4 +202,10 @@ public class TestMetadataRepository
{
}
+
+ public void removeProjectVersion( String repoId, String namespace, String
projectId, String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
}
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Thu Oct 11 22:43:15 2012
@@ -1132,7 +1132,7 @@ public abstract class AbstractMetadataRe
}
@Test
- public void deleteVersion()
+ public void deleteArtifact()
throws Exception
{
ArtifactMetadata artifact = createArtifact();
@@ -1152,6 +1152,24 @@ public abstract class AbstractMetadataRe
}
@Test
+ public void deleteVersion()
+ throws Exception
+ {
+ ArtifactMetadata artifact = createArtifact();
+ artifact.addFacet( new TestMetadataFacet( "value" ) );
+
+ repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION, artifact );
+
+ repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION, artifact );
+
+ assertEquals( 1, repository.getProjectVersions( TEST_REPO_ID,
TEST_NAMESPACE, TEST_PROJECT ).size() );
+
+ repository.removeProjectVersion( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, TEST_PROJECT_VERSION );
+
+ assertEquals( 0, repository.getProjectVersions( TEST_REPO_ID,
TEST_NAMESPACE, TEST_PROJECT ).size() );
+ }
+
+ @Test
public void deleteSnapshotVersion()
throws Exception
{
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
Thu Oct 11 22:43:15 2012
@@ -217,4 +217,10 @@ public class TestMetadataRepository
{
}
+
+ public void removeProjectVersion( String repoId, String namespace, String
projectId, String projectVersion )
+ throws MetadataRepositoryException
+ {
+
+ }
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=1397345&r1=1397344&r2=1397345&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
Thu Oct 11 22:43:15 2012
@@ -703,7 +703,6 @@ public class FileMetadataRepository
* @param namespace
* @param project
* @param projectVersion
- * @param projectId
* @param metadataFacet will remove artifacts which have this {@link
MetadataFacet} using equals
* @throws MetadataRepositoryException
*/
@@ -1163,6 +1162,24 @@ public class FileMetadataRepository
return projectVersions;
}
+
+ public void removeProjectVersion( String repoId, String namespace, String
projectId, String projectVersion )
+ throws MetadataRepositoryException
+ {
+ File directory = new File( getDirectory( repoId ), namespace + "/" +
projectId + "/" + projectVersion );
+ if ( directory.exists() )
+ {
+ try
+ {
+ FileUtils.deleteDirectory( directory );
+ }
+ catch ( IOException e )
+ {
+ throw new MetadataRepositoryException( e.getMessage(), e );
+ }
+ }
+ }
+
private void writeProperties( Properties properties, File directory,
String propertiesKey )
throws IOException
{
