[portal-commits] JBoss Portal SVN: r7370 - in trunk: test/src/main/org/jboss/portal/test/framework and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2007-06-01 17:46:43 -0400 (Fri, 01 Jun 2007)
New Revision: 7370
Modified:
trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java
Log:
- Moved security related code back to PortalBaseTestCase to avoid leaking JEE stuff to
test.
Modified: trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2007-06-01
08:50:47 UTC (rev 7369)
+++ trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2007-06-01
21:46:43 UTC (rev 7370)
@@ -35,8 +35,11 @@
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimpleGroup;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.jacc.DelegatingPolicy;
import javax.security.auth.Subject;
+import javax.security.jacc.PolicyContext;
+import java.security.Policy;
import java.security.Principal;
import java.security.acl.Group;
import java.util.HashSet;
@@ -51,6 +54,29 @@
*/
public abstract class PortalBaseTestCase extends AbstractPortalTestCase
{
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // Security
+ PolicyContext.setContextID("ctxid");
+ }
+
+ protected void tearDown() throws Exception
+ {
+ /**
+ * Need to delete the context information set in the policy provider
+ * for this test as it will affect the next test that is being run.
+ * The alternative is that each test sets its own context id.
+ */
+ DelegatingPolicy p = (DelegatingPolicy)Policy.getPolicy();
+ p.delete("ctxid");
+ p.refresh();
+
+ super.tearDown();
+ }
+
protected Set getDefaultSecurityConstraints()
{
Set constraints = new HashSet();
Modified: trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java
===================================================================
---
trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java 2007-06-01
08:50:47 UTC (rev 7369)
+++
trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java 2007-06-01
21:46:43 UTC (rev 7370)
@@ -35,11 +35,8 @@
import org.jboss.portal.common.test.junit.POJOJUnitTest;
import org.jboss.portal.test.framework.embedded.DataSourceSupport;
import org.jboss.portal.test.framework.embedded.HibernateSupport;
-import org.jboss.security.jacc.DelegatingPolicy;
-import javax.security.jacc.PolicyContext;
import java.net.URL;
-import java.security.Policy;
/**
* @author <a href="mailto:Anil.Saldhana@jboss.org">Anil
Saldhana</a>
@@ -96,23 +93,10 @@
runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
runtimeContext.addBean("HibernateConfig",
HibernateSupport.getConfig(dataSourceConfigParameter.getName()));
runtimeContext.start();
-
- //
- PolicyContext.setContextID("ctxid");
-
- System.out.println("AbstractPortalTestCase.setUp");
}
protected void tearDown() throws Exception
{
- /**
- * Need to delete the context information set in the policy provider
- * for this test as it will affect the next test that is being run.
- * The alternative is that each test sets its own context id.
- */
- DelegatingPolicy p = (DelegatingPolicy)Policy.getPolicy();
- p.delete("ctxid");
- p.refresh();
runtimeContext.stop();
}