From: Brett Porter <brett@apache.org>
Date: Fri, 20 Mar 2009 17:02:00 +0000 (+0000)
Subject: these tests still need to set the principal
X-Git-Tag: archiva-1.2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cf807b3db65c30b4ad3a85346cd21682af70e08e;p=archiva.git

these tests still need to set the principal


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756621 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
index 03ea5274d..5a1d04da7 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
@@ -53,6 +53,8 @@ public abstract class PlexusActionSupport
      */
     private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
 
+    private String principal;
+
     @SuppressWarnings("unchecked")
     public void setSession( Map map )
     {
@@ -116,6 +118,15 @@ public abstract class PlexusActionSupport
     @SuppressWarnings( "unchecked" )
     protected String getPrincipal()
     {
+        if ( principal != null )
+        {
+            return principal;
+        }
         return ArchivaXworkUser.getActivePrincipal( ActionContext.getContext().getSession() );
     }
+    
+    void setPrincipal( String principal )
+    {
+        this.principal = principal;
+    }
 }
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
index ba85a0343..87dff73e1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
@@ -150,6 +150,7 @@ public class SearchActionTest
         searchControl.replay();
         daoControl.replay();
         
+        action.setPrincipal( "user" );
         String result = action.quickSearch();
         
         assertEquals( Action.SUCCESS, result );      
@@ -206,6 +207,7 @@ public class SearchActionTest
         searchControl.replay();
         daoControl.replay();
         
+        action.setPrincipal( "user" );
         String result = action.quickSearch();
         
         assertEquals( Action.SUCCESS, result );
@@ -230,6 +232,7 @@ public class SearchActionTest
         
         userReposControl.replay();
         
+        action.setPrincipal( "user" );
         String result = action.quickSearch();
         
         assertEquals( GlobalResults.ACCESS_TO_NO_REPOS, result );        
@@ -261,6 +264,7 @@ public class SearchActionTest
         userReposControl.replay();
         searchControl.replay();
         
+        action.setPrincipal( "user" );
         String result = action.quickSearch();
         
         assertEquals( Action.INPUT, result );        
@@ -357,7 +361,8 @@ public class SearchActionTest
         
         searchControl.replay();
         userReposControl.replay();
-        
+
+        action.setPrincipal( "user" );
         String result = action.filteredSearch();
         
         assertEquals( Action.SUCCESS, result );