Author: olamy
Date: Tue Jun 12 08:12:02 2012
New Revision: 1349179
URL: http://svn.apache.org/viewvc?rev=1349179&view=rev
Log:
fix unit test if metadataFacet not available on update
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.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=1349179&r1=1349178&r2=1349179&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 12 08:12:02 2012
@@ -33,6 +33,7 @@ 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;
@@ -1045,40 +1046,6 @@ public abstract class AbstractMetadataRe
assertEquals( Collections.<ArtifactMetadata>emptyList(),
artifactsByChecksum );
}
- @Test
- public void testDeleteArtifact()
- throws Exception
- {
- ArtifactMetadata artifact = createArtifact();
- artifact.addFacet( new TestMetadataFacet( "value" ) );
-
- repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION, artifact );
-
- assertEquals( Collections.singletonList( artifact ), new
ArrayList<ArtifactMetadata>(
- repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, TEST_PROJECT_VERSION ) ) );
-
- repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION_2_0, artifact );
-
- Collection<String> versions = repository.getProjectVersions(
TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
-
- log.info( "versions {}", versions );
-
- Assertions.assertThat( versions ).isNotNull().isNotEmpty().hasSize( 2
).contains( "1.0", "2.0" );
-
- repository.removeArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION, artifact.getId() );
-
- versions = repository.getProjectVersions( TEST_REPO_ID,
TEST_NAMESPACE, TEST_PROJECT );
-
- log.info( "versions {}", versions );
-
- Assertions.assertThat( versions ).isNotNull().isNotEmpty().hasSize( 1
).contains( "2.0" );
-
- assertTrue(
- repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, TEST_PROJECT_VERSION ).isEmpty() );
-
- Assertions.assertThat( repository.getArtifacts( TEST_REPO_ID,
TEST_NAMESPACE, TEST_PROJECT,
-
TEST_PROJECT_VERSION_2_0 ) ).isNotEmpty().hasSize( 1 );
- }
@Test
public void testDeleteRepository()
@@ -1120,6 +1087,41 @@ public abstract class AbstractMetadataRe
@Test
+ public void testDeleteArtifact()
+ throws Exception
+ {
+ ArtifactMetadata artifact = createArtifact();
+ artifact.addFacet( new TestMetadataFacet( "value" ) );
+
+ repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION, artifact );
+
+ assertEquals( Collections.singletonList( artifact ), new
ArrayList<ArtifactMetadata>(
+ repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, TEST_PROJECT_VERSION ) ) );
+
+ repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION_2_0, artifact );
+
+ Collection<String> versions = repository.getProjectVersions(
TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+
+ log.info( "versions {}", versions );
+
+ Assertions.assertThat( versions ).isNotNull().isNotEmpty().hasSize( 2
).contains( "1.0", "2.0" );
+
+ repository.removeArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION, artifact.getId() );
+
+ versions = repository.getProjectVersions( TEST_REPO_ID,
TEST_NAMESPACE, TEST_PROJECT );
+
+ log.info( "versions {}", versions );
+
+ Assertions.assertThat( versions ).isNotNull().isNotEmpty().hasSize( 1
).contains( "2.0" );
+
+ assertTrue(
+ repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE,
TEST_PROJECT, TEST_PROJECT_VERSION ).isEmpty() );
+
+ Assertions.assertThat( repository.getArtifacts( TEST_REPO_ID,
TEST_NAMESPACE, TEST_PROJECT,
+
TEST_PROJECT_VERSION_2_0 ) ).isNotEmpty().hasSize( 1 );
+ }
+
+ @Test
public void deleteVersion()
throws Exception
{
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java?rev=1349179&r1=1349178&r2=1349179&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
Tue Jun 12 08:12:02 2012
@@ -198,6 +198,10 @@ public class JcrMetadataRepository
for ( String facetId : metadataFacetFactories.keySet() )
{
MetadataFacet metadataFacet = artifactMeta.getFacet( facetId );
+ if ( metadataFacet == null )
+ {
+ continue;
+ }
if ( node.hasNode( facetId ) )
{
node.getNode( facetId ).remove();
