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 2014/02/02 04:42:38 UTC
svn commit: r1563564 -
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
Author: brett
Date: Sun Feb 2 03:42:37 2014
New Revision: 1563564
URL: http://svn.apache.org/r1563564
Log:
fix tests after struts upgrade
Context no longer automatically populated
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java?rev=1563564&r1=1563563&r2=1563564&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java Sun Feb 2 03:42:37 2014
@@ -19,8 +19,10 @@ package org.apache.maven.archiva.web.act
* under the License.
*/
+import java.util.HashMap;
import java.util.List;
+import com.opensymphony.xwork2.ActionContext;
import org.apache.maven.archiva.model.ArchivaProjectModel;
import org.apache.maven.archiva.security.UserRepositories;
import org.apache.maven.archiva.security.UserRepositoriesStub;
@@ -75,6 +77,15 @@ public abstract class AbstractActionTest
protected static final String TEST_SCM_URL = "scmUrl";
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ ActionContext.setContext( new ActionContext( new HashMap<String, Object>() ) );
+ }
+
protected void setObservableRepos( List<String> repoIds )
{
UserRepositoriesStub repos = (UserRepositoriesStub) lookup( UserRepositories.class );