(commons-scxml) 24/30: Merge if clauses

[ggregory]

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

commit f3338a57379a4f61232302e8e28e37fff1804b1d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Sep 12 10:44:56 2024 -0400

    Merge if clauses
---
 .../apache/commons/scxml2/model/StatelessModelTest.java  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

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 35a938b8..e2252396 100644
--- a/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
+++ b/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java
@@ -63,9 +63,7 @@ public class StatelessModelTest {
             Assertions.assertTrue(i.hasNext(), "Not enough states, found one 
state: " + cs1);
             cs2 = i.next().getId();
             Assertions.assertFalse(i.hasNext(), "Too many states");
-            if (s2.equals(cs2)) {
-                cs2 = null;
-            } else if (s1.equals(cs2)) {
+            if (s2.equals(cs2) || s1.equals(cs2)) {
                 cs2 = null;
             } else {
                 Assertions.fail(label + " in unexpected state " + cs2);
@@ -91,16 +89,16 @@ public class StatelessModelTest {
     private void runSequentialTest(final SCXMLExecutor exec) throws Exception {
         Set<EnterableState> currentStates = exec.getStatus().getStates();
         Assertions.assertEquals(1, currentStates.size());
-        Assertions.assertEquals("ten", (currentStates.iterator().
-            next()).getId());
+        Assertions.assertEquals("ten", currentStates.iterator().
+            next().getId());
         currentStates = fireEvent("done.state.ten", exec);
         Assertions.assertEquals(1, currentStates.size());
-        Assertions.assertEquals("twenty", (currentStates.iterator().
-            next()).getId());
+        Assertions.assertEquals("twenty", currentStates.iterator().
+            next().getId());
         currentStates = fireEvent("done.state.twenty", exec);
         Assertions.assertEquals(1, currentStates.size());
-        Assertions.assertEquals("thirty", (currentStates.iterator().
-            next()).getId());
+        Assertions.assertEquals("thirty", currentStates.iterator().
+            next().getId());
     }
 
     private void runSimultaneousTest(final SCXMLExecutor exec01, final 
SCXMLExecutor exec02) throws Exception {