You are viewing a plain text version of this content. The canonical link for it is here.
Posted to imperius-commits@incubator.apache.org by jn...@apache.org on 2008/01/03 19:14:32 UTC
svn commit: r608599 -
/incubator/imperius/trunk/modules/imperius-javaspl/src/org/apache/imperius/javaspl/samples/simplepolicies/RunSamples.java
Author: jneeraj
Date: Thu Jan 3 11:14:30 2008
New Revision: 608599
URL: http://svn.apache.org/viewvc?rev=608599&view=rev
Log:
1) The user provides a map
with instancename -> instanceobject
and 2) the evaluator will silently ignore instances that are not imported
inside the policy
Modified:
incubator/imperius/trunk/modules/imperius-javaspl/src/org/apache/imperius/javaspl/samples/simplepolicies/RunSamples.java
Modified: incubator/imperius/trunk/modules/imperius-javaspl/src/org/apache/imperius/javaspl/samples/simplepolicies/RunSamples.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/modules/imperius-javaspl/src/org/apache/imperius/javaspl/samples/simplepolicies/RunSamples.java?rev=608599&r1=608598&r2=608599&view=diff
==============================================================================
--- incubator/imperius/trunk/modules/imperius-javaspl/src/org/apache/imperius/javaspl/samples/simplepolicies/RunSamples.java (original)
+++ incubator/imperius/trunk/modules/imperius-javaspl/src/org/apache/imperius/javaspl/samples/simplepolicies/RunSamples.java Thu Jan 3 11:14:30 2008
@@ -4,13 +4,10 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.List;
import java.util.Map;
import org.apache.imperius.javaspl.Java_SPLPolicyRuleProvider;
-import org.apache.imperius.spl.external.InstanceInfo;
import org.apache.imperius.spl.parser.exceptions.SPLException;
public class RunSamples {
@@ -86,17 +83,10 @@
public static void testPolicy(String policyToExecute)
{
TestElement te=new TestElement();
-
Map objMap = new Hashtable();
-
- List instanceInfoList = new ArrayList();
-
- InstanceInfo ii1 = new InstanceInfo("te",te);
- instanceInfoList.add(ii1);
-
- objMap.put("org.apache.imperius.javaspl.samples.simplepolicies.TestElement", instanceInfoList);
-
+ objMap.put("te", te);
+
_test(policyToExecute,objMap);
@@ -111,27 +101,15 @@
Map objMap = new Hashtable();
- List instanceInfoList1 = new ArrayList();
-
SampleClass sc1 = new SampleClass(1,2);
- InstanceInfo ii1 = new InstanceInfo("sc1", sc1);
-
- instanceInfoList1.add(ii1);
-
- SampleClass sc2 = new SampleClass(3,4);
- InstanceInfo ii2 = new InstanceInfo("sc2",sc2);
-
- instanceInfoList1.add(ii2);
-
- objMap.put("org.apache.imperius.javaspl.samples.simplepolicies.SampleClass", instanceInfoList1);
-
- List instanceInfoList2 = new ArrayList();
- AnotherClass ac1 = new AnotherClass(5,6);
- InstanceInfo ii3 = new InstanceInfo("ac1",ac1);
- instanceInfoList2.add(ii3);
-
- objMap.put("org.apache.imperius.javaspl.samples.simplepolicies.AnotherClass", instanceInfoList2);
-
+ objMap.put("sc1", sc1);
+
+ SampleClass sc2 = new SampleClass(3,4);
+ objMap.put("sc2", sc2);
+
+ AnotherClass ac1 = new AnotherClass(5,6);
+ objMap.put("ac1", ac1);
+
_test(policyToExecute,objMap);
@@ -140,29 +118,14 @@
{
String [] policiesToTest = {"SimplePolicy","ComplexPolicy",
"MultiplePolicySample","InvokeMethodSample","DateTime","MacroSample"};
-
- String policyToExecute = null;
- /*if(args.length == 1)
+
+ for (int i=0 ; i < policiesToTest.length; i++)
{
- policyToExecute = args[0];
- if(!policyToExecute.equals("BasicPolicy"))
- {
- testPolicy(policyToExecute);
- }
- else
- {
- testBasicPolicy();
- }
+ String policy = policiesToTest[i];
+ testPolicy(policy);
}
- else
- {*/
- for (int i=0 ; i < policiesToTest.length; i++)
- {
- String policy = policiesToTest[i];
- testPolicy(policy);
- }
- testBasicPolicy();
-// }
+ testBasicPolicy();
+
}
@@ -170,7 +133,7 @@
policyFolder = pFolder;
test();
- // TODO Auto-generated method stub
+
}