Repository: archiva Updated Branches: refs/heads/master 1feb9a99f -> 28dae86be
add missing dependency Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4374c550 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4374c550 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4374c550 Branch: refs/heads/master Commit: 4374c550e4a082fbc290826abca0b1244f6eee43 Parents: 1feb9a9 Author: Olivier Lamy <[email protected]> Authored: Wed Feb 11 22:32:54 2015 +1100 Committer: Olivier Lamy <[email protected]> Committed: Wed Feb 11 22:32:54 2015 +1100 ---------------------------------------------------------------------- .../rest/services/BrowseServiceTest.java | 30 +++++++++++++------- .../archiva-web/archiva-web-common/pom.xml | 7 ++++- 2 files changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/4374c550/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java ---------------------------------------------------------------------- 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 8c5ac14..848d4b7 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 @@ -89,26 +89,34 @@ public class BrowseServiceTest public void metadatagetthenaddthendelete() throws Exception { - scanRepo( TEST_REPO_ID ); + try + { + scanRepo( TEST_REPO_ID ); - BrowseService browseService = getBrowseService( authorizationHeader, false ); + BrowseService browseService = getBrowseService( authorizationHeader, false ); - Map<String, String> metadatas = - toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) ); + Map<String, String> metadatas = + toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) ); - assertThat( metadatas ).isNotNull().isEmpty(); + assertThat( metadatas ).isNotNull().isEmpty(); - browseService.addMetadata( "commons-cli", "commons-cli", "1.0", "wine", "bordeaux", TEST_REPO_ID ); + browseService.addMetadata( "commons-cli", "commons-cli", "1.0", "wine", "bordeaux", TEST_REPO_ID ); - metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) ); + metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) ); - assertThat( metadatas ).isNotNull().isNotEmpty().contains( MapEntry.entry( "wine", "bordeaux" ) ); + assertThat( metadatas ).isNotNull().isNotEmpty().contains( MapEntry.entry( "wine", "bordeaux" ) ); - browseService.deleteMetadata( "commons-cli", "commons-cli", "1.0", "wine", TEST_REPO_ID ); + browseService.deleteMetadata( "commons-cli", "commons-cli", "1.0", "wine", TEST_REPO_ID ); - metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) ); + metadatas = toMap( browseService.getMetadatas( "commons-cli", "commons-cli", "1.0", TEST_REPO_ID ) ); - assertThat( metadatas ).isNotNull().isEmpty(); + assertThat( metadatas ).isNotNull().isEmpty(); + } + catch ( ArchivaRestServiceException e ) + { + log.error( e.getMessage(), e ); + throw e; + } } @Test http://git-wip-us.apache.org/repos/asf/archiva/blob/4374c550/archiva-modules/archiva-web/archiva-web-common/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index f392d94..b91634c 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -266,7 +266,12 @@ <artifactId>slf4j-simple</artifactId> </exclusion> </exclusions> - </dependency> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId>
