svn commit: r1344324 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services: BrowseServiceTest.java RepositoriesServiceTest.java

[olamy]

Author: olamy
Date: Wed May 30 16:05:53 2012
New Revision: 1344324

URL: http://svn.apache.org/viewvc?rev=1344324&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/BrowseServiceTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.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/BrowseServiceTest.java?rev=1344324&r1=1344323&r2=1344324&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
 Wed May 30 16:05:53 2012
@@ -19,8 +19,8 @@ package org.apache.archiva.rest.services
  */
 
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
+import org.apache.archiva.rest.api.model.Artifact;
 import org.apache.archiva.rest.api.model.ArtifactContentEntry;
-import org.apache.archiva.rest.api.model.ArtifactDownloadInfo;
 import org.apache.archiva.rest.api.model.BrowseResult;
 import org.apache.archiva.rest.api.model.BrowseResultEntry;
 import org.apache.archiva.rest.api.model.Entry;
@@ -346,7 +346,7 @@ public class BrowseServiceTest
 
         BrowseService browseService = getBrowseService( authorizationHeader, 
true );
 
-        List<ArtifactDownloadInfo> artifactDownloadInfos =
+        List<Artifact> artifactDownloadInfos =
             browseService.getArtifactDownloadInfos( "commons-logging", 
"commons-logging", "1.1", testRepoId );
 
         log.info( "artifactDownloadInfos {}", artifactDownloadInfos );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.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/RepositoriesServiceTest.java?rev=1344324&r1=1344323&r2=1344324&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
 Wed May 30 16:05:53 2012
@@ -83,10 +83,11 @@ public class RepositoriesServiceTest
             artifact.setArtifactId( "commons-logging" );
             artifact.setVersion( "1.0.1" );
             artifact.setPackaging( "jar" );
+            artifact.setContext( SOURCE_REPO_ID );
 
             RepositoriesService repositoriesService = getRepositoriesService( 
null );
 
-            repositoriesService.deleteArtifact( artifact, SOURCE_REPO_ID );
+            repositoriesService.deleteArtifact( artifact );
         }
         catch ( ServerWebApplicationException e )
         {
@@ -111,7 +112,7 @@ public class RepositoriesServiceTest
             artifact.setVersion( "1.0.1" );
             artifact.setPackaging( "jar" );
 
-            repositoriesService.deleteArtifact( artifact, null );
+            repositoriesService.deleteArtifact( artifact );
         }
         catch ( ServerWebApplicationException e )
         {
@@ -138,10 +139,11 @@ public class RepositoriesServiceTest
             artifact.setArtifactId( "commons-logging" );
             artifact.setVersion( "1.0.1" );
             artifact.setPackaging( "jar" );
+            artifact.setContext( SOURCE_REPO_ID );
 
             RepositoriesService repositoriesService = getRepositoriesService( 
authorizationHeader );
 
-            repositoriesService.deleteArtifact( artifact, SOURCE_REPO_ID );
+            repositoriesService.deleteArtifact( artifact );
 
             assertFalse( "artifact not deleted exists:" + 
artifactFile.getPath(), artifactFile.exists() );