Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.java?rev=1583086&r1=1583085&r2=1583086&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.java (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/Hello.java Sun Mar 30 00:18:40 2014 @@ -16,12 +16,7 @@ */ package org.apache.commons.scxml2.model; -import java.util.Collection; - -import org.apache.commons.logging.Log; -import org.apache.commons.scxml2.ErrorReporter; -import org.apache.commons.scxml2.EventDispatcher; -import org.apache.commons.scxml2.SCInstance; +import org.apache.commons.scxml2.ActionExecutionContext; import org.apache.commons.scxml2.SCXMLExpressionException; import org.apache.commons.scxml2.TriggerEvent; @@ -61,17 +56,14 @@ public class Hello extends Action { } @Override - public void execute(final EventDispatcher evtDispatcher, - final ErrorReporter errRep, final SCInstance scInstance, - final Log appLog, final Collection<TriggerEvent> derivedEvents) - throws ModelException, SCXMLExpressionException { - if (appLog.isInfoEnabled()) { - appLog.info("Hello " + name); + public void execute(ActionExecutionContext exctx) throws ModelException, SCXMLExpressionException { + if (exctx.getAppLog().isInfoEnabled()) { + exctx.getAppLog().info("Hello " + name); } // For derived events payload testing TriggerEvent event = new TriggerEvent("helloevent", TriggerEvent.SIGNAL_EVENT, name); - derivedEvents.add(event); + exctx.addInternalEvent(event); callbacks++; } }
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=1583086&r1=1583085&r2=1583086&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 Sun Mar 30 00:18:40 2014 @@ -140,10 +140,10 @@ public class HistoryTest { Set<EnterableState> currentStates = SCXMLTestHelper.fireEvent(exec, "flow.pause"); Assert.assertEquals(1, currentStates.size()); Assert.assertEquals("interrupted", currentStates.iterator().next().getId()); - exec = SCXMLTestHelper.testExecutorSerializability(exec); + exec = SCXMLTestHelper.testInstanceSerializability(exec); currentStates = SCXMLTestHelper.fireEvent(exec, "flow.resume"); Assert.assertEquals(1, currentStates.size()); - exec = SCXMLTestHelper.testExecutorSerializability(exec); + exec = SCXMLTestHelper.testInstanceSerializability(exec); return currentStates.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=1583086&r1=1583085&r2=1583086&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 Sun Mar 30 00:18:40 2014 @@ -119,7 +119,6 @@ public class StatelessModelTest { /** * Test sharing two SCXML objects between one executor (not recommended) - */ @Test public void testStatelessModelParallelSwapSCXML() throws Exception { exec01 = SCXMLTestHelper.getExecutor(scxml01par); @@ -137,6 +136,7 @@ public class StatelessModelTest { currentStates = fireEvent("state2.event", exec01); checkParallelStates(currentStates, "next", null, "exec01"); } + */ private void checkParallelStates(Set<EnterableState> currentStates, String s1, String s2, String label) {
