svn commit: r1303389 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java

[ol...@apache.org]

Author: olamy
Date: Wed Mar 21 13:33:28 2012
New Revision: 1303389

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

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

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java?rev=1303389&r1=1303388&r2=1303389&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java Wed Mar 21 13:33:28 2012
@@ -53,12 +53,12 @@ public class UserRepositoriesStub
     public boolean isAuthorizedToUploadArtifacts( String principal, String repoId )
         throws ArchivaSecurityException
     {
-        return false;
+        return true;
     }
 
     public boolean isAuthorizedToDeleteArtifacts( String principal, String repoId )
     {
-        return false;
+        return true;
     }
 
     public List<String> getManagableRepositoryIds( String principal )

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java?rev=1303389&r1=1303388&r2=1303389&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/DeleteArtifactActionTest.java Wed Mar 21 13:33:28 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.web.action;
  * under the License.
  */
 
+import com.opensymphony.xwork2.Action;
 import net.sf.beanlib.provider.replicator.BeanReplicator;
 import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
@@ -35,19 +36,13 @@ import org.apache.archiva.rest.services.
 import org.apache.archiva.webtest.memory.TestRepositorySessionFactory;
 import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.StrutsSpringTestCase;
-import org.codehaus.plexus.redback.users.User;
-import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
-import org.codehaus.redback.rest.services.RedbackRequestInformation;
 import org.easymock.MockControl;
 import org.easymock.classextension.MockClassControl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.when;
 
 public class DeleteArtifactActionTest
@@ -151,7 +146,7 @@ public class DeleteArtifactActionTest
         repositoryFactoryControl.replay();
         metadataRepositoryControl.replay();
 
-        action.doDelete();
+        assertEquals( Action.SUCCESS, action.doDelete() );
 
         String artifactPath =
             REPO_LOCATION + "/" + StringUtils.replace( GROUP_ID, ".", "/" ) + "/" + StringUtils.replace( ARTIFACT_ID,