use fest assert

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1491195 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
index f3a15a6da50ebcc499c2f67cf98f02fa285661a3..cdcf1ed595b16a24fe5aed6a98fa3e346b44c9f1 100644 (file)
--- a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
@@ -511,9 +511,12 @@ public abstract class AbstractMetadataRepositoryTest
 
         Collection<ArtifactMetadata> artifacts =
             repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
-        assertEquals( 1, artifacts.size() );
+        //assertEquals( 1, artifacts.size() );
+        Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
         metadata = artifacts.iterator().next();
-        assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+        //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+        Collection<String> ids = metadata.getFacetIds();
+        Assertions.assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID );
 
         TestMetadataFacet testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
         Map<String, String> facetProperties = testFacet.toProperties();
@@ -528,11 +531,17 @@ public abstract class AbstractMetadataRepositoryTest
         repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, metadata );
 
         artifacts = repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
-        assertEquals( 1, artifacts.size() );
+        //assertEquals( 1, artifacts.size() );
+        Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
         metadata = artifacts.iterator().next();
-        assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+        //assertEquals( Collections.singleton( TEST_FACET_ID ), metadata.getFacetIds() );
+        ids = metadata.getFacetIds();
+        Assertions.assertThat( ids ).isNotNull().isNotEmpty().hasSize( 1 ).contains( TEST_FACET_ID );
+
         testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
-        assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
+        //assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
+        Map<String,String> props = testFacet.toProperties();
+        Assertions.assertThat( props ).isNotNull().doesNotContainKey( "deleteKey" );
     }
 
     @Test