You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/03/20 18:02:01 UTC
svn commit: r756621 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src:
main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
Author: brett
Date: Fri Mar 20 17:02:00 2009
New Revision: 756621
URL: http://svn.apache.org/viewvc?rev=756621&view=rev
Log:
these tests still need to set the principal
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java?rev=756621&r1=756620&r2=756621&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java Fri Mar 20 17:02:00 2009
@@ -53,6 +53,8 @@
*/
private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
+ private String principal;
+
@SuppressWarnings("unchecked")
public void setSession( Map map )
{
@@ -116,6 +118,15 @@
@SuppressWarnings( "unchecked" )
protected String getPrincipal()
{
+ if ( principal != null )
+ {
+ return principal;
+ }
return ArchivaXworkUser.getActivePrincipal( ActionContext.getContext().getSession() );
}
+
+ void setPrincipal( String principal )
+ {
+ this.principal = principal;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java?rev=756621&r1=756620&r2=756621&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java Fri Mar 20 17:02:00 2009
@@ -150,6 +150,7 @@
searchControl.replay();
daoControl.replay();
+ action.setPrincipal( "user" );
String result = action.quickSearch();
assertEquals( Action.SUCCESS, result );
@@ -206,6 +207,7 @@
searchControl.replay();
daoControl.replay();
+ action.setPrincipal( "user" );
String result = action.quickSearch();
assertEquals( Action.SUCCESS, result );
@@ -230,6 +232,7 @@
userReposControl.replay();
+ action.setPrincipal( "user" );
String result = action.quickSearch();
assertEquals( GlobalResults.ACCESS_TO_NO_REPOS, result );
@@ -261,6 +264,7 @@
userReposControl.replay();
searchControl.replay();
+ action.setPrincipal( "user" );
String result = action.quickSearch();
assertEquals( Action.INPUT, result );
@@ -357,7 +361,8 @@
searchControl.replay();
userReposControl.replay();
-
+
+ action.setPrincipal( "user" );
String result = action.filteredSearch();
assertEquals( Action.SUCCESS, result );