commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1649098 [2/2] - in /commons/proper/scxml/trunk/src: main/java/org/apache/commons/scxml2/ main/java/org/apache/commons/scxml2/env/ main/java/org/apache/commons/scxml2/env/xpath/ main/java/org/apache/commons/scxml2/invoke/ main/java/org/apac...
Date Fri, 02 Jan 2015 19:34:31 GMT
Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java?rev=1649098&r1=1649097&r2=1649098&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
(original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
Fri Jan  2 19:34:30 2015
@@ -31,7 +31,6 @@ import org.apache.commons.scxml2.model.M
 import org.apache.commons.scxml2.model.SCXML;
 import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -61,7 +60,7 @@ public class Issue112Test {
         SCXML scxml = SCXMLTestHelper.parse("org/apache/commons/scxml2/issues/queue-01.xml",
customActions);
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
         exec.go();
-        Assert.assertEquals("init", exec.getCurrentStatus().getStates().
+        Assert.assertEquals("init", exec.getStatus().getStates().
                 iterator().next().getId());
 
         // Add an event, other external events could be added to the queue at any time (this
test only adds one).
@@ -77,8 +76,8 @@ public class Issue112Test {
             }
         }
 
-        Assert.assertTrue(exec.getCurrentStatus().isFinal());
-        Assert.assertEquals("end", exec.getCurrentStatus().getStates().
+        Assert.assertTrue(exec.getStatus().isFinal());
+        Assert.assertEquals("end", exec.getStatus().getStates().
                 iterator().next().getId());
 
     }

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java?rev=1649098&r1=1649097&r2=1649098&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
(original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
Fri Jan  2 19:34:30 2015
@@ -35,7 +35,7 @@ public class Issue62Test {
     public void test01issue62() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/issues/issue62-01.xml");
         exec.go();
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("s1.1", currentStates.iterator().next().getId());
         SCXMLTestHelper.assertPostTriggerState(exec, "foo", "s1.1");
@@ -56,13 +56,13 @@ public class Issue62Test {
     }
 
     private void fragmenttest(SCXMLExecutor exec) throws Exception {
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("s1", currentStates.iterator().next().getId());
         SCXMLTestHelper.assertPostTriggerState(exec, "foo", "e1.1.1");
         SCXMLTestHelper.assertPostTriggerState(exec, "bar", "e1.1.2");
         SCXMLTestHelper.assertPostTriggerState(exec, "baz", "s3");
-        Assert.assertTrue(exec.getCurrentStatus().isFinal());
+        Assert.assertTrue(exec.getStatus().isFinal());
     }
 }
 

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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -31,20 +31,20 @@ public class AssignTest {
     public void testAssignSrc() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/assign-test-01.xml");
         exec.go();
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("assign3", currentStates.iterator().next().getId());
-        Assert.assertTrue(exec.getCurrentStatus().isFinal());
+        Assert.assertTrue(exec.getStatus().isFinal());
     }
     
     @Test
     public void testAssignDeep() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/assign-test-02.xml");
         exec.go();
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("assign3", currentStates.iterator().next().getId());
-        Assert.assertTrue(exec.getCurrentStatus().isFinal());
+        Assert.assertTrue(exec.getStatus().isFinal());
     }
 }
 

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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -101,9 +101,9 @@ public class CustomActionTest {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/hello-world.xml");
         exec.go();
         // (2) Single, final state
-        Assert.assertEquals("hello", (exec.getCurrentStatus().getStates().
+        Assert.assertEquals("hello", (exec.getStatus().getStates().
                 iterator().next()).getId());
-        Assert.assertTrue(exec.getCurrentStatus().isFinal());
+        Assert.assertTrue(exec.getStatus().isFinal());
     }
 
     // Hello World example using a custom <hello> action
@@ -128,9 +128,9 @@ public class CustomActionTest {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
         exec.go();
         // (4) Single, final state
-        Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
+        Assert.assertEquals("custom", (exec.getStatus().getStates().
                 iterator().next()).getId());
-        Assert.assertTrue(exec.getCurrentStatus().isFinal());
+        Assert.assertTrue(exec.getStatus().isFinal());
 
         // The custom action defined by Hello.class should be called
         // to execute() exactly twice at this point (one by <my:hello/> and the other
by <foo:bar/>).
@@ -154,7 +154,7 @@ public class CustomActionTest {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
         exec.go();
         // (4) Single, final state
-        Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
+        Assert.assertEquals("custom", (exec.getStatus().getStates().
             iterator().next()).getId());
 
         // The custom action defined by Hello.class should be called
@@ -178,7 +178,7 @@ public class CustomActionTest {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
         exec.go();
         // (4) Single, final state
-        Assert.assertEquals("custom", (exec.getCurrentStatus().getStates().
+        Assert.assertEquals("custom", (exec.getStatus().getStates().
             iterator().next()).getId());
 
         // The custom action defined by Hello.class should be called
@@ -204,7 +204,7 @@ public class CustomActionTest {
         exec.go();
         // (4) Single, final state
         Assert.assertEquals("Invalid intermediate state",
-                     "custom1", (exec.getCurrentStatus().getStates().
+                     "custom1", (exec.getStatus().getStates().
                                 iterator().next()).getId());
         // (5) Verify datamodel variable is correct
         Assert.assertEquals("Missing helloName1 in root context", "custom04a",
@@ -220,9 +220,9 @@ public class CustomActionTest {
         Assert.assertEquals("Missing helloName1 in root context", "custom04b",
                 exec.getRootContext().get("helloName1"));
         Assert.assertEquals("Invalid final state",
-                "end", (exec.getCurrentStatus().getStates().
+                "end", (exec.getStatus().getStates().
                 iterator().next()).getId());
-        Assert.assertTrue(exec.getCurrentStatus().isFinal());
+        Assert.assertTrue(exec.getStatus().isFinal());
 
         // The custom action defined by Hello.class should be called
         // to execute() exactly two times at this point (by onentry in custom2 state).

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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -57,7 +57,7 @@ public class DatamodelTest {
     public void testDatamodel04Jexl() throws Exception {
         SCXMLExecutor exec01 = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-04.xml");
         exec01.go();
-        Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec01.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", currentStates.iterator().next().getId());
         Map<String, Object> payload = new HashMap<String, Object>();
@@ -65,11 +65,11 @@ public class DatamodelTest {
         payload.put("two", "2");
         TriggerEvent te = new TriggerEvent("done.state.ten", TriggerEvent.SIGNAL_EVENT, payload);
         SCXMLTestHelper.fireEvent(exec01, te);
-        currentStates = exec01.getCurrentStatus().getStates();
+        currentStates = exec01.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("twenty", currentStates.iterator().next().getId());
         SCXMLTestHelper.fireEvent(exec01, "done.state.twenty");
-        currentStates = exec01.getCurrentStatus().getStates();
+        currentStates = exec01.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("thirty", currentStates.iterator().next().getId());
     }
@@ -84,7 +84,7 @@ public class DatamodelTest {
     private void runtest(SCXMLExecutor exec01, SCXMLExecutor exec02) throws Exception {
         //// Interleaved
         // exec01
-        Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec01.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", currentStates.iterator().next().getId());
         exec01 = SCXMLTestHelper.testInstanceSerializability(exec01);
@@ -92,7 +92,7 @@ public class DatamodelTest {
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("twenty", currentStates.iterator().next().getId());
         // exec02
-        currentStates = exec02.getCurrentStatus().getStates();
+        currentStates = exec02.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", currentStates.iterator().next().getId());
         // exec01
@@ -121,7 +121,7 @@ public class DatamodelTest {
         TriggerEvent[] evts = {new TriggerEvent(name,
                 TriggerEvent.SIGNAL_EVENT, null)};
         exec.triggerEvents(evts);
-        return exec.getCurrentStatus().getStates();
+        return exec.getStatus().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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -59,7 +59,7 @@ public class HistoryTest {
     public void testHistoryDefaults01() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-default-01.xml");
         exec.go();
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("state11", currentStates.iterator().next().getId());
         currentStates = SCXMLTestHelper.fireEvent(exec, "state.next");
@@ -74,7 +74,7 @@ public class HistoryTest {
     public void testHistoryParallel01() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-parallel-01.xml");
         exec.go();
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         SCXMLTestHelper.assertState(exec, "off_call");
         SCXMLTestHelper.assertPostTriggerStates(exec, "dial", new String[] { "talking", "on_call"
});
@@ -89,7 +89,7 @@ public class HistoryTest {
     }
 
     private void runHistoryFlow(SCXMLExecutor exec) throws Exception {
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("phase1", currentStates.iterator().next().getId());
         Assert.assertEquals("phase1", pauseAndResume(exec));
@@ -100,7 +100,7 @@ public class HistoryTest {
         Assert.assertEquals("phase3", nextPhase(exec));
         Assert.assertEquals("phase3", pauseAndResume(exec));
         exec.reset();
-        currentStates = exec.getCurrentStatus().getStates();
+        currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("phase1", currentStates.iterator().next().getId());
     }

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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -32,7 +32,7 @@ public class ScriptTest {
     public void testJexlScriptExecution() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/script-01.xml");
         exec.go();
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("end", currentStates.iterator().next().getId());
     }
@@ -44,7 +44,7 @@ public class ScriptTest {
     public void testJavaScriptExecution() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/javascript/script-01.xml");
         exec.go();
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -60,7 +60,7 @@ public class ScxmlInitialAttributeTest {
         assertEquals("The initial state resolution was wrong.", "s1", tt.getId());
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
         exec.go();
-        assertEquals(scxml.getTargets().get("s1"), exec.getCurrentStatus().getStates().iterator().next());
+        assertEquals(scxml.getTargets().get("s1"), exec.getStatus().getStates().iterator().next());
     }
 
     @Test
@@ -71,7 +71,7 @@ public class ScxmlInitialAttributeTest {
         assertEquals("The initial state resolution was wrong.", "s1", tt.getId());
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor(scxml);
         exec.go();
-        assertEquals(scxml.getTargets().get("s1"), exec.getCurrentStatus().getStates().iterator().next());
+        assertEquals(scxml.getTargets().get("s1"), exec.getStatus().getStates().iterator().next());
     }
 
     @Test

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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -164,6 +164,6 @@ public class StateTest {
     public void testInitialAttribute() throws Exception {
         SCXMLExecutor exec = SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/state-01.xml");
         exec.go();
-        Assert.assertEquals("s11", exec.getCurrentStatus().getStates().iterator().next().getId());
+        Assert.assertEquals("s11", exec.getStatus().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=1649098&r1=1649097&r2=1649098&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
Fri Jan  2 19:34:30 2015
@@ -70,10 +70,10 @@ public class StatelessModelTest {
         exec02.go();
         Assert.assertFalse(exec01 == exec02);
 
-        Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec01.getStatus().getStates();
         checkParallelStates(currentStates, "state1.init", "state2.init", "exec01");
 
-        currentStates = exec02.getCurrentStatus().getStates();
+        currentStates = exec02.getStatus().getStates();
         checkParallelStates(currentStates, "state1.init", "state2.init", "exec02");
 
         currentStates = fireEvent("state1.event", exec01);
@@ -100,7 +100,7 @@ public class StatelessModelTest {
         exec01.go();
         Assert.assertTrue(scxml01par != scxml02par);
 
-        Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec01.getStatus().getStates();
         checkParallelStates(currentStates, "state1.init", "state2.init", "exec01");
 
         currentStates = fireEvent("state1.event", exec01);
@@ -144,14 +144,14 @@ public class StatelessModelTest {
     private void runSimultaneousTest(SCXMLExecutor exec01, SCXMLExecutor exec02) throws Exception
{
         //// Interleaved
         // exec01
-        Set<EnterableState> currentStates = exec01.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec01.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", currentStates.iterator().next().getId());
         currentStates = fireEvent("done.state.ten", exec01);
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("twenty", currentStates.iterator().next().getId());
         // exec02
-        currentStates = exec02.getCurrentStatus().getStates();
+        currentStates = exec02.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", currentStates.iterator().next().getId());
         // exec01
@@ -168,7 +168,7 @@ public class StatelessModelTest {
     }
 
     private void runSequentialTest(SCXMLExecutor exec) throws Exception {
-        Set<EnterableState> currentStates = exec.getCurrentStatus().getStates();
+        Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assert.assertEquals(1, currentStates.size());
         Assert.assertEquals("ten", (currentStates.iterator().
             next()).getId());
@@ -185,7 +185,7 @@ public class StatelessModelTest {
     private Set<EnterableState> fireEvent(String name, SCXMLExecutor exec) throws Exception
{
         TriggerEvent[] evts = {new TriggerEvent(name, TriggerEvent.SIGNAL_EVENT, null)};
         exec.triggerEvents(evts);
-        return exec.getCurrentStatus().getStates();
+        return exec.getStatus().getStates();
     }
 }
 

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImplTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImplTest.java?rev=1649098&r1=1649097&r2=1649098&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImplTest.java
(original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImplTest.java
Fri Jan  2 19:34:30 2015
@@ -33,7 +33,7 @@ public class SCXMLSemanticsImplTest {
     public void testIsLegalConfigNoStates() {
         Set<EnterableState> states = new HashSet<EnterableState>();
 
-        Assert.assertTrue(new SCXMLSemanticsImpl().isLegalConfig(states, new SimpleErrorReporter()));
+        Assert.assertTrue(new SCXMLSemanticsImpl().isLegalConfiguration(states, new SimpleErrorReporter()));
     }
 
     @Test
@@ -58,7 +58,7 @@ public class SCXMLSemanticsImplTest {
 
         MockErrorReporter errorReporter = new MockErrorReporter();
 
-        Assert.assertFalse(new SCXMLSemanticsImpl().isLegalConfig(states, errorReporter));
+        Assert.assertFalse(new SCXMLSemanticsImpl().isLegalConfiguration(states, errorReporter));
         Assert.assertEquals(ErrorConstants.ILLEGAL_CONFIG, errorReporter.getErrCode());
         Assert.assertEquals("Not all AND states active for parallel 4", errorReporter.getErrDetail());
     }
@@ -77,7 +77,7 @@ public class SCXMLSemanticsImplTest {
 
         MockErrorReporter errorReporter = new MockErrorReporter();
 
-        Assert.assertTrue(new SCXMLSemanticsImpl().isLegalConfig(states, errorReporter));
+        Assert.assertFalse(new SCXMLSemanticsImpl().isLegalConfiguration(states, errorReporter));
         Assert.assertEquals(ErrorConstants.ILLEGAL_CONFIG, errorReporter.getErrCode());
         Assert.assertEquals("Multiple top-level OR states active!", errorReporter.getErrDetail());
     }
@@ -103,7 +103,7 @@ public class SCXMLSemanticsImplTest {
 
         MockErrorReporter errorReporter = new MockErrorReporter();
 
-        Assert.assertFalse(new SCXMLSemanticsImpl().isLegalConfig(states, errorReporter));
+        Assert.assertFalse(new SCXMLSemanticsImpl().isLegalConfiguration(states, errorReporter));
         Assert.assertEquals(ErrorConstants.ILLEGAL_CONFIG, errorReporter.getErrCode());
         Assert.assertEquals("Multiple OR states active for state parentid", errorReporter.getErrDetail());
     }

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java?rev=1649098&r1=1649097&r2=1649098&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/W3CTests.java Fri
Jan  2 19:34:30 2015
@@ -734,7 +734,7 @@ public class W3CTests {
             exec.registerInvokerClass("http://www.w3.org/TR/scxml/", SimpleSCXMLInvoker.class);
             exec.go();
             Final end;
-            while ((end = exec.getCurrentStatus().getFinalState()) == null) {
+            while ((end = exec.getStatus().getFinalState()) == null) {
                 Thread.sleep(100);
                 exec.triggerEvents();
             }

Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/tests.xml?rev=1649098&r1=1649097&r2=1649098&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/tests.xml (original)
+++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/w3c/tests.xml Fri Jan
 2 19:34:30 2015
@@ -22,13 +22,13 @@
   <test id="405" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="406" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="407" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
-  <test id="409" mandatory="true"  manual="false" enabled="false"                 ecma="fail"
    xpath="fail"/>
-  <test id="411" mandatory="true"  manual="false" enabled="false"                 ecma="fail"
    xpath="fail"/>
+  <test id="409" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
+  <test id="411" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="412" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="413" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="415" mandatory="true"  manual="true"  enabled="true"  finalId="final" ecma="final"
   xpath="final"/>
   <test id="416" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
-  <test id="417" mandatory="true"  manual="false" enabled="false"                 ecma="fail"
    xpath="fail"/>
+  <test id="417" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="419" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="421" mandatory="true"  manual="false" enabled="true"                  ecma="pass"
    xpath="pass"/>
   <test id="422" mandatory="true"  manual="false" enabled="false"                 ecma="fail"
    xpath="fail">fails with error: null</test>



Mime
View raw message