commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1634235 [3/3] - in /commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2: ./ env/ env/groovy/ env/javascript/ env/jexl/ env/xpath/ invoke/ io/ issues/ model/
Date Sat, 25 Oct 2014 15:24:28 GMT
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue62-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue62-03.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue62-03.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue62-03.xml Sat Oct 25 15:24:25 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" datamodel="jexl"
        initial="s1">
 
     <state id="s1">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-01.xml Sat Oct 25 15:24:25 2014
@@ -18,6 +18,7 @@
 <!-- Correct SCXML document -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="tranbug">
 
     <state id="tranbug">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-02.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/issue64-02.xml Sat Oct 25 15:24:25 2014
@@ -19,6 +19,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        xmlns:my="http://my.foo.example/"
        version="1.0"
+       datamodel="jexl"
        initial="tranbug">
 
     <datamodel>

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/queue-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/queue-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/queue-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/queue-01.xml Sat Oct 25 15:24:25 2014
@@ -19,6 +19,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        xmlns:my="http://my.custom-actions.domain/CUSTOM"
        version="1.0"
+       datamodel="jexl"
        initial="init">
 
     <state id="init">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java Sat Oct 25 15:24:25 2014
@@ -16,15 +16,10 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
-
+import org.apache.commons.scxml2.Context;
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.apache.commons.scxml2.env.jexl.JexlContext;
-import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.scxml2.model.Assign}.
@@ -38,63 +33,29 @@ import org.junit.Test;
  */
 public class ActionsTest {
 
-    // Test data
-    private URL actionsSample01, actionsSample02, actionsSample03;
-    private JexlEvaluator evaluator;
-    private JexlContext ctx;
-    private SCXMLExecutor exec;
-
-    /**
-     * Set up instance variables required by this test case.
-     */
-    @Before
-    public void setUp() {
-        actionsSample01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/actions-state-test.xml");
-        actionsSample02 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/actions-parallel-test.xml");
-        actionsSample03 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/actions-initial-test.xml");
-        evaluator = new JexlEvaluator();
-        ctx = new JexlContext();
-    }
-
-    /**
-     * Tear down instance variables required by this test case.
-     */
-    @After
-    public void tearDown() {
-        actionsSample01 = actionsSample02 = actionsSample03 = null;
-        evaluator = null;
-        ctx = null;
-        exec = null;
-    }
-
-    /**
-     * Test the implementation
-     */    
     @Test
     public void testStateActions() throws Exception {
-        SCXML scxml = SCXMLTestHelper.parse(actionsSample01);
-        runTest(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/actions-state-test.xml");
+        exec.go();
+        runTest(exec);
     }
     
     @Test
     public void testParallelActions() throws Exception {
-        SCXML scxml = SCXMLTestHelper.parse(actionsSample02);
-        runTest(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/actions-parallel-test.xml");
+        exec.go();
+        runTest(exec);
     }
     
     @Test
     public void testInitialActions() throws Exception {
-        SCXML scxml = SCXMLTestHelper.parse(actionsSample03);
-        runTest(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/actions-initial-test.xml");
+        exec.go();
+        runTest(exec);
     }
 
-    private void runTest(SCXML scxml) throws Exception {
-        exec = SCXMLTestHelper.getExecutor(scxml, ctx, evaluator);
-        JexlContext ctx = (JexlContext) SCXMLTestHelper.lookupContext(exec,
-            "actionsTest");
+    private void runTest(SCXMLExecutor exec) throws Exception {
+        Context ctx = SCXMLTestHelper.lookupContext(exec, "actionsTest");
         Assert.assertEquals(ctx.get("foo"), "foobar");
         Assert.assertEquals("Missed event transition",
             true, ctx.get("eventsent"));

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/AssignTest.java Sat Oct 25 15:24:25 2014
@@ -16,50 +16,21 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.Set;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 /**
  * Unit tests for &lt;assign&gt; element, particular the "src" attribute.
  */
 public class AssignTest {
 
-    // Test data
-    private URL assign01, assign02;
-    private SCXMLExecutor exec;
-
-    /**
-     * Set up instance variables required by this test case.
-     */
-    @Before
-    public void setUp() {
-        assign01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/assign-test-01.xml");
-        assign02 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/assign-test-02.xml");
-    }
-
-    /**
-     * Tear down instance variables required by this test case.
-     */
-    @After
-    public void tearDown() {
-        assign01 = assign02 = null;
-        exec = null;
-    }
-
-    /**
-     * Test the implementation
-     */    
     @Test
     public void testAssignSrc() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(assign01);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/assign-test-01.xml");
+        exec.go();
         Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("assign3", currentStates.iterator().next().getId());
@@ -68,7 +39,8 @@ public class AssignTest {
     
     @Test
     public void testAssignDeep() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(assign02);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/assign-test-02.xml");
+        exec.go();
         Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("assign3", currentStates.iterator().next().getId());

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/CustomActionTest.java Sat Oct 25 15:24:25 2014
@@ -16,50 +16,25 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 public class CustomActionTest {
 
-    private URL hello01, custom01, external01, override01, payload01;
-    private SCXMLExecutor exec;
-
     /**
      * Set up instance variables required by this test case.
      */
     @Before
     public void setUp() {
-        hello01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/hello-world.xml");
-        custom01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/custom-hello-world-01.xml");
-        external01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/external-hello-world.xml");
-        override01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/custom-hello-world-03.xml");
-        payload01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/custom-hello-world-04-jexl.xml");
-
         Hello.callbacks = 0;
     }
 
-    /**
-     * Tear down instance variables required by this test case.
-     */
-    @After
-    public void tearDown() {
-        hello01 = custom01 = external01 = payload01 = null;
-        exec = null;
-    }
-
     @Test
     public void testAddGoodCustomAction01() throws Exception {
         new CustomAction("http://my.actions.domain/CUSTOM", "hello",
@@ -123,7 +98,8 @@ public class CustomActionTest {
     @Test
     public void testHelloWorld() throws Exception {
         // (1) Get a SCXMLExecutor
-        exec = SCXMLTestHelper.getExecutor(hello01);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/hello-world.xml");
+        exec.go();
         // (2) Single, final state
         Assert.assertEquals("hello", (exec.getCurrentStatus().getStates().
                 iterator().next()).getId());
@@ -147,9 +123,10 @@ public class CustomActionTest {
         customActions.add(ca1);
         customActions.add(ca2);
         // (2) Parse the document
-        SCXML scxml = SCXMLTestHelper.parse(custom01, customActions);
+        SCXML scxml = SCXMLTestHelper.parse("org/apache/commons/scxml2/custom-hello-world-01.xml", customActions);
         // (3) Get a SCXMLExecutor
-        exec = SCXMLTestHelper.getExecutor(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
+        exec.go();
         // (4) Single, final state
         Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
                 iterator().next()).getId());
@@ -172,9 +149,10 @@ public class CustomActionTest {
         List<CustomAction> customActions = new ArrayList<CustomAction>();
         customActions.add(ca);
         // (2) Parse the document
-        SCXML scxml = SCXMLTestHelper.parse(external01, customActions);
+        SCXML scxml = SCXMLTestHelper.parse("org/apache/commons/scxml2/external-hello-world.xml", customActions);
         // (3) Get a SCXMLExecutor
-        exec = SCXMLTestHelper.getExecutor(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
+        exec.go();
         // (4) Single, final state
         Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
             iterator().next()).getId());
@@ -195,9 +173,10 @@ public class CustomActionTest {
         List<CustomAction> customActions = new ArrayList<CustomAction>();
         customActions.add(ca);
         // (2) Parse the document
-        SCXML scxml = SCXMLTestHelper.parse(override01, customActions);
+        SCXML scxml = SCXMLTestHelper.parse("org/apache/commons/scxml2/custom-hello-world-03.xml", customActions);
         // (3) Get a SCXMLExecutor
-        exec = SCXMLTestHelper.getExecutor(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
+        exec.go();
         // (4) Single, final state
         Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
             iterator().next()).getId());
@@ -219,9 +198,10 @@ public class CustomActionTest {
         List<CustomAction> customActions = new ArrayList<CustomAction>();
         customActions.add(ca);
         // (2) Parse the document
-        SCXML scxml = SCXMLTestHelper.parse(payload01, customActions);
+        SCXML scxml = SCXMLTestHelper.parse("org/apache/commons/scxml2/custom-hello-world-04-jexl.xml", customActions);
         // (3) Get a SCXMLExecutor
-        exec = SCXMLTestHelper.getExecutor(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
+        exec.go();
         // (4) Single, final state
         Assert.assertEquals("Invalid intermediate state",
                      "custom1", (exec.getCurrentStatus().getStates().

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java Sat Oct 25 15:24:25 2014
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -24,76 +23,40 @@ import java.util.Set;
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
 import org.apache.commons.scxml2.TriggerEvent;
-import org.apache.commons.scxml2.env.jexl.JexlContext;
-import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.scxml2.SCXMLExecutor}.
  */
 public class DatamodelTest {
 
-    // Test data
-    private URL datamodel01jexl, datamodel02jexl, datamodel04jexl, datamodel05jexl;
-    private SCXMLExecutor exec01, exec02;
-
-    /**
-     * Set up instance variables required by this test case.
-     */
-    @Before
-    public void setUp() {
-        datamodel01jexl = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jexl/datamodel-01.xml");
-        datamodel02jexl = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jexl/datamodel-02.xml");
-        datamodel04jexl = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jexl/datamodel-04.xml");
-        datamodel05jexl = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jexl/datamodel-05.xml");
-    }
-
-    /**
-     * Tear down instance variables required by this test case.
-     */
-    @After
-    public void tearDown() {
-        datamodel01jexl = datamodel02jexl = datamodel04jexl = datamodel05jexl = null;
-    }
-
     /**
      * Test the stateless model, simultaneous executions
      */    
     @Test
     public void testDatamodelSimultaneousJexl() throws Exception {
-        exec01 = SCXMLTestHelper.getExecutor(datamodel01jexl,
-            new JexlContext(), new JexlEvaluator());
-        Assert.assertNotNull(exec01);
-        exec02 = SCXMLTestHelper.getExecutor(datamodel01jexl,
-            new JexlContext(), new JexlEvaluator());
-        Assert.assertNotNull(exec02);
+        SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-01.xml");
+        exec01.go();
+        SCXMLExecutor exec02 = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-01.xml");
+        exec02.go();
         Assert.assertFalse(exec01 == exec02);
-        runtest();
+        runtest(exec01, exec02);
     }
     
     @Test
     public void testDatamodelNamespacePrefixedXPaths() throws Exception {
-        exec01 = SCXMLTestHelper.getExecutor(datamodel02jexl,
-            new JexlContext(), new JexlEvaluator());
-        Assert.assertNotNull(exec01);
-        exec02 = SCXMLTestHelper.getExecutor(datamodel02jexl,
-                new JexlContext(), new JexlEvaluator());
-        Assert.assertNotNull(exec02);
+        SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-02.xml");
+        exec01.go();
+        SCXMLExecutor exec02 = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-02.xml");
+        exec02.go();
         Assert.assertFalse(exec01 == exec02);
-        runtest();
+        runtest(exec01, exec02);
     }
     
     @Test
     public void testDatamodel04Jexl() throws Exception {
-        exec01 = SCXMLTestHelper.getExecutor(datamodel04jexl,
-            new JexlContext(), new JexlEvaluator());
-        Assert.assertNotNull(exec01);
+        SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-04.xml");
+        exec01.go();
         Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", currentStates.iterator().next().getId());
@@ -113,12 +76,12 @@ public class DatamodelTest {
     
     @Test
     public void testDatamodel05Jexl() throws Exception {
-        exec01 = SCXMLTestHelper.getExecutor(datamodel05jexl);
-        Assert.assertNotNull(exec01);
+        SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-05.xml");
+        exec01.go();
         SCXMLTestHelper.assertState(exec01, "end");
     }
 
-    private void runtest() throws Exception {
+    private void runtest(SCXMLExecutor exec01, SCXMLExecutor exec02) throws Exception {
         //// Interleaved
         // exec01
         Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java Sat Oct 25 15:24:25 2014
@@ -16,54 +16,18 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.Set;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class HistoryTest {
 
-    // Test data
-    private History history;
-    private URL shallow01, deep01, defaults01, parallel01;
-    private SCXMLExecutor exec;
-
-    /**
-     * Set up instance variables required by this test case.
-     */   
-    @Before
-    public void setUp() {
-        history = new History();
-        shallow01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/history-shallow-01.xml");
-        deep01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/history-deep-01.xml");
-        defaults01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/history-default-01.xml");
-        parallel01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/history-parallel-01.xml");
-    }
-
-    /**
-     * Tear down instance variables required by this test case.
-     */
-    @After
-    public void tearDown() {
-        history = null;
-        shallow01 = deep01 = defaults01 = parallel01 = null;
-        exec = null;
-    }
-
-    /**
-     * Test the implementation
-     */    
     @Test
     public void testSetTypeDeep() {
+        History history = new History();
         history.setType("deep");
         
         Assert.assertTrue(history.isDeep());
@@ -71,6 +35,7 @@ public class HistoryTest {
         
     @Test
     public void testSetTypeNotDeep() {
+        History history = new History();
         history.setType("shallow");
         
         Assert.assertFalse(history.isDeep());
@@ -78,19 +43,22 @@ public class HistoryTest {
     
     @Test
     public void testShallowHistory01() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(shallow01);
-        runHistoryFlow();
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-shallow-01.xml");
+        exec.go();
+        runHistoryFlow(exec);
     }
     
     @Test
     public void testDeepHistory01() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(deep01);
-        runHistoryFlow();
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-deep-01.xml");
+        exec.go();
+        runHistoryFlow(exec);
     }
     
     @Test
     public void testHistoryDefaults01() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(defaults01);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-default-01.xml");
+        exec.go();
         Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("state11", currentStates.iterator().next().getId());
@@ -104,7 +72,8 @@ public class HistoryTest {
     
     @Test
     public void testHistoryParallel01() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(parallel01);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-parallel-01.xml");
+        exec.go();
         Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         SCXMLTestHelper.assertState(exec, "off_call");
@@ -119,35 +88,35 @@ public class HistoryTest {
         SCXMLTestHelper.assertPostTriggerStates(exec, "alternate", new String[] { "held", "on_call" });
     }
 
-    private void runHistoryFlow() throws Exception {
+    private void runHistoryFlow(SCXMLExecutor exec) throws Exception {
         Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("phase1", currentStates.iterator().next().getId());
-        Assert.assertEquals("phase1", pauseAndResume());
-        Assert.assertEquals("phase2", nextPhase());
+        Assert.assertEquals("phase1", pauseAndResume(exec));
+        Assert.assertEquals("phase2", nextPhase(exec));
         // pause and resume couple of times for good measure
-        Assert.assertEquals("phase2", pauseAndResume());
-        Assert.assertEquals("phase2", pauseAndResume());
-        Assert.assertEquals("phase3", nextPhase());
-        Assert.assertEquals("phase3", pauseAndResume());
+        Assert.assertEquals("phase2", pauseAndResume(exec));
+        Assert.assertEquals("phase2", pauseAndResume(exec));
+        Assert.assertEquals("phase3", nextPhase(exec));
+        Assert.assertEquals("phase3", pauseAndResume(exec));
         exec.reset();
         currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("phase1", currentStates.iterator().next().getId());
     }
 
-    private String pauseAndResume() throws Exception {
+    private String pauseAndResume(SCXMLExecutor exec) throws Exception {
         Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "flow.pause");
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("interrupted", currentStates.iterator().next().getId());
         exec = SCXMLTestHelper.testInstanceSerializability(exec);
         currentStates = SCXMLTestHelper.fireEvent(exec, "flow.resume");
         Assert.assertEquals(1, currentStates.size());
-        exec = SCXMLTestHelper.testInstanceSerializability(exec);
+        SCXMLTestHelper.testInstanceSerializability(exec);
         return currentStates.iterator().next().getId();
     }
 
-    private String nextPhase() throws Exception {
+    private String nextPhase(SCXMLExecutor exec) throws Exception {
         Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "done.state.phase");
         Assert.assertEquals(1, currentStates.size());
         return currentStates.iterator().next().getId();

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java Sat Oct 25 15:24:25 2014
@@ -16,60 +16,37 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.scxml2.Builtin;
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Node;
 
 public class ParallelTest {
 
-    // Test data
-    private URL parallel01, parallel02, parallel03;
-    private SCXMLExecutor exec;
-    
-    @Before
-    public void setUp() {
-        parallel01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/parallel-01.xml");
-        parallel02 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/parallel-02.xml");
-        parallel03 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/parallel-03.xml");
-    }
-
-    @After
-    public void tearDown() {
-        parallel01 = parallel02 = parallel03 = null;
-        exec = null;
-    }
-    
     @Test
     public void testParallel01() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(parallel01);
-        Assert.assertNotNull(exec);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/parallel-01.xml");
+        exec.go();
         SCXMLTestHelper.assertPostTriggerState(exec, "foo", "end");
     }
     
     @Test
     public void testParallel02() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(parallel02);
-        Assert.assertNotNull(exec);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/parallel-02.xml");
+        exec.go();
         SCXMLTestHelper.assertPostTriggerStates(exec, "dummy.event", new String[] { "state01", "state02" });
         SCXMLTestHelper.assertPostTriggerState(exec, "event1", "state1");
     }
     
     @Test
     public void testParallel03() throws Exception {
-        exec = SCXMLTestHelper.getExecutor(parallel03);
-        Assert.assertNotNull(exec);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/parallel-03.xml");
+        exec.go();
         SCXMLTestHelper.assertPostTriggerStates(exec, "dummy.event", new String[] { "para11", "para21" });
         Node data = (Node) exec.getRootContext().get("root");
         Map<String, String> namespaces = new HashMap<String, String>();

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java Sat Oct 25 15:24:25 2014
@@ -16,54 +16,34 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.Set;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.apache.commons.scxml2.env.javascript.JSEvaluator;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class ScriptTest {
 
-    private URL script01jexl, script01js;
-
-    /**
-     * Set up instance variables required by this test case.
-     */
-    @Before
-    public void setUp() {
-        script01jexl = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jexl/script-01.xml");
-        script01js = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/javascript/script-01.xml");
-    }
-
-    /**
-     * Tear down instance variables required by this test case.
-     */
-    @After
-    public void tearDown() {
-        script01jexl = script01js = null;
-    }
-
     /**
      * Test JEXL script execution.
      */    
     @Test
     public void testJexlScriptExecution() throws Exception {
-        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(script01jexl);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/script-01.xml");
+        exec.go();
         Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("end", currentStates.iterator().next().getId());
     }
-    
+
+    /**
+     * Test JS script execution.
+     */
     @Test
     public void testJavaScriptExecution() throws Exception {
-        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(script01js, new JSEvaluator());
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/javascript/script-01.xml");
+        exec.go();
         Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("end", currentStates.iterator().next().getId());

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScxmlInitialAttributeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScxmlInitialAttributeTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScxmlInitialAttributeTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/ScxmlInitialAttributeTest.java Sat Oct 25 15:24:25 2014
@@ -24,8 +24,6 @@ import java.io.StringReader;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.apache.commons.scxml2.env.jexl.JexlContext;
-import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
 import org.junit.Test;
 
 public class ScxmlInitialAttributeTest {
@@ -60,7 +58,8 @@ public class ScxmlInitialAttributeTest {
         assertEquals("The initial state ID reading was wrong.", "s1", scxml.getInitial());
         TransitionTarget tt = scxml.getInitialTransition().getTargets().iterator().next();
         assertEquals("The initial state resolution was wrong.", "s1", tt.getId());
-        SCXMLExecutor exec = executeSCXML(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
+        exec.go();
         assertEquals(scxml.getTargets().get("s1"), exec.getCurrentStatus().getStates().iterator().next());
     }
 
@@ -70,7 +69,8 @@ public class ScxmlInitialAttributeTest {
         assertNull(scxml.getInitial());
         TransitionTarget tt = scxml.getInitialTransition().getTargets().iterator().next();
         assertEquals("The initial state resolution was wrong.", "s1", tt.getId());
-        SCXMLExecutor exec = executeSCXML(scxml);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
+        exec.go();
         assertEquals(scxml.getTargets().get("s1"), exec.getCurrentStatus().getStates().iterator().next());
     }
 
@@ -83,11 +83,4 @@ public class ScxmlInitialAttributeTest {
             // expected because of the non-existing initial state id
         }
     }
-
-    private SCXMLExecutor executeSCXML(SCXML scxml) throws Exception {
-        SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml, new JexlContext(), new JexlEvaluator());
-        exec.go();
-        return exec;
-    }
-
 }

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StateTest.java Sat Oct 25 15:24:25 2014
@@ -16,46 +16,25 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.List;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class StateTest {
 
-    // Test data
-    private State state;
-    private URL state01;
-    private SCXMLExecutor exec;
-
-    @Before
-    public void setUp() {
-        state = new State();
-        state01 = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/state-01.xml");
-    }
-
-    @After
-    public void tearDown() {
-        state01 = null;
-        exec = null;
-    }
-    
     @Test
     public void testGetTransitionsListNull() {
+        State state = new State();
         Assert.assertNull(state.getTransitionsList("event"));
     }
         
     @Test
     public void testGetTransitionsList() {
-        
+        State state = new State();
         state.getTransitionsList().add(new Transition());
-        
         Assert.assertNotNull(state.getTransitionsList(null));
     }
         
@@ -63,7 +42,8 @@ public class StateTest {
     public void testAddTransitionDoesNotContainKey() {
         Transition transition = new Transition();
         transition.setEvent("event");
-        
+
+        State state = new State();
         state.addTransition(transition);
         
         List<Transition> events = state.getTransitionsList("event");
@@ -80,6 +60,7 @@ public class StateTest {
         Transition transition2 = new Transition();
         transition2.setEvent("event");
 
+        State state = new State();
         state.addTransition(transition1);
         state.addTransition(transition2);
         
@@ -96,6 +77,7 @@ public class StateTest {
         Transition transition2 = new Transition();
         transition2.setEvent("event");
 
+        State state = new State();
         state.addTransition(transition1);
         state.addTransition(transition2);
         
@@ -106,13 +88,15 @@ public class StateTest {
         
     @Test
     public void testHasHistoryEmpty() {
+        State state = new State();
         Assert.assertFalse(state.hasHistory());
     }
     
     @Test
     public void testHasHistory() {
         History history = new History();
-        
+
+        State state = new State();
         state.addHistory(history);
         
         Assert.assertTrue(state.hasHistory());
@@ -120,6 +104,7 @@ public class StateTest {
         
     @Test
     public void testIsSimple() {
+        State state = new State();
         Assert.assertTrue(state.isSimple());
     }
         
@@ -127,8 +112,7 @@ public class StateTest {
     public void testIsSimpleHasChildren() {
         State state1 = new State();
         
-        // redundant cast to remove deprecation warning
-        // could be removed in v1.0
+        State state = new State();
         state.addChild(state1);
         
         Assert.assertFalse(state.isSimple());
@@ -136,13 +120,15 @@ public class StateTest {
         
     @Test
     public void testIsCompositeFalse() {
+        State state = new State();
         Assert.assertFalse(state.isComposite());
     }
         
     @Test
     public void testIsCompositeParallel() {
         State child = new State();
-        
+
+        State state = new State();
         state.addChild(child);
         
         Assert.assertTrue(state.isComposite());
@@ -151,9 +137,8 @@ public class StateTest {
     @Test
     public void testIsCompositeHasChildren() {
         State state1 = new State();
-        
-        // redundant cast to remove deprecation warning
-        // could be removed in v1.0
+
+        State state = new State();
         state.addChild(state1);
         
         Assert.assertTrue(state.isComposite());
@@ -161,6 +146,7 @@ public class StateTest {
         
     @Test
     public void testIsRegion() {
+        State state = new State();
         state.setParent(new Parallel());
         
         Assert.assertTrue(state.isRegion());
@@ -168,6 +154,7 @@ public class StateTest {
         
     @Test
     public void testIsRegionNotParallel() {
+        State state = new State();
         state.setParent(new State());
         
         Assert.assertFalse(state.isRegion());
@@ -175,11 +162,8 @@ public class StateTest {
     
     @Test
     public void testInitialAttribute() throws Exception {
-        SCXML scxml = SCXMLTestHelper.parse(state01);
-        Assert.assertNotNull(scxml);
-        exec = SCXMLTestHelper.getExecutor(scxml);
-        Assert.assertNotNull(exec);
+        SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/state-01.xml");
+        exec.go();
         Assert.assertEquals("s11", exec.getCurrentStatus().getStates().iterator().next().getId());
     }
-
 }

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java Sat Oct 25 15:24:25 2014
@@ -16,49 +16,18 @@
  */
 package org.apache.commons.scxml2.model;
 
-import java.net.URL;
 import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
 import org.apache.commons.scxml2.TriggerEvent;
-import org.apache.commons.scxml2.env.SimpleSCXMLListener;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.scxml2.SCXMLExecutor}.
  */
-public class    StatelessModelTest {
-
-    // Test data
-    private URL stateless01jexl, stateless01par;
-    private SCXML scxml01jexl, scxml01par, scxml02par;
-    private SCXMLExecutor exec01, exec02;
-
-    /**
-     * Set up instance variables required by this test case.
-     */
-    @Before
-    public void setUp() throws Exception {
-        stateless01jexl = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/env/jexl/stateless-01.xml");
-        stateless01par = this.getClass().getClassLoader().
-            getResource("org/apache/commons/scxml2/model/stateless-parallel-01.xml");
-        scxml01jexl = SCXMLTestHelper.parse(stateless01jexl);
-        scxml01par = SCXMLTestHelper.parse(stateless01par);
-        scxml02par = SCXMLTestHelper.parse(stateless01par);
-    }
-
-    /**
-     * Tear down instance variables required by this test case.
-     */
-    @After
-    public void tearDown() {
-        stateless01jexl = null;
-    }
+public class StatelessModelTest {
 
     /**
      * Test the stateless model, simultaneous executions, JEXL expressions
@@ -66,12 +35,13 @@ public class    StatelessModelTest {
     @Test
     public void testStatelessModelSimultaneousJexl() throws Exception {
     	// parse once, use many times
-        exec01 = SCXMLTestHelper.getExecutor(scxml01jexl);
-        Assert.assertNotNull(exec01);
-        exec02 = SCXMLTestHelper.getExecutor(scxml01jexl);
-        Assert.assertNotNull(exec02);
+        SCXML scxml = SCXMLTestHelper.parse("org/apache/commons/scxml2/env/jexl/stateless-01.xml");
+        SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor(scxml);
+        exec01.go();
+        SCXMLExecutor exec02 = SCXMLTestHelper.getExecutor(scxml);
+        exec02.go();
         Assert.assertFalse(exec01 == exec02);
-        runSimultaneousTest();
+        runSimultaneousTest(exec01, exec02);
     }
 
     /**
@@ -80,10 +50,11 @@ public class    StatelessModelTest {
     @Test
     public void testStatelessModelSequentialJexl() throws Exception {
         // rinse and repeat
+        SCXML scxml = SCXMLTestHelper.parse("org/apache/commons/scxml2/env/jexl/stateless-01.xml");
         for (int i = 0; i < 3; i++) {
-            exec01 = SCXMLTestHelper.getExecutor(scxml01jexl);
-            Assert.assertNotNull(exec01);
-            runSequentialTest();
+            SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor(scxml);
+            exec01.go();
+            runSequentialTest(exec01);
         }
     }
 
@@ -92,10 +63,11 @@ public class    StatelessModelTest {
      */    
     @Test
     public void testStatelessModelParallelSharedSCXML() throws Exception {
-        exec01 = SCXMLTestHelper.getExecutor(scxml01par);
-        Assert.assertNotNull(exec01);
-        exec02 = SCXMLTestHelper.getExecutor(scxml01par);
-        Assert.assertNotNull(exec02);
+        SCXML scxml01par = SCXMLTestHelper.parse("org/apache/commons/scxml2/model/stateless-parallel-01.xml");
+        SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor(scxml01par);
+        exec01.go();
+        SCXMLExecutor exec02 = SCXMLTestHelper.getExecutor(scxml01par);
+        exec02.go();
         Assert.assertFalse(exec01 == exec02);
 
         Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
@@ -118,11 +90,14 @@ public class    StatelessModelTest {
     }
 
     /**
-     * Test sharing two SCXML objects between one executor (not recommended)
+     * TODO: Test sharing two SCXML objects between one executor (not recommended)
+     *
     @Test
     public void testStatelessModelParallelSwapSCXML() throws Exception {
-        exec01 = SCXMLTestHelper.getExecutor(scxml01par);
-        Assert.assertNotNull(exec01);
+        SCXML scxml01par = SCXMLTestHelper.parse("org/apache/commons/scxml2/model/stateless-parallel-01.xml");
+        SCXML scxml02par = SCXMLTestHelper.parse("org/apache/commons/scxml2/model/stateless-parallel-01.xml");
+        SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor(scxml01par);
+        exec01.go();
         Assert.assertTrue(scxml01par != scxml02par);
 
         Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
@@ -132,7 +107,6 @@ public class    StatelessModelTest {
         checkParallelStates(currentStates, "state1.final", "state2.init", "exec01");
         exec01.setStateMachine(scxml02par);
         exec01.addListener(scxml02par, new SimpleSCXMLListener());
-
         currentStates = fireEvent("state2.event", exec01);
         checkParallelStates(currentStates, "next", null, "exec01");
     }
@@ -167,7 +141,7 @@ public class    StatelessModelTest {
         Assert.fail(label + " in unexpected state " + cs1);
     }
 
-    private void runSimultaneousTest() throws Exception {
+    private void runSimultaneousTest(SCXMLExecutor exec01, SCXMLExecutor exec02) throws Exception {
         //// Interleaved
         // exec01
         Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
@@ -193,16 +167,16 @@ public class    StatelessModelTest {
         Assert.assertEquals("thirty", currentStates.iterator().next().getId());
     }
 
-    private void runSequentialTest() throws Exception {
-        Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
+    private void runSequentialTest(SCXMLExecutor exec) throws Exception {
+        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", (currentStates.iterator().
             next()).getId());
-        currentStates = fireEvent("done.state.ten", exec01);
+        currentStates = fireEvent("done.state.ten", exec);
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("twenty", (currentStates.iterator().
             next()).getId());
-        currentStates = fireEvent("done.state.twenty", exec01);
+        currentStates = fireEvent("done.state.twenty", exec);
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("thirty", (currentStates.iterator().
             next()).getId());

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-initial-test.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        xmlns:cs="http://commons.apache.org/scxml"
+       datamodel="jexl"
        version="1.0"
        initial="actionsTest">
   

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-parallel-test.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        xmlns:cs="http://commons.apache.org/scxml"
+       datamodel="jexl"
        version="1.0"
        initial="actionsTest">
   

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/actions-state-test.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        xmlns:cs="http://commons.apache.org/scxml"
+       datamodel="jexl"
        version="1.0"
        initial="actionsTest">
   

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-01.xml Sat Oct 25 15:24:25 2014
@@ -19,6 +19,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        xmlns:rad="http://foo/bar"
        version="1.0"
+       datamodel="jexl"
        initial="assign1">
   
   <state id="assign1">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-02.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/assign-test-02.xml Sat Oct 25 15:24:25 2014
@@ -16,7 +16,7 @@
    * limitations under the License.
 -->
 <!-- Regress JIRA 89, incomplete child removal -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:rad="http://foo/bar" version="1.0" initial="assign1">
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:rad="http://foo/bar" version="1.0"  datamodel="jexl" initial="assign1">
    <datamodel>
        <data id="source">
            <rad:foo>

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-01.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="para">
 
     <parallel id="para">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-02.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-02.xml Sat Oct 25 15:24:25 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="state0">
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" datamodel="jexl" initial="state0">
 
     <parallel id="state0">
         <transition event="event1" target="state1" />

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-03.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-03.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/parallel-03.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="para">
 
     <datamodel>

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/state-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/state-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/state-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/state-01.xml Sat Oct 25 15:24:25 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="s1">
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" datamodel="jexl" initial="s1">
 
     <state id="s1" initial="s11">
         <final id="s11"/>

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/stateless-parallel-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/stateless-parallel-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/stateless-parallel-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/stateless-parallel-01.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="main">
 
     <parallel id="main">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/prefix-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/prefix-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/prefix-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/prefix-01.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml:scxml xmlns:scxml="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <scxml:state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-01.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-02.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/send-02.xml Sat Oct 25 15:24:25 2014
@@ -19,6 +19,7 @@
      engine. -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <!-- We are expected to just fall all the way through down to

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-01.xml Sat Oct 25 15:24:25 2014
@@ -20,6 +20,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-02.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-02.xml Sat Oct 25 15:24:25 2014
@@ -20,6 +20,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-03.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-03.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-03.xml Sat Oct 25 15:24:25 2014
@@ -20,6 +20,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-04.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-04.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-04.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-04.xml Sat Oct 25 15:24:25 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="s1"> 
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" datamodel="jexl" initial="s1">
      
     <state id="s1"> 
         <initial> 

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-05.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-05.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-05.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-05.xml Sat Oct 25 15:24:25 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="main">
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" datamodel="jexl" initial="main">
 
 <!-- 
   Testing dispute resolution in regions

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-06.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-06.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-06.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/tie-breaker-06.xml Sat Oct 25 15:24:25 2014
@@ -17,7 +17,7 @@
 -->
 <!-- A fictitious state machine used by test cases.
      <send>s in the same executable content block -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="main">
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" datamodel="jexl" initial="main">
 
   <state id="main">
 

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-01.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <!-- Start with a simple state -->

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-02.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-02.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-02.xml Sat Oct 25 15:24:25 2014
@@ -18,6 +18,7 @@
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        xmlns:cs="http://commons.apache.org/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-03.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-03.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-03.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-04.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-04.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-04.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-04.xml Sat Oct 25 15:24:25 2014
@@ -17,6 +17,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="ten">
 
     <state id="ten">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-05.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-05.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-05.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-05.xml Sat Oct 25 15:24:25 2014
@@ -20,6 +20,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="para">
 
     <parallel id="para">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-06.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-06.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-06.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-06.xml Sat Oct 25 15:24:25 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="init">
+<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" datamodel="jexl" initial="init">
        <state id="init">
                <transition event="start" target="onetwo" />
        </state>

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-event-variable.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-event-variable.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-event-variable.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-event-variable.xml Sat Oct 25 15:24:25 2014
@@ -20,6 +20,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="closed">
 
   <state id="closed">

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-with-cond-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-with-cond-01.xml?rev=1634235&r1=1634234&r2=1634235&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-with-cond-01.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/transitions-with-cond-01.xml Sat Oct 25 15:24:25 2014
@@ -20,6 +20,7 @@
 -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml"
        version="1.0"
+       datamodel="jexl"
        initial="closed">
 
   <state id="closed">



Mime
View raw message