fix context when know repositoryarchiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/89ec8af0 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/89ec8af0 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/89ec8af0 Branch: refs/heads/master Commit: 89ec8af055cde53187ae1ebfd945d903f8e69b47 Parents: b272a1b Author: Olivier Lamy <[email protected]> Authored: Wed May 21 12:09:03 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Wed May 21 12:09:03 2014 +1000 ---------------------------------------------------------------------- .../archiva/rest/services/SearchServiceTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/89ec8af0/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java index a3ad4cd..a073b24 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java @@ -22,13 +22,15 @@ import org.apache.archiva.admin.model.beans.UiConfiguration; import org.apache.archiva.maven2.model.Artifact; import org.apache.archiva.rest.api.model.SearchRequest; import org.apache.archiva.rest.api.services.SearchService; -import static org.assertj.core.api.Assertions.assertThat; +import org.assertj.core.api.Assertions; import org.junit.Test; import java.util.Arrays; import java.util.Collection; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Olivier Lamy */ @@ -199,7 +201,8 @@ public class SearchServiceTest assertNotNull( artifacts ); assertTrue( " not 1 results for Bundle Symbolic Name org.apache.karaf.features.command but " + artifacts.size() + ":" - + artifacts, artifacts.size() == 1 ); + + artifacts, artifacts.size() == 1 + ); deleteTestRepo( testRepoId ); } @@ -233,9 +236,10 @@ public class SearchServiceTest { log.info( "url: {}", artifact.getUrl() ); String version = artifact.getVersion(); - assertEquals( "http://localhost:"; + port - + "/repository/test-repo/org/apache/karaf/features/org.apache.karaf.features.core/" - + version + "/org.apache.karaf.features.core-" + version + ".jar", artifact.getUrl() ); + Assertions.assertThat( artifact.getUrl() ) // + .isEqualTo( "http://localhost:"; + port + + "/repository/test-repo/org/apache/karaf/features/org.apache.karaf.features.core/" + + version + "/org.apache.karaf.features.core-" + version + ".jar" ); }
