From 17d1f944e09872ee12b82c80fce34c6d34769745 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 5 Jul 2012 13:55:20 +0000 Subject: [PATCH] [MRM-1640] With the new Fest Assert version, some imports/methods call have to be changed Submitted by Adrien Lecharpentier. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1357608 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/rest/services/ArtifactContentEntriesTests.java | 2 +- .../org/apache/archiva/rest/services/BrowseServiceTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java index 10820f8c9..0e15bedb4 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java @@ -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 diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java index ed70e0bc0..4f9c68ab5 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java @@ -27,7 +27,7 @@ import org.apache.archiva.rest.api.model.Entry; 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 ); -- 2.39.5