You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/06/02 23:41:17 UTC

svn commit: r1345591 - /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java

Author: olamy
Date: Sat Jun  2 21:41:16 2012
New Revision: 1345591

URL: http://svn.apache.org/viewvc?rev=1345591&view=rev
Log:
fix junit

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

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.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/SearchServiceTest.java?rev=1345591&r1=1345590&r2=1345591&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java Sat Jun  2 21:41:16 2012
@@ -22,6 +22,7 @@ import org.apache.archiva.admin.model.be
 import org.apache.archiva.rest.api.model.Artifact;
 import org.apache.archiva.rest.api.model.SearchRequest;
 import org.apache.archiva.rest.api.services.SearchService;
+import org.fest.assertions.Assertions;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -68,6 +69,7 @@ public class SearchServiceTest
 
     /**
      * same search but with Guest user
+     *
      * @throws Exception
      */
     @Test
@@ -225,10 +227,7 @@ public class SearchServiceTest
 
         List<Artifact> artifacts = searchService.searchArtifacts( searchRequest );
 
-        assertNotNull( artifacts );
-        assertTrue(
-            " not 2 results for Bundle Symbolic Name org.apache.karaf.features.core but " + artifacts.size() + ":"
-                + artifacts, artifacts.size() == 2 );
+        Assertions.assertThat( artifacts ).isNotNull().hasSize( 2 );
 
         for ( Artifact artifact : artifacts )
         {
@@ -236,7 +235,7 @@ public class SearchServiceTest
             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 + ".bundle", artifact.getUrl() );
+                              + version + "/org.apache.karaf.features.core-" + version + ".jar", artifact.getUrl() );
 
 
         }