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 2013/06/09 14:44:28 UTC
svn commit: r1491204 -
/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Author: olamy
Date: Sun Jun 9 12:44:28 2013
New Revision: 1491204
URL: http://svn.apache.org/r1491204
Log:
use fest assert to prevent issue with different collection impl
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=1491204&r1=1491203&r2=1491204&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 Sun Jun 9 12:44:28 2013
@@ -240,15 +240,23 @@ public abstract class AbstractMetadataRe
MailingList mailingList = new MailingList();
mailingList.setName( "Foo List" );
mailingList.setOtherArchives( Collections.<String>emptyList() );
- metadata.setMailingLists( Collections.singletonList( mailingList ) );
+ metadata.setMailingLists( Arrays.asList( mailingList ) );
repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata );
metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
assertEquals( TEST_PROJECT_VERSION, metadata.getId() );
- assertEquals( 1, metadata.getMailingLists().size() );
+
+ List<MailingList> mailingLists = metadata.getMailingLists();
+
+ Assertions.assertThat( mailingLists ).isNotNull().isNotEmpty().hasSize( 1 );
+
+ //assertEquals( 1, metadata.getMailingLists().size() );
mailingList = metadata.getMailingLists().get( 0 );
assertEquals( "Foo List", mailingList.getName() );
- assertEquals( Collections.<String>emptyList(), mailingList.getOtherArchives() );
+
+ List<String> others = mailingList.getOtherArchives();
+ //assertEquals( Collections.<String>emptyList(), mailingList.getOtherArchives() );
+ Assertions.assertThat( others ).isNotNull().isEmpty();
}
@Test
@@ -540,7 +548,7 @@ public abstract class AbstractMetadataRe
testFacet = (TestMetadataFacet) metadata.getFacet( TEST_FACET_ID );
//assertFalse( testFacet.toProperties().containsKey( "deleteKey" ) );
- Map<String,String> props = testFacet.toProperties();
+ Map<String, String> props = testFacet.toProperties();
Assertions.assertThat( props ).isNotNull().doesNotContainKey( "deleteKey" );
}