Merge pull request #147 from tammysalmon/hacktoberfest-issue-121

Hacktoberfest issue 121 (RandomActuator return NO_DIR when moveset is empty).
pygamelib · Oct 28, 2020 · a65c87a · a65c87a
2 parents 1b1e748 + 067cc2a
commit a65c87a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -113,3 +113,6 @@ venv.bak/
 hac-maps/test-write-board.json
 settings-suparex*
 test-*
+
+# PyCharm
+.idea/
diff --git a/pygamelib/actuators.py b/pygamelib/actuators.py
@@ -150,8 +150,10 @@ def next_move(self):
 
             randomactuator.next_move()
         """
-        if self.state == constants.RUNNING:
+        if self.state == constants.RUNNING and self.moveset:
             return random.choice(self.moveset)
+        else:
+            return constants.NO_DIR
 
 
 class PathActuator(Actuator):

diff --git a/tests/test_actuators.py b/tests/test_actuators.py
@@ -32,6 +32,11 @@ def test_random(self):
         self.assertEqual(a.moveset, [constants.UP])
         self.assertEqual(a.next_move(), constants.UP)
 
+    def test_random_empty(self):
+        a = actuators.RandomActuator()
+        self.assertEqual(a.moveset, [])
+        self.assertEqual(a.next_move(), constants.NO_DIR)
+
     def test_path(self):
         a = actuators.PathActuator([constants.UP])
         a.pause()