svn commit: r1135761 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java

[olamy]

Author: olamy
Date: Tue Jun 14 19:32:27 2011
New Revision: 1135761

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

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java?rev=1135761&r1=1135760&r2=1135761&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java
 Tue Jun 14 19:32:27 2011
@@ -19,11 +19,9 @@ package org.apache.maven.archiva.web.act
  * under the License.
  */
 
-import com.opensymphony.xwork2.Action;
 import org.apache.archiva.metadata.model.ArtifactMetadata;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import 
org.apache.archiva.metadata.repository.memory.TestRepositorySessionFactory;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
@@ -97,10 +95,8 @@ public class DeleteArtifactActionTest
         RepositorySession repositorySession = mock( RepositorySession.class );
         when( repositorySession.getRepository() ).thenReturn( 
metadataRepository );
 
-        //TestRepositorySessionFactory repositorySessionFactory = 
(TestRepositorySessionFactory) lookup(
-        //    RepositorySessionFactory.class );
-
-        TestRepositorySessionFactory repositorySessionFactory = new 
TestRepositorySessionFactory();
+        TestRepositorySessionFactory repositorySessionFactory =
+            applicationContext.getBean( "repositorySessionFactory#test", 
TestRepositorySessionFactory.class );
 
         repositorySessionFactory.setRepositorySession( repositorySession );
 
@@ -140,9 +136,9 @@ public class DeleteArtifactActionTest
         configurationControl.expectAndReturn( 
configuration.getConfiguration(), config );
         repositoryFactoryControl.expectAndReturn( 
repositoryFactory.getManagedRepositoryContent( REPOSITORY_ID ),
                                                   repoContent );
-        metadataRepositoryControl.expectAndReturn( 
metadataRepository.getArtifacts( REPOSITORY_ID, GROUP_ID,
-                                                                               
     ARTIFACT_ID, VERSION ),
-                                                   new 
ArrayList<ArtifactMetadata>() );
+        metadataRepositoryControl.expectAndReturn(
+            metadataRepository.getArtifacts( REPOSITORY_ID, GROUP_ID, 
ARTIFACT_ID, VERSION ),
+            new ArrayList<ArtifactMetadata>() );
 
         configurationControl.replay();
         repositoryFactoryControl.replay();
@@ -150,8 +146,8 @@ public class DeleteArtifactActionTest
 
         action.doDelete();
 
-        String artifactPath = REPO_LOCATION + "/" + StringUtils.replace( 
GROUP_ID, ".", "/" ) + "/" +
-            StringUtils.replace( ARTIFACT_ID, ".", "/" ) + "/" + VERSION + "/" 
+ ARTIFACT_ID + "-" + VERSION;
+        String artifactPath = REPO_LOCATION + "/" + StringUtils.replace( 
GROUP_ID, ".", "/" ) + "/"
+            + StringUtils.replace( ARTIFACT_ID, ".", "/" ) + "/" + VERSION + 
"/" + ARTIFACT_ID + "-" + VERSION;
 
         assertFalse( new File( artifactPath + ".jar" ).exists() );
         assertFalse( new File( artifactPath + ".jar.sha1" ).exists() );