svn commit: r1357608 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services: ArtifactContentEntriesTests.java BrowseServiceTest.java

[olamy]

Author: olamy
Date: Thu Jul  5 13:55:20 2012
New Revision: 1357608

URL: http://svn.apache.org/viewvc?rev=1357608&view=rev
Log:
[MRM-1640] With the new Fest Assert version, some imports/methods call have to 
be changed
Submitted by Adrien Lecharpentier.

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java?rev=1357608&r1=1357607&r2=1357608&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
 Thu Jul  5 13:55:20 2012
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.List;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.api.Assertions.assertThat;
 
 /**
  * @author Olivier Lamy

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java?rev=1357608&r1=1357607&r2=1357608&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
 Thu Jul  5 13:55:20 2012
@@ -27,7 +27,7 @@ import org.apache.archiva.rest.api.model
 import org.apache.archiva.rest.api.model.VersionsList;
 import org.apache.archiva.rest.api.services.BrowseService;
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.fest.assertions.api.MapAssert;
+import org.fest.assertions.data.MapEntry;
 import org.junit.Test;
 
 import javax.ws.rs.core.MediaType;
@@ -83,7 +83,7 @@ public class BrowseServiceTest
 
         metadatas = toMap( browseService.getMetadatas( "commons-cli", 
"commons-cli", "1.0", testRepoId ) );
 
-        assertThat( metadatas ).isNotNull().isNotEmpty().includes( 
MapAssert.entry( "wine", "bordeaux" ) );
+        assertThat( metadatas ).isNotNull().isNotEmpty().contains( 
MapEntry.entry( "wine", "bordeaux" ) );
 
         deleteTestRepo( testRepoId );
 
@@ -115,7 +115,7 @@ public class BrowseServiceTest
 
         metadatas = toMap( browseService.getMetadatas( "commons-cli", 
"commons-cli", "1.0", testRepoId ) );
 
-        assertThat( metadatas ).isNotNull().isNotEmpty().includes( 
MapAssert.entry( "wine", "bordeaux" ) );
+        assertThat( metadatas ).isNotNull().isNotEmpty().contains( 
MapEntry.entry( "wine", "bordeaux" ) );
 
         browseService.deleteMetadata( "commons-cli", "commons-cli", "1.0", 
"wine", testRepoId );