fix context when know repositoryarchiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java

This commit is contained in:
Olivier Lamy 2014-05-21 12:09:03 +10:00
parent b272a1bc2f
commit 89ec8af055
1 changed files with 9 additions and 5 deletions

View File

@ -22,13 +22,15 @@ import org.apache.archiva.admin.model.beans.UiConfiguration;
import org.apache.archiva.maven2.model.Artifact; import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.rest.api.model.SearchRequest; import org.apache.archiva.rest.api.model.SearchRequest;
import org.apache.archiva.rest.api.services.SearchService; 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 org.junit.Test;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Olivier Lamy * @author Olivier Lamy
*/ */
@ -199,7 +201,8 @@ public class SearchServiceTest
assertNotNull( artifacts ); assertNotNull( artifacts );
assertTrue( assertTrue(
" not 1 results for Bundle Symbolic Name org.apache.karaf.features.command but " + artifacts.size() + ":" " 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 ); deleteTestRepo( testRepoId );
} }
@ -233,9 +236,10 @@ public class SearchServiceTest
{ {
log.info( "url: {}", artifact.getUrl() ); log.info( "url: {}", artifact.getUrl() );
String version = artifact.getVersion(); String version = artifact.getVersion();
assertEquals( "http://localhost:" + port Assertions.assertThat( artifact.getUrl() ) //
+ "/repository/test-repo/org/apache/karaf/features/org.apache.karaf.features.core/" .isEqualTo( "http://localhost:" + port
+ version + "/org.apache.karaf.features.core-" + version + ".jar", artifact.getUrl() ); + "/repository/test-repo/org/apache/karaf/features/org.apache.karaf.features.core/"
+ version + "/org.apache.karaf.features.core-" + version + ".jar" );
} }