You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/06/26 19:24:38 UTC

svn commit: r1354118 - /archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java

Author: olamy
Date: Tue Jun 26 17:24:37 2012
New Revision: 1354118

URL: http://svn.apache.org/viewvc?rev=1354118&view=rev
Log:
add unit for deletion of timestamped snapshot

Modified:
    archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java

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=1354118&r1=1354117&r2=1354118&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 Tue Jun 26 17:24:37 2012
@@ -33,7 +33,6 @@ import org.apache.archiva.metadata.model
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.model.Scm;
 import org.fest.assertions.Assertions;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -1141,6 +1140,49 @@ public abstract class AbstractMetadataRe
             repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ).isEmpty() );
     }
 
+    @Test
+    public void deleteSnapshotVersion()
+        throws Exception
+    {
+        ArtifactMetadata artifactOne = createArtifact();
+        artifactOne.setVersion( "2.0-20120618.214127-1" );
+        artifactOne.setProjectVersion( "2.0-SNAPSHOT" );
+        artifactOne.addFacet( new TestMetadataFacet( "value" ) );
+        artifactOne.setId( TEST_PROJECT + "-" + "2.0-20120618.214127-1" + "." + "jar" );
+
+        repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT", artifactOne );
+
+        ArtifactMetadata artifactTwo = createArtifact();
+        artifactTwo.setVersion( "2.0-20120618.214135-2" );
+        artifactTwo.setProjectVersion( "2.0-SNAPSHOT" );
+        artifactTwo.addFacet( new TestMetadataFacet( "value" ) );
+        artifactTwo.setId( TEST_PROJECT + "-" + "2.0-20120618.214135-2" + "." + "jar" );
+
+        repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT", artifactTwo );
+
+        Collection<ArtifactMetadata> artifactMetadatas =
+            repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT" );
+
+        Assertions.assertThat( artifactMetadatas ).isNotNull().isNotEmpty().hasSize( 2 );
+
+        log.info( "artifactMetadatas: {}", artifactMetadatas );
+
+        //assertEquals( Collections.singletonList( artifact ), new ArrayList<ArtifactMetadata>(
+        //    repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT" ) ) );
+
+        repository.removeArtifact( artifactOne, "2.0-SNAPSHOT" );
+
+        artifactMetadatas = repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT" );
+
+        Assertions.assertThat( artifactMetadatas ).isNotNull().isNotEmpty().hasSize( 1 );
+
+        repository.removeArtifact( artifactTwo, "2.0-SNAPSHOT" );
+
+        artifactMetadatas = repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, "2.0-SNAPSHOT" );
+
+        Assertions.assertThat( artifactMetadatas ).isNotNull().isEmpty();
+    }
+
     private static ProjectMetadata createProject()
     {
         return createProject( TEST_NAMESPACE );