fix sequential and parallel

GramGra07 · Oct 12, 2024 · 3808d64 · 3808d64
1 parent d2e5f48
commit 3808d64
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 4 deletions.
diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin
diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock
diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin
diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock
diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/build/intermediates/compile_library_classes_jar/debug/classes.jar b/build/intermediates/compile_library_classes_jar/debug/classes.jar
diff --git a/...diates/javac/debug/classes/org/gentrifiedApps/statemachineftc/ParallelRunSM$Builder.class b/...diates/javac/debug/classes/org/gentrifiedApps/statemachineftc/ParallelRunSM$Builder.class
diff --git a/.../intermediates/javac/debug/classes/org/gentrifiedApps/statemachineftc/ParallelRunSM.class b/.../intermediates/javac/debug/classes/org/gentrifiedApps/statemachineftc/ParallelRunSM.class
diff --git a/build/intermediates/javac/debug/classes/tests/ParallelRunSMTestCases.class b/build/intermediates/javac/debug/classes/tests/ParallelRunSMTestCases.class
diff --git a/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
diff --git a/src/main/java/org/gentrifiedApps/statemachineftc/ParallelRunSM.java b/src/main/java/org/gentrifiedApps/statemachineftc/ParallelRunSM.java
@@ -1,9 +1,5 @@
 package org.gentrifiedApps.statemachineftc;
 
-import android.util.Pair;
-
-import org.junit.jupiter.api.DisplayNameGenerator;
-
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -83,6 +79,11 @@ public ParallelRunSM.Builder<T> stopRunning(T state, Supplier<Boolean> exitComma
 
         public ParallelRunSM<T> build(Boolean useTimeout, Integer timeout) {
             this.timeout = new AbstractMap.SimpleEntry<>(useTimeout, timeout);
+
+            if (timeout < 0) {
+                throw new IllegalArgumentException("Timeout must be a positive integer");
+            }
+
             if (states == null || states.isEmpty()) {
                 throw new IllegalArgumentException("States cannot be null or empty");
             }
@@ -91,6 +92,13 @@ public ParallelRunSM<T> build(Boolean useTimeout, Integer timeout) {
                 throw new IllegalArgumentException("States cannot have duplicates");
             }
 
+            if (onEnterCommands.isEmpty()) {
+                throw new IllegalArgumentException("States must have corresponding onEnter commands");
+            }
+            if (onEnterCommands.size() != states.size()) {
+                throw new IllegalArgumentException("Not all states have corresponding onEnter commands");
+            }
+
             if (onEnterCommands.get(states.get(0)) == null) {
                 throw new IllegalArgumentException("Initial state must have a corresponding onEnter command");
             }

diff --git a/src/main/java/tests/ParallelRunSMTestCases.java b/src/main/java/tests/ParallelRunSMTestCases.java
@@ -278,4 +278,35 @@ public void testStopRunningTiming2() {
         assertFalse(map[2]);
         assertFalse(stateMachine.isRunning());
     }
+    // mismatch states and onenters
+    @Test
+    public void testMismatchStatesAndOnEnters() {
+        ParallelRunSM.Builder<States> builder = new ParallelRunSM.Builder<>();
+        builder.state(States.STATE1)
+                .onEnter(States.STATE1, () -> System.out.println("Entering STATE1"))
+                .state(States.STATE2)
+                .stopRunning(States.STOP,()->true);
+        try {
+            ParallelRunSM<States> stateMachine = builder.build(false,100);
+        } catch (IllegalArgumentException e) {
+            assertEquals("Not all states have corresponding onEnter commands", e.getMessage());
+        }
+    }
+    // test a negative timeout
+    @Test
+    public void testNegativeTimeout() {
+        ParallelRunSM.Builder<States> builder = new ParallelRunSM.Builder<>();
+        builder.state(States.STATE1)
+                .onEnter(States.STATE1, () -> System.out.println("Entering STATE1"))
+                .state(States.STATE2)
+                .onEnter(States.STATE2, () -> System.out.println("Entering STATE2"))
+                .state(States.STATE3)
+                .onEnter(States.STATE3, () -> System.out.println("Entering STATE3"))
+                .stopRunning(States.STOP,()->true);
+        try {
+            ParallelRunSM<States> stateMachine = builder.build(false,-100);
+        } catch (IllegalArgumentException e) {
+            assertEquals("Timeout must be a positive integer", e.getMessage());
+        }
+    }
 }