This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-scxml.git
The following commit(s) were added to refs/heads/master by this push:
new b8ffe3d Remove trailing whitespace.
b8ffe3d is described below
commit b8ffe3dd0f870168c4e01a951c65117271aaac60
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 28 09:55:42 2021 -0500
Remove trailing whitespace.
---
.../org/apache/commons/scxml2/invoke/Invoker.java | 2 +-
.../org/apache/commons/scxml2/model/Cancel.java | 4 +-
.../commons/scxml2/model/TransitionTarget.java | 2 +-
.../org/apache/commons/scxml2/SCInstanceTest.java | 54 +++++++-------
.../java/org/apache/commons/scxml2/StatusTest.java | 12 +--
.../apache/commons/scxml2/env/LogUtilsTest.java | 12 +--
.../commons/scxml2/env/MockErrorReporter.java | 2 +-
.../commons/scxml2/env/SimpleContextTest.java | 86 +++++++++++-----------
.../scxml2/env/groovy/GroovyContextTest.java | 4 +-
.../scxml2/env/groovy/GroovyEvaluatorTest.java | 2 +-
.../scxml2/env/javascript/JSEvaluatorTest.java | 22 +++---
.../scxml2/env/javascript/JSExampleTest.java | 2 +-
.../commons/scxml2/env/jexl/JexlContextTest.java | 2 +-
.../commons/scxml2/env/jexl/JexlEvaluatorTest.java | 2 +-
.../commons/scxml2/invoke/InvokeParamNameTest.java | 12 +--
.../apache/commons/scxml2/invoke/InvokeTest.java | 6 +-
.../apache/commons/scxml2/io/SCXMLReaderTest.java | 12 +--
.../apache/commons/scxml2/io/SCXMLWriterTest.java | 6 +-
.../org/apache/commons/scxml2/io/StateSrcTest.java | 4 +-
.../apache/commons/scxml2/issues/Issue112Test.java | 2 +-
.../apache/commons/scxml2/issues/Issue62Test.java | 4 +-
.../apache/commons/scxml2/issues/Issue64Test.java | 2 +-
.../apache/commons/scxml2/model/ActionTest.java | 32 ++++----
.../apache/commons/scxml2/model/ActionsTest.java | 4 +-
.../apache/commons/scxml2/model/AssignTest.java | 2 +-
.../apache/commons/scxml2/model/DatamodelTest.java | 2 +-
.../apache/commons/scxml2/model/HistoryTest.java | 14 ++--
.../apache/commons/scxml2/model/ParallelTest.java | 4 +-
.../apache/commons/scxml2/model/ScriptTest.java | 2 +-
.../org/apache/commons/scxml2/model/StateTest.java | 54 +++++++-------
.../commons/scxml2/model/StatelessModelTest.java | 6 +-
.../commons/scxml2/model/TransitionTest.java | 4 +-
32 files changed, 190 insertions(+), 190 deletions(-)
diff --git a/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java
b/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java
index 663a985..9e996bc 100644
--- a/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java
+++ b/src/main/java/org/apache/commons/scxml2/invoke/Invoker.java
@@ -57,7 +57,7 @@ import org.apache.commons.scxml2.TriggerEvent;
* <li>Zero or more bi-directional event triggering.</li>
* <li>Either completion or cancellation.</li>
* </ol>
- *
+ *
* <p><b>Note:</b> The semantics of <invoke> are necessarily
* asynchronous, tending towards long(er) running interactions with external
* processes. Implementations cannot communicate with the parent state
diff --git a/src/main/java/org/apache/commons/scxml2/model/Cancel.java
b/src/main/java/org/apache/commons/scxml2/model/Cancel.java
index f62ab11..4f0c113 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Cancel.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Cancel.java
@@ -69,7 +69,7 @@ public class Cancel extends Action {
/**
* Get the expression that evaluates to the ID of the send message that
should be cancelled.
- *
+ *
* @return the expression that evaluates to the ID of the send message
that should be cancelled.
*/
public String getSendidexpr() {
@@ -78,7 +78,7 @@ public class Cancel extends Action {
/**
* Set the expression that evaluates to the ID of the send message that
should be cancelled.
- *
+ *
* @param sendidexpr the expression that evaluates to the ID of the send
message that should be cancelled.
*/
public void setSendidexpr(final String sendidexpr) {
diff --git
a/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
b/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
index 4ac5a42..1b906b0 100644
--- a/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
+++ b/src/main/java/org/apache/commons/scxml2/model/TransitionTarget.java
@@ -156,7 +156,7 @@ public abstract class TransitionTarget implements
Serializable, Observable {
return getNumberOfAncestors() > context.getNumberOfAncestors()
&& getAncestor(context.getNumberOfAncestors()) == context;
}
-
+
/**
* Enforce identity equality only
* @param other other object to compare with
diff --git a/src/test/java/org/apache/commons/scxml2/SCInstanceTest.java
b/src/test/java/org/apache/commons/scxml2/SCInstanceTest.java
index 3ffaf2f..f3c3971 100644
--- a/src/test/java/org/apache/commons/scxml2/SCInstanceTest.java
+++ b/src/test/java/org/apache/commons/scxml2/SCInstanceTest.java
@@ -32,35 +32,35 @@ public class SCInstanceTest {
private SCXMLExecutor executor;
private SCInstance instance;
-
+
@BeforeEach
public void setUp() {
executor = new SCXMLExecutor();
instance = executor.getSCInstance();
}
-
+
@Test
public void testGetRootContext() {
final Context context = new SimpleContext();
context.set("name", "value");
-
+
instance.setRootContext(context);
Assertions.assertEquals("value",
instance.getRootContext().get("name"));
}
-
+
@Test
public void testGetContext() {
final State target = new State();
target.setId("1");
-
+
final Context context = new SimpleContext();
context.set("name", "value");
-
+
instance.setContext(target, context);
-
+
Assertions.assertEquals("value",
instance.getContext(target).get("name"));
}
-
+
@Test
public void testGetContextNullParent() throws Exception {
final State target = new State();
@@ -81,10 +81,10 @@ public class SCInstanceTest {
public void testGetContextParent() throws Exception {
final State target = new State();
target.setId("1");
-
+
final State parent = new State();
parent.setId("parent");
-
+
target.setParent(parent);
final Context context = new SimpleContext();
@@ -101,9 +101,9 @@ public class SCInstanceTest {
@Test
public void testGetLastConfigurationNull() {
final History history = new History();
-
+
final Set<EnterableState> returnConfiguration =
instance.getLastConfiguration(history);
-
+
Assertions.assertEquals(0, returnConfiguration.size());
}
@@ -111,41 +111,41 @@ public class SCInstanceTest {
public void testGetLastConfiguration() {
final History history = new History();
history.setId("1");
-
+
final Set<EnterableState> configuration = new HashSet<>();
final EnterableState tt1 = new State();
final EnterableState tt2 = new State();
configuration.add(tt1);
configuration.add(tt2);
-
- instance.setLastConfiguration(history, configuration);
-
+
+ instance.setLastConfiguration(history, configuration);
+
final Set<EnterableState> returnConfiguration =
instance.getLastConfiguration(history);
-
+
Assertions.assertEquals(2, returnConfiguration.size());
Assertions.assertTrue(returnConfiguration.contains(tt1));
Assertions.assertTrue(returnConfiguration.contains(tt2));
}
-
+
@Test
public void testIsEmpty() {
Assertions.assertTrue(instance.getLastConfiguration(new
History()).isEmpty());
}
-
+
@Test
public void testIsEmptyFalse() {
final History history = new History();
history.setId("1");
-
+
final Set<EnterableState> configuration = new HashSet<>();
final EnterableState tt1 = new State();
configuration.add(tt1);
-
- instance.setLastConfiguration(history, configuration);
+
+ instance.setLastConfiguration(history, configuration);
Assertions.assertFalse(instance.getLastConfiguration(history).isEmpty());
}
-
+
@Test
public void testReset() {
final History history = new History();
@@ -154,12 +154,12 @@ public class SCInstanceTest {
final Set<EnterableState> configuration = new HashSet<>();
final EnterableState tt1 = new State();
configuration.add(tt1);
-
- instance.setLastConfiguration(history, configuration);
+
+ instance.setLastConfiguration(history, configuration);
instance.resetConfiguration(history);
-
+
Assertions.assertTrue(instance.getLastConfiguration(history).isEmpty());
}
-
+
}
diff --git a/src/test/java/org/apache/commons/scxml2/StatusTest.java
b/src/test/java/org/apache/commons/scxml2/StatusTest.java
index 1955210..f8695f6 100644
--- a/src/test/java/org/apache/commons/scxml2/StatusTest.java
+++ b/src/test/java/org/apache/commons/scxml2/StatusTest.java
@@ -29,32 +29,32 @@ public class StatusTest {
private StateConfiguration stateConfiguration;
private Status status;
-
+
@BeforeEach
public void setUp() {
stateConfiguration = new StateConfiguration();
status = new Status(stateConfiguration);
}
-
+
@Test
public void testIsFinalStateFalse() {
final State state = new State();
stateConfiguration.enterState(state);
-
+
Assertions.assertFalse(status.isFinal());
}
-
+
@Test
public void testIsFinalStateHasParent() {
final Final state = new Final();
state.setParent(new State());
-
+
stateConfiguration.enterState(state);
Assertions.assertFalse(status.isFinal());
}
-
+
@Test
public void testIsFinalState() {
final Final state = new Final();
diff --git a/src/test/java/org/apache/commons/scxml2/env/LogUtilsTest.java
b/src/test/java/org/apache/commons/scxml2/env/LogUtilsTest.java
index d56dc1d..adbc9bf 100644
--- a/src/test/java/org/apache/commons/scxml2/env/LogUtilsTest.java
+++ b/src/test/java/org/apache/commons/scxml2/env/LogUtilsTest.java
@@ -27,10 +27,10 @@ public class LogUtilsTest {
public void testGetTTPathParentNull() {
final State target = new State();
target.setId("ID");
-
+
Assertions.assertEquals("/ID", LogUtils.getTTPath(target));
}
-
+
@Test
public void testGetTTPathParent() {
final State target = new State();
@@ -44,10 +44,10 @@ public class LogUtilsTest {
parent1.setParent(parent2);
target.setParent(parent1);
-
+
Assertions.assertEquals("/parent2/parent1/ID",
LogUtils.getTTPath(target));
}
-
+
@Test
public void testTransToString() {
final State targetTo = new State();
@@ -55,11 +55,11 @@ public class LogUtilsTest {
final State targetFrom = new State();
targetFrom.setId("FROM");
-
+
final Transition transition = new Transition();
transition.setCond("condition");
transition.setEvent("event happened");
-
+
Assertions.assertEquals( "(event = event happened, cond = condition,
from = /FROM, to = /TO)",
LogUtils.transToString(targetFrom,
targetTo, transition, transition.getEvent()));
}
diff --git a/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
b/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
index 9539b65..807c9c8 100644
--- a/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
+++ b/src/test/java/org/apache/commons/scxml2/env/MockErrorReporter.java
@@ -23,7 +23,7 @@ public class MockErrorReporter implements ErrorReporter {
private String errCode;
private String errDetail;
private Object errCtx;
-
+
public void onError( final String errCode, final String errDetail, final
Object errCtx ) {
this.errCode = errCode;
this.errDetail = errDetail;
diff --git a/src/test/java/org/apache/commons/scxml2/env/SimpleContextTest.java
b/src/test/java/org/apache/commons/scxml2/env/SimpleContextTest.java
index a5429cb..c7d00b8 100644
--- a/src/test/java/org/apache/commons/scxml2/env/SimpleContextTest.java
+++ b/src/test/java/org/apache/commons/scxml2/env/SimpleContextTest.java
@@ -31,14 +31,14 @@ public class SimpleContextTest {
public void setUp() {
context = new SimpleContext();
}
-
+
@Test
public void testHasTrue() {
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
-
+
Assertions.assertTrue(context.has("key"));
}
@@ -46,25 +46,25 @@ public class SimpleContextTest {
public void testHasNullParent() {
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
-
+
Assertions.assertFalse(context.has("differentKey"));
}
-
+
@Test
public void testHasParentWrongKey() {
final Map<String, Object> parentVars = new HashMap<>();
parentVars.put("key", "value");
-
+
final SimpleContext parentContext = new SimpleContext(null,
parentVars);
-
+
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
context = new SimpleContext(parentContext, parentVars);
-
+
Assertions.assertFalse(context.has("differentKey"));
}
@@ -72,74 +72,74 @@ public class SimpleContextTest {
public void testHasParentCorrectKey() {
final Map<String, Object> parentVars = new HashMap<>();
parentVars.put("differentKey", "value");
-
+
final SimpleContext parentContext = new SimpleContext(null,
parentVars);
-
+
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
context = new SimpleContext(parentContext, parentVars);
-
+
Assertions.assertTrue(context.has("differentKey"));
}
-
+
@Test
public void testGetNull() {
final Object value = context.get("key");
-
+
Assertions.assertNull(value);
}
-
+
@Test
public void testGetValue() {
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
-
+
Assertions.assertEquals("value", context.get("key"));
}
-
+
@Test
public void testGetParentValue() {
final Map<String, Object> parentVars = new HashMap<>();
parentVars.put("differentKey", "differentValue");
-
+
final SimpleContext parentContext = new SimpleContext(null,
parentVars);
-
+
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
context = new SimpleContext(parentContext, parentVars);
-
+
Assertions.assertEquals("differentValue", context.get("differentKey"));
}
-
+
@Test
public void testGetParentNull() {
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
-
+
Assertions.assertNull(context.get("differentKey"));
}
-
+
@Test
public void testGetParentWrongValue() {
final Map<String, Object> parentVars = new HashMap<>();
parentVars.put("differentKey", "differentValue");
-
+
final SimpleContext parentContext = new SimpleContext(null,
parentVars);
-
+
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
context = new SimpleContext(parentContext, parentVars);
-
+
Assertions.assertNull(context.get("reallyDifferentKey"));
}
@@ -147,11 +147,11 @@ public class SimpleContextTest {
public void testSetVarsChangeValue() {
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
-
+
context.set("key", "newValue");
-
+
Assertions.assertEquals("newValue", context.get("key"));
}
@@ -159,27 +159,27 @@ public class SimpleContextTest {
public void testSetVarsEmpty() {
final Map<String, Object> vars = new HashMap<>();
context.setVars(vars);
-
+
context.set("key", "newValue");
-
+
Assertions.assertEquals("newValue", context.get("key"));
}
-
+
@Test
public void testSetVarsParent() {
final Map<String, Object> parentVars = new HashMap<>();
parentVars.put("differentKey", "differentValue");
-
+
final SimpleContext parentContext = new SimpleContext(null,
parentVars);
-
+
final Map<String, Object> vars = new HashMap<>();
vars.put("key", "value");
-
+
context.setVars(vars);
context = new SimpleContext(parentContext, parentVars);
-
+
context.set("differentKey", "newValue");
-
+
Assertions.assertEquals("newValue", context.get("differentKey"));
}
diff --git
a/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyContextTest.java
b/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyContextTest.java
index b4b5714..c7b430f 100644
--- a/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyContextTest.java
+++ b/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyContextTest.java
@@ -29,7 +29,7 @@ public class GroovyContextTest {
final GroovyContext ctx = new GroovyContext();
Assertions.assertNotNull(ctx);
}
-
+
@Test
public void testPrepopulated() {
final Map<String, Object> m = new HashMap<>();
@@ -40,7 +40,7 @@ public class GroovyContextTest {
final String fooValue = (String) ctx.get("foo");
Assertions.assertEquals("bar", fooValue);
}
-
+
@Test
public void testSetVars() {
final GroovyContext ctx = new GroovyContext();
diff --git
a/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluatorTest.java
b/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluatorTest.java
index 2d50e99..04ae397 100644
---
a/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluatorTest.java
+++
b/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluatorTest.java
@@ -67,7 +67,7 @@ public class GroovyEvaluatorTest {
final Evaluator eval = new GroovyEvaluator();
ctx.set("x", 3);
ctx.set("y", 0);
- final String script =
+ final String script =
"if ((x * 2) == 5) {" +
"y = 1;\n" +
"} else {\n" +
diff --git
a/src/test/java/org/apache/commons/scxml2/env/javascript/JSEvaluatorTest.java
b/src/test/java/org/apache/commons/scxml2/env/javascript/JSEvaluatorTest.java
index 39a5715..14cd706 100644
---
a/src/test/java/org/apache/commons/scxml2/env/javascript/JSEvaluatorTest.java
+++
b/src/test/java/org/apache/commons/scxml2/env/javascript/JSEvaluatorTest.java
@@ -118,7 +118,7 @@ public class JSEvaluatorTest {
* Ensures implementation of JSEvaluator default constructor and test basic
* expression evaluation.
*
- */
+ */
@Test
public void testBasic() throws SCXMLExpressionException {
final Evaluator evaluator = new JSEvaluator();
@@ -132,7 +132,7 @@ public class JSEvaluatorTest {
final Evaluator evaluator = new JSEvaluator();
context.set("x", 3);
context.set("y", 0);
- final String script =
+ final String script =
"if ((x * 2.0) == 5.0) {" +
"y = 1.0;\n" +
"} else {\n" +
@@ -145,7 +145,7 @@ public class JSEvaluatorTest {
/**
* Tests handling of illegal expressions.
*
- */
+ */
@Test
public void testIllegalExpresssion() {
final Evaluator evaluator = new JSEvaluator();
@@ -162,7 +162,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation with simple standard expressions.
*
- */
+ */
@Test
public void testStandardExpressions() throws Exception {
for (final TestItem item: SIMPLE_EXPRESSIONS) {
@@ -182,7 +182,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation with SCXML context variables.
*
- */
+ */
@Test
public void testVarExpressions() throws Exception {
context.set("fibonacci", 12.0);
@@ -199,7 +199,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation with invalid SCXML context variables.
*
- */
+ */
@Test
public void testInvalidVarExpressions() {
for (final TestItem item: VAR_EXPRESSIONS) {
@@ -214,7 +214,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation with SCXML data model expressions.
*
- */
+ */
@Test
public void testDataModelExpressions() throws Exception {
Assertions.assertEquals("leaf",
@@ -225,7 +225,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation with invalid SCXML data model expressions.
*
- */
+ */
@Test
public void testInvalidDataModelExpressions() {
Assertions.assertNull(context.get("forestx"));
@@ -238,7 +238,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation of SCXML data model locations.
*
- */
+ */
@Test
public void testDataModelLocations() throws Exception {
Assertions.assertTrue(evaluator.eval(context, "forest") instanceof Map,
@@ -251,7 +251,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation of invalid SCXML data model locations.
*
- */
+ */
@Test
public void testInvalidDataModelLocations() throws Exception {
Assertions.assertNotNull(context.get("forest"));
@@ -262,7 +262,7 @@ public class JSEvaluatorTest {
/**
* Tests evaluation of Javascript functions with variables from SCXML
context.
*
- */
+ */
@Test
public void testScriptFunctions() throws Exception {
context.set("FIVE", 5);
diff --git
a/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java
b/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java
index f28e32e..bc58ef3 100644
--- a/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java
+++ b/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java
@@ -56,7 +56,7 @@ public class JSExampleTest {
}
// INNER CLASSES
-
+
public static class EventDataMapTest extends Action {
@Override
public void execute(final ActionExecutionContext exctx) {
diff --git
a/src/test/java/org/apache/commons/scxml2/env/jexl/JexlContextTest.java
b/src/test/java/org/apache/commons/scxml2/env/jexl/JexlContextTest.java
index c14d288..4b7ee0f 100644
--- a/src/test/java/org/apache/commons/scxml2/env/jexl/JexlContextTest.java
+++ b/src/test/java/org/apache/commons/scxml2/env/jexl/JexlContextTest.java
@@ -29,7 +29,7 @@ public class JexlContextTest {
final JexlContext ctx = new JexlContext();
Assertions.assertNotNull(ctx);
}
-
+
@Test
public void testPrepopulated() {
final Map<String, Object> m = new HashMap<>();
diff --git
a/src/test/java/org/apache/commons/scxml2/env/jexl/JexlEvaluatorTest.java
b/src/test/java/org/apache/commons/scxml2/env/jexl/JexlEvaluatorTest.java
index a102b66..2c0c014 100644
--- a/src/test/java/org/apache/commons/scxml2/env/jexl/JexlEvaluatorTest.java
+++ b/src/test/java/org/apache/commons/scxml2/env/jexl/JexlEvaluatorTest.java
@@ -38,7 +38,7 @@ public class JexlEvaluatorTest {
final Evaluator eval = new JexlEvaluator();
ctx.set("x", 3);
ctx.set("y", 0);
- final String script =
+ final String script =
"if ((x * 2) == 5) {" +
"y = 1;\n" +
"} else {\n" +
diff --git
a/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java
b/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java
index e9cf6a2..83e24b5 100644
--- a/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java
+++ b/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java
@@ -36,26 +36,26 @@ public class InvokeParamNameTest {
private static String lastURL;
private static Map<String, Object> lastParams;
-
+
@BeforeEach
public void setUp() throws Exception {
exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/invoke/invoker-04.xml");
exec.registerInvokerClass("x-test", DummyInvoker.class);
exec.go();
}
-
+
@AfterEach
public void tearDown() {
- exec.unregisterInvokerClass("x-test");
+ exec.unregisterInvokerClass("x-test");
}
-
+
private void trigger() throws ModelException {
lastParams = null;
lastURL = null;
exec.triggerEvent(new EventBuilder("test.trigger",
TriggerEvent.SIGNAL_EVENT).build());
}
-
- // Tests "param" element with "name" and "expr" attribute
+
+ // Tests "param" element with "name" and "expr" attribute
@Test
public void testNameAndExpr() throws Exception {
trigger();
diff --git a/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java
b/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java
index 32214ea..1505ae4 100644
--- a/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java
+++ b/src/test/java/org/apache/commons/scxml2/invoke/InvokeTest.java
@@ -36,7 +36,7 @@ public class InvokeTest {
/**
* Test the SCXML documents, usage of <invoke>
- */
+ */
@Test
public void testInvoke01Sample() throws Exception {
final SCXML scxml =
SCXMLReader.read(SCXMLTestHelper.getResource("org/apache/commons/scxml2/invoke/invoker-01.xml"));
@@ -48,7 +48,7 @@ public class InvokeTest {
Assertions.assertEquals(1, currentStates.size());
Assertions.assertEquals("invoker",
currentStates.iterator().next().getId());
}
-
+
@Test
public void testInvoke02Sample() throws Exception {
final SCXML scxml =
SCXMLReader.read(SCXMLTestHelper.getResource("org/apache/commons/scxml2/invoke/invoker-02.xml"));
@@ -59,7 +59,7 @@ public class InvokeTest {
final Set<EnterableState> currentStates = exec.getStatus().getStates();
Assertions.assertEquals(1, currentStates.size());
}
-
+
@Test
public void testInvoke03Sample() throws Exception {
final SCXML scxml =
SCXMLReader.read(SCXMLTestHelper.getResource("org/apache/commons/scxml2/invoke/invoker-03.xml"));
diff --git a/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java
b/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java
index d617ee8..166858d 100644
--- a/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java
+++ b/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java
@@ -87,35 +87,35 @@ public class SCXMLReaderTest {
/**
* Test the implementation
- */
+ */
@Test
public void testSCXMLReaderMicrowave03Sample() throws Exception {
final SCXML scxml =
SCXMLTestHelper.parse("org/apache/commons/scxml2/env/jexl/microwave-03.xml");
Assertions.assertNotNull(scxml);
Assertions.assertNotNull(serialize(scxml));
}
-
+
@Test
public void testSCXMLReaderMicrowave04Sample() throws Exception {
final SCXML scxml =
SCXMLTestHelper.parse("org/apache/commons/scxml2/env/jexl/microwave-04.xml");
Assertions.assertNotNull(scxml);
Assertions.assertNotNull(serialize(scxml));
}
-
+
@Test
public void testSCXMLReaderTransitions01Sample() throws Exception {
final SCXML scxml =
SCXMLTestHelper.parse("org/apache/commons/scxml2/transitions-01.xml");
Assertions.assertNotNull(scxml);
Assertions.assertNotNull(serialize(scxml));
}
-
+
@Test
public void testSCXMLReaderPrefix01Sample() throws Exception {
final SCXML scxml =
SCXMLTestHelper.parse("org/apache/commons/scxml2/prefix-01.xml");
Assertions.assertNotNull(scxml);
Assertions.assertNotNull(serialize(scxml));
}
-
+
@Test
public void testSCXMLReaderSend01Sample() throws Exception {
final SCXML scxml =
SCXMLTestHelper.parse("org/apache/commons/scxml2/send-01.xml");
@@ -138,7 +138,7 @@ public class SCXMLReaderTest {
Assertions.assertFalse(scxmlAsString.indexOf(expectedFoo2Serialization) == -1);
*/
}
-
+
@Test
public void testSCXMLReaderInitialAttr() throws Exception {
final SCXML scxml =
SCXMLTestHelper.parse("org/apache/commons/scxml2/io/scxml-initial-attr.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java
b/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java
index f38f7b5..b6f354d 100644
--- a/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java
+++ b/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java
@@ -44,7 +44,7 @@ public class SCXMLWriterTest {
final State s = new State();
s.setId(scxml.generateTransitionTargetId());
scxml.addChild(s);
-
+
final String assertValue = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<scxml xmlns=\"http://www.w3.org/2005/07/scxml\";
xmlns:cs=\"https://commons.apache.org/scxml\"; "
+ "xmlns:foo=\"http://f.o.o\"; xmlns:bar=\"http://b.a.r\"; "
@@ -53,7 +53,7 @@ public class SCXMLWriterTest {
Assertions.assertEquals(assertValue, SCXMLWriter.write(scxml, new
SCXMLWriter.Configuration(true, false)));
}
-
+
@Test
public void testSerializeSCXMLState() throws IOException,
XMLStreamException {
final SCXML scxml = new CommonsSCXML();
@@ -72,7 +72,7 @@ public class SCXMLWriterTest {
Assertions.assertEquals(assertValue, SCXMLWriter.write(scxml, new
SCXMLWriter.Configuration(true, false)));
}
-
+
@Test
public void testSerializeParallel() throws IOException, XMLStreamException
{
diff --git a/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java
b/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java
index 3891547..50ae9ff 100644
--- a/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java
+++ b/src/test/java/org/apache/commons/scxml2/io/StateSrcTest.java
@@ -41,7 +41,7 @@ public class StateSrcTest {
Assertions.assertEquals("srctest1end",
states.iterator().next().getId());
Assertions.assertTrue(exec.getStatus().isFinal());
}
-
+
@Test
public void testBadSrcInclude() {
final ModelException me = Assertions.assertThrows(
@@ -51,7 +51,7 @@ public class StateSrcTest {
Assertions.assertTrue(me.getMessage() != null &&
me.getMessage().contains("Source attribute in <state src="),
"Unexpected error message for bad <state> 'src' URI");
}
-
+
@Test
public void testBadSrcFragmentInclude() {
final ModelException me = Assertions.assertThrows(
diff --git a/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
b/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
index e6bffda..d3db580 100644
--- a/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
+++ b/src/test/java/org/apache/commons/scxml2/issues/Issue112Test.java
@@ -46,7 +46,7 @@ public class Issue112Test {
}
// Example using a custom <my:enqueue> action that generates more events
during event processing.
- // An external event queue is used by <my:enqueue> instead of
SCXMLExecutor#triggerEvent(TriggerEvent)
+ // An external event queue is used by <my:enqueue> instead of
SCXMLExecutor#triggerEvent(TriggerEvent)
@Test
public void test01issue112() throws Exception {
diff --git a/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
b/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
index 45c2d93..47a95d4 100644
--- a/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
+++ b/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java
@@ -40,14 +40,14 @@ public class Issue62Test {
Assertions.assertEquals("s1.1",
currentStates.iterator().next().getId());
SCXMLTestHelper.assertPostTriggerState(exec, "foo", "s1.1");
}
-
+
@Test
public void test02issue62() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/issues/issue62-02.xml");
exec.go();
fragmenttest(exec);
}
-
+
@Test
public void test03issue62() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/issues/issue62-03.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java
b/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java
index 01b48c3..54ab225 100644
--- a/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java
+++ b/src/test/java/org/apache/commons/scxml2/issues/Issue64Test.java
@@ -32,7 +32,7 @@ public class Issue64Test {
exec.go();
SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end");
}
-
+
@Test
public void test02issue64() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/issues/issue64-02.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/ActionTest.java
b/src/test/java/org/apache/commons/scxml2/model/ActionTest.java
index be818b2..a7366b7 100644
--- a/src/test/java/org/apache/commons/scxml2/model/ActionTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/ActionTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class ActionTest {
private Action action;
-
+
@BeforeEach
public void setUp() {
action = new Assign();
@@ -31,62 +31,62 @@ public class ActionTest {
@Test
public void testGetParentStateIsState() throws Exception {
final Transition transition = new Transition();
-
+
final State state = new State();
state.setId("on");
-
+
transition.setParent(state);
action.setParent(transition);
final TransitionTarget returnValue = action.getParentEnterableState();
-
+
Assertions.assertEquals("on", returnValue.getId());
}
-
+
@Test
public void testGetParentStateIsParallel() throws Exception {
final Transition transition = new Transition();
-
+
final Parallel parallel = new Parallel();
parallel.setId("on");
-
+
final State state = new State();
state.setId("off");
-
+
parallel.setParent(state);
transition.setParent(parallel);
action.setParent(transition);
final TransitionTarget returnValue = action.getParentEnterableState();
-
+
Assertions.assertEquals("on", returnValue.getId());
}
-
+
@Test
public void testGetParentStateIsHistory() throws Exception {
final Transition transition = new Transition();
-
+
final History history = new History();
history.setId("on");
-
+
final State state = new State();
state.setId("off");
-
+
history.setParent(state);
transition.setParent(history.getParent());
action.setParent(transition);
final TransitionTarget returnValue = action.getParentEnterableState();
-
+
Assertions.assertEquals("off", returnValue.getId());
}
-
+
@Test
public void testGetParentStateIsInitial() throws Exception {
final SimpleTransition transition = new SimpleTransition();
-
+
final Initial initial = new Initial();
final State state = new State();
diff --git a/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java
b/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java
index 8bfd789..c316c14 100644
--- a/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/ActionsTest.java
@@ -39,14 +39,14 @@ public class ActionsTest {
exec.go();
runTest(exec);
}
-
+
@Test
public void testParallelActions() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/actions-parallel-test.xml");
exec.go();
runTest(exec);
}
-
+
@Test
public void testInitialActions() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/actions-initial-test.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/AssignTest.java
b/src/test/java/org/apache/commons/scxml2/model/AssignTest.java
index 16281c8..130afcd 100644
--- a/src/test/java/org/apache/commons/scxml2/model/AssignTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/AssignTest.java
@@ -36,7 +36,7 @@ public class AssignTest {
Assertions.assertEquals("assign3",
currentStates.iterator().next().getId());
Assertions.assertTrue(exec.getStatus().isFinal());
}
-
+
@Test
public void testAssignDeep() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/assign-test-02.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
b/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
index 120d46f..5864104 100644
--- a/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
@@ -31,7 +31,7 @@ public class DatamodelTest {
/**
* Test the stateless model (jexl), simultaneous executions
- */
+ */
@Test
public void testDatamodelSimultaneousJexl() throws Exception {
final SCXMLExecutor exec01 =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/datamodel-01.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java
b/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java
index 0eb22e5..ca2724b 100644
--- a/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/HistoryTest.java
@@ -29,32 +29,32 @@ public class HistoryTest {
public void testSetTypeDeep() {
final History history = new History();
history.setType("deep");
-
+
Assertions.assertTrue(history.isDeep());
}
-
+
@Test
public void testSetTypeNotDeep() {
final History history = new History();
history.setType("shallow");
-
+
Assertions.assertFalse(history.isDeep());
}
-
+
@Test
public void testShallowHistory01() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-shallow-01.xml");
exec.go();
runHistoryFlow(exec);
}
-
+
@Test
public void testDeepHistory01() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-deep-01.xml");
exec.go();
runHistoryFlow(exec);
}
-
+
@Test
public void testHistoryDefaults01() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-default-01.xml");
@@ -69,7 +69,7 @@ public class HistoryTest {
Assertions.assertEquals(1, currentStates.size());
Assertions.assertEquals("state31",
currentStates.iterator().next().getId());
}
-
+
@Test
public void testHistoryParallel01() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/history-parallel-01.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java
b/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java
index fee9798..ca9097c 100644
--- a/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/ParallelTest.java
@@ -29,7 +29,7 @@ public class ParallelTest {
exec.go();
SCXMLTestHelper.assertPostTriggerState(exec, "foo", "end");
}
-
+
@Test
public void testParallel02() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/parallel-02.xml");
@@ -37,7 +37,7 @@ public class ParallelTest {
SCXMLTestHelper.assertPostTriggerStates(exec, "dummy.event", new
String[] { "state01", "state02" });
SCXMLTestHelper.assertPostTriggerState(exec, "event1", "state1");
}
-
+
@Test
public void testParallel03() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/parallel-03.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java
b/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java
index b8ca407..81794f9 100644
--- a/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/ScriptTest.java
@@ -27,7 +27,7 @@ public class ScriptTest {
/**
* Test JEXL script execution.
- */
+ */
@Test
public void testJexlScriptExecution() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/env/jexl/script-01.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/StateTest.java
b/src/test/java/org/apache/commons/scxml2/model/StateTest.java
index 9390549..d2d4ad3 100644
--- a/src/test/java/org/apache/commons/scxml2/model/StateTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/StateTest.java
@@ -30,14 +30,14 @@ public class StateTest {
final State state = new State();
Assertions.assertNull(state.getTransitionsList("event"));
}
-
+
@Test
public void testGetTransitionsList() {
final State state = new State();
state.getTransitionsList().add(new Transition());
Assertions.assertNotNull(state.getTransitionsList(null));
}
-
+
@Test
public void testAddTransitionDoesNotContainKey() {
final Transition transition = new Transition();
@@ -45,13 +45,13 @@ public class StateTest {
final State state = new State();
state.addTransition(transition);
-
+
final List<Transition> events = state.getTransitionsList("event");
-
+
Assertions.assertEquals(1, events.size());
Assertions.assertEquals("event", events.get(0).getEvent());
}
-
+
@Test
public void testAddTransitionContainKey() {
final Transition transition1 = new Transition();
@@ -63,12 +63,12 @@ public class StateTest {
final State state = new State();
state.addTransition(transition1);
state.addTransition(transition2);
-
+
final List<Transition> events = state.getTransitionsList("event");
-
+
Assertions.assertEquals(2, events.size());
}
-
+
@Test
public void testGetTransitionList() {
final Transition transition1 = new Transition();
@@ -80,86 +80,86 @@ public class StateTest {
final State state = new State();
state.addTransition(transition1);
state.addTransition(transition2);
-
+
final List<Transition> events = state.getTransitionsList();
-
+
Assertions.assertEquals(2, events.size());
}
-
+
@Test
public void testHasHistoryEmpty() {
final State state = new State();
Assertions.assertFalse(state.hasHistory());
}
-
+
@Test
public void testHasHistory() {
final History history = new History();
final State state = new State();
state.addHistory(history);
-
+
Assertions.assertTrue(state.hasHistory());
}
-
+
@Test
public void testIsSimple() {
final State state = new State();
Assertions.assertTrue(state.isSimple());
}
-
+
@Test
public void testIsSimpleHasChildren() {
final State state1 = new State();
-
+
final State state = new State();
state.addChild(state1);
-
+
Assertions.assertFalse(state.isSimple());
}
-
+
@Test
public void testIsCompositeFalse() {
final State state = new State();
Assertions.assertFalse(state.isComposite());
}
-
+
@Test
public void testIsCompositeParallel() {
final State child = new State();
final State state = new State();
state.addChild(child);
-
+
Assertions.assertTrue(state.isComposite());
}
-
+
@Test
public void testIsCompositeHasChildren() {
final State state1 = new State();
final State state = new State();
state.addChild(state1);
-
+
Assertions.assertTrue(state.isComposite());
}
-
+
@Test
public void testIsRegion() {
final State state = new State();
state.setParent(new Parallel());
-
+
Assertions.assertTrue(state.isRegion());
}
-
+
@Test
public void testIsRegionNotParallel() {
final State state = new State();
state.setParent(new State());
-
+
Assertions.assertFalse(state.isRegion());
}
-
+
@Test
public void testInitialAttribute() throws Exception {
final SCXMLExecutor exec =
SCXMLTestHelper.getExecutor("org/apache/commons/scxml2/model/state-01.xml");
diff --git
a/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
b/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
index ce1d63c..f04f24c 100644
--- a/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
@@ -32,7 +32,7 @@ public class StatelessModelTest {
/**
* Test the stateless model, simultaneous executions, JEXL expressions
- */
+ */
@Test
public void testStatelessModelSimultaneousJexl() throws Exception {
// parse once, use many times
@@ -47,7 +47,7 @@ public class StatelessModelTest {
/**
* Test the stateless model, sequential executions, JEXL expressions
- */
+ */
@Test
public void testStatelessModelSequentialJexl() throws Exception {
// rinse and repeat
@@ -61,7 +61,7 @@ public class StatelessModelTest {
/**
* Test sharing a single SCXML object between two executors
- */
+ */
@Test
public void testStatelessModelParallelSharedSCXML() throws Exception {
final SCXML scxml01par =
SCXMLTestHelper.parse("org/apache/commons/scxml2/model/stateless-parallel-01.xml");
diff --git a/src/test/java/org/apache/commons/scxml2/model/TransitionTest.java
b/src/test/java/org/apache/commons/scxml2/model/TransitionTest.java
index 12bd26c..0dc85b3 100644
--- a/src/test/java/org/apache/commons/scxml2/model/TransitionTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/TransitionTest.java
@@ -23,12 +23,12 @@ import org.junit.jupiter.api.Test;
public class TransitionTest {
private Transition transition;
-
+
@BeforeEach
public void setUp() {
transition = new Transition();
}
-
+
@Test
public void testGetTargets() {
Assertions.assertEquals(0, transition.getTargets().size());
