[jboss-cvs] JBossAS SVN: r64184 - in projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml: config and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jul 22 06:39:02 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-07-22 06:39:02 -0400 (Sun, 22 Jul 2007)
New Revision: 64184
Modified:
projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerDynamicPolicyUnitTestCase.java
projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java
projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java
projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java
projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java
Log:
make use of test util class
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerDynamicPolicyUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerDynamicPolicyUnitTestCase.java 2007-07-22 10:38:36 UTC (rev 64183)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerDynamicPolicyUnitTestCase.java 2007-07-22 10:39:02 UTC (rev 64184)
@@ -24,10 +24,8 @@
import java.net.URI;
import java.security.Principal;
import java.security.acl.Group;
-import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
import javax.xml.bind.JAXBElement;
@@ -57,11 +55,11 @@
import org.jboss.security.xacml.interfaces.PolicyDecisionPoint;
import org.jboss.security.xacml.interfaces.PolicyLocator;
import org.jboss.security.xacml.interfaces.RequestContext;
-import org.jboss.security.xacml.interfaces.ResponseContext;
import org.jboss.security.xacml.interfaces.XACMLConstants;
import org.jboss.security.xacml.interfaces.XACMLPolicy;
import org.jboss.security.xacml.interfaces.XMLSchemaConstants;
import org.jboss.security.xacml.locators.JBossPolicyLocator;
+import org.jboss.test.security.xacml.factories.util.XACMLTestUtil;
//$Id$
@@ -74,7 +72,8 @@
*/
public class WebLayerDynamicPolicyUnitTestCase extends TestCase
{
- private boolean debug = false; //Enable for request trace
+ //Enable for request trace
+ private boolean debug = "true".equals(System.getProperty("debug","false"));
public void testWebBinding() throws Exception
{
@@ -105,7 +104,7 @@
};
//Create Role Group
- Group grp = this.getRoleGroup("developer");
+ Group grp = XACMLTestUtil.getRoleGroup("developer");
String requestURI = "http://test/developer-guide.html";
HttpRequestUtil util = new HttpRequestUtil();
@@ -118,7 +117,7 @@
request.marshall(System.out);
assertEquals("Access Allowed?", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,request));
+ XACMLTestUtil.getDecision(pdp,request));
}
public void testNegativeAccessWebBinding() throws Exception
@@ -151,7 +150,7 @@
};
//Create Role Group
- Group grp = this.getRoleGroup("imposter");
+ Group grp = XACMLTestUtil.getRoleGroup("imposter");
String requestURI = "http://test/developer-guide.html";
HttpRequestUtil util = new HttpRequestUtil();
HttpServletRequest req = util.createRequest(p, requestURI);
@@ -159,10 +158,11 @@
//Check DENY condition
WebPEP pep = new WebPEP();
RequestContext request = pep.createXACMLRequest(req, p, grp);
- request.marshall(System.out);
+ if(debug)
+ request.marshall(System.out);
assertEquals("Access Disallowed?", XACMLConstants.DECISION_DENY,
- getDecision(pdp,request));
+ XACMLTestUtil.getDecision(pdp,request));
}
@@ -245,51 +245,5 @@
policyType.getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(denyRule);
return policyType;
- }
-
- private int getDecision(PolicyDecisionPoint pdp, RequestContext request) throws Exception
- {
- ResponseContext response = pdp.evaluate(request);
- assertNotNull("Response is not null", response);
- return response.getDecision();
- }
-
- private Group getRoleGroup( final String roleName)
- {
- return new Group() {
-
- private Vector vect = new Vector();
- public boolean addMember(final Principal principal)
- {
- return vect.add(principal);
- }
-
- public boolean isMember(Principal principal)
- {
- return vect.contains(principal);
- }
-
- public Enumeration<? extends Principal> members()
- {
- vect.add(new Principal()
- {
-
- public String getName()
- {
- return roleName;
- }});
- return vect.elements();
- }
-
- public boolean removeMember(Principal principal)
- {
- return vect.remove(principal);
- }
-
- public String getName()
- {
- return "ROLES";
- }
- };
- }
+ }
}
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java 2007-07-22 10:38:36 UTC (rev 64183)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java 2007-07-22 10:39:02 UTC (rev 64184)
@@ -24,8 +24,6 @@
import java.io.InputStream;
import java.security.Principal;
import java.security.acl.Group;
-import java.util.Enumeration;
-import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
@@ -34,8 +32,8 @@
import org.jboss.security.xacml.core.JBossPDP;
import org.jboss.security.xacml.interfaces.PolicyDecisionPoint;
import org.jboss.security.xacml.interfaces.RequestContext;
-import org.jboss.security.xacml.interfaces.ResponseContext;
import org.jboss.security.xacml.interfaces.XACMLConstants;
+import org.jboss.test.security.xacml.factories.util.XACMLTestUtil;
//$Id$
@@ -47,7 +45,8 @@
*/
public class WebLayerUnitTestCase extends TestCase
{
- private boolean debug = false; //Enable for request trace
+ //Enable for request trace
+ private boolean debug = "true".equals(System.getProperty("debug","false"));
public void testWebBinding() throws Exception
{
@@ -63,7 +62,7 @@
};
//Create Role Group
- Group grp = this.getRoleGroup("developer");
+ Group grp = XACMLTestUtil.getRoleGroup("developer");
String requestURI = "http://test/developer-guide.html";
HttpRequestUtil util = new HttpRequestUtil();
@@ -76,7 +75,7 @@
request.marshall(System.out);
assertEquals("Access Allowed?", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,request));
+ XACMLTestUtil.getDecision(pdp,request));
}
public void testNegativeAccessWebBinding() throws Exception
@@ -92,7 +91,7 @@
};
//Create Role Group
- Group grp = this.getRoleGroup("imposter");
+ Group grp = XACMLTestUtil.getRoleGroup("imposter");
String requestURI = "http://test/developer-guide.html";
HttpRequestUtil util = new HttpRequestUtil();
HttpServletRequest req = util.createRequest(p, requestURI);
@@ -100,10 +99,11 @@
//Check DENY condition
WebPEP pep = new WebPEP();
RequestContext request = pep.createXACMLRequest(req, p, grp);
- request.marshall(System.out);
+ if(debug)
+ request.marshall(System.out);
assertEquals("Access Disallowed?", XACMLConstants.DECISION_DENY,
- getDecision(pdp,request));
+ XACMLTestUtil.getDecision(pdp,request));
}
private PolicyDecisionPoint getPDP()
@@ -113,51 +113,5 @@
assertNotNull("InputStream != null", is);
return new JBossPDP(is);
- }
-
- private int getDecision(PolicyDecisionPoint pdp, RequestContext request) throws Exception
- {
- ResponseContext response = pdp.evaluate(request);
- assertNotNull("Response is not null", response);
- return response.getDecision();
- }
-
- private Group getRoleGroup( final String roleName)
- {
- return new Group() {
-
- private Vector vect = new Vector();
- public boolean addMember(final Principal principal)
- {
- return vect.add(principal);
- }
-
- public boolean isMember(Principal principal)
- {
- return vect.contains(principal);
- }
-
- public Enumeration<? extends Principal> members()
- {
- vect.add(new Principal()
- {
-
- public String getName()
- {
- return roleName;
- }});
- return vect.elements();
- }
-
- public boolean removeMember(Principal principal)
- {
- return vect.remove(principal);
- }
-
- public String getName()
- {
- return "ROLES";
- }
- };
- }
+ }
}
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java 2007-07-22 10:38:36 UTC (rev 64183)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java 2007-07-22 10:39:02 UTC (rev 64184)
@@ -33,11 +33,14 @@
import junit.framework.TestCase;
+import org.jboss.security.xacml.core.JBossPDP;
+import org.jboss.security.xacml.interfaces.PolicyDecisionPoint;
import org.jboss.security.xacml.jaxb.LocatorType;
import org.jboss.security.xacml.jaxb.LocatorsType;
import org.jboss.security.xacml.jaxb.PDP;
import org.jboss.security.xacml.jaxb.PoliciesType;
import org.jboss.security.xacml.jaxb.PolicySetType;
+import org.jboss.test.security.xacml.factories.util.XACMLTestUtil;
//$Id$
@@ -86,4 +89,17 @@
assertNotNull("LocatorType != null", lt);
assertEquals("LocatorType != null", 1,lt.size());
}
+
+ /**
+ * Test the URL version of the PDP construction
+ * @throws Exception
+ */
+ public void testPDPConfig() throws Exception
+ {
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ URL configFile = tcl.getResource("test/config/interopPolicySetConfig.xml");
+ assertNotNull("configFile != null", configFile);
+ PolicyDecisionPoint pdp = new JBossPDP(configFile);
+ XACMLTestUtil.validateInteropCases(pdp);
+ }
}
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java 2007-07-22 10:38:36 UTC (rev 64183)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java 2007-07-22 10:39:02 UTC (rev 64184)
@@ -36,8 +36,8 @@
import org.jboss.security.xacml.factories.RequestResponseContextFactory;
import org.jboss.security.xacml.interfaces.PolicyDecisionPoint;
import org.jboss.security.xacml.interfaces.RequestContext;
-import org.jboss.security.xacml.interfaces.ResponseContext;
import org.jboss.security.xacml.interfaces.XACMLConstants;
+import org.jboss.test.security.xacml.factories.util.XACMLTestUtil;
//$Id$
@@ -50,7 +50,8 @@
public class JBossPDPUnitTestCase extends TestCase
{
/**Enable to see the xacml request in system out for the objects case**/
- private boolean sysout = false;
+ //Enable for request trace
+ private boolean debug = "true".equals(System.getProperty("debug","false"));
public void testInteropTestWithXMLRequests() throws Exception
{
@@ -71,20 +72,7 @@
7 10000 15000 10000 True True 1000 10 Permit
*/
- assertEquals("Case 1 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,"test/requests/interop/scenario2-testcase1-request.xml"));
- assertEquals("Case 2 should be deny", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,"test/requests/interop/scenario2-testcase2-request.xml"));
- assertEquals("Case 3 should be deny", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,"test/requests/interop/scenario2-testcase3-request.xml"));
- assertEquals("Case 4 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,"test/requests/interop/scenario2-testcase4-request.xml"));
- assertEquals("Case 5 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,"test/requests/interop/scenario2-testcase5-request.xml"));
- assertEquals("Case 6 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,"test/requests/interop/scenario2-testcase6-request.xml"));
- assertEquals("Case 7 should be deny", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,"test/requests/interop/scenario2-testcase7-request.xml"));
+ XACMLTestUtil.validateInteropCases(pdp);
}
public void testInteropTestWithObjects() throws Exception
@@ -96,19 +84,19 @@
assertNotNull("JBossPDP is != null", pdp);
assertEquals("Case 1 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,getRequestContext("false","false",10)));
+ XACMLTestUtil.getDecision(pdp,getRequestContext("false","false",10)));
assertEquals("Case 2 should be deny", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,getRequestContext("false","false",1)));
+ XACMLTestUtil.getDecision(pdp,getRequestContext("false","false",1)));
assertEquals("Case 3 should be deny", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,getRequestContext("true","false",5)));
+ XACMLTestUtil.getDecision(pdp,getRequestContext("true","false",5)));
assertEquals("Case 4 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,getRequestContext("false","false",9)));
+ XACMLTestUtil.getDecision(pdp,getRequestContext("false","false",9)));
assertEquals("Case 5 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,getRequestContext("true","false",10)));
+ XACMLTestUtil.getDecision(pdp,getRequestContext("true","false",10)));
assertEquals("Case 6 should be deny", XACMLConstants.DECISION_DENY,
- getDecision(pdp,getRequestContext("true","false",15)));
+ XACMLTestUtil.getDecision(pdp,getRequestContext("true","false",15)));
assertEquals("Case 7 should be deny", XACMLConstants.DECISION_PERMIT,
- getDecision(pdp,getRequestContext("true","true",10)));
+ XACMLTestUtil.getDecision(pdp,getRequestContext("true","true",10)));
}
private RequestContext getRequestContext(String reqTradeAppr, String reqCreditAppr,
@@ -122,32 +110,13 @@
RequestContext requestCtx = RequestResponseContextFactory.createRequestCtx();
requestCtx.setRequest(request);
- if(sysout)
+ if(debug)
requestCtx.marshall(System.out);
return requestCtx;
- }
+ }
- private int getDecision(PolicyDecisionPoint pdp, String loc) throws Exception
- {
- ClassLoader tcl = Thread.currentThread().getContextClassLoader();
- InputStream is = tcl.getResourceAsStream(loc);
- RequestContext request = RequestResponseContextFactory.createRequestCtx();
- request.readRequest(is);
- ResponseContext response = pdp.evaluate(request);
- assertNotNull("Response is not null", response);
- return response.getDecision();
- }
-
- private int getDecision(PolicyDecisionPoint pdp, RequestContext request)
- throws Exception
- {
- ResponseContext response = pdp.evaluate(request);
- assertNotNull("Response is not null", response);
- return response.getDecision();
- }
-
private SubjectType createSubject(String reqTradeAppr, String reqCreditAppr,
int buyPrice)
{
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java 2007-07-22 10:38:36 UTC (rev 64183)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java 2007-07-22 10:39:02 UTC (rev 64184)
@@ -36,8 +36,8 @@
import org.jboss.security.xacml.factories.RequestResponseContextFactory;
import org.jboss.security.xacml.interfaces.PolicyDecisionPoint;
import org.jboss.security.xacml.interfaces.RequestContext;
-import org.jboss.security.xacml.interfaces.ResponseContext;
import org.jboss.security.xacml.interfaces.XACMLConstants;
+import org.jboss.test.security.xacml.factories.util.XACMLTestUtil;
/**
@@ -65,7 +65,9 @@
PolicyDecisionPoint pdp = new JBossPDP(is);
assertNotNull("JBossPDP is != null", pdp);
- assertEquals("Case 1 should be deny", XACMLConstants.DECISION_DENY, getDecision(pdp,requestCtx));
+ assertEquals("Case 1 should be deny",
+ XACMLConstants.DECISION_DENY,
+ XACMLTestUtil.getDecision(pdp,requestCtx));
}
private SubjectType createSubject()
@@ -158,13 +160,5 @@
"xacml20.interop.com", "Buy");
actionType.getAttribute().add(attActionID);
return actionType;
- }
-
- private int getDecision(PolicyDecisionPoint pdp, RequestContext request)
- throws Exception
- {
- ResponseContext response = pdp.evaluate(request);
- assertNotNull("Response is not null", response);
- return response.getDecision();
- }
+ }
}
More information about the jboss-cvs-commits
mailing list