Merge pull request #71 from sjtrny/equality-checks

Improve eq checks and compare_output

Author: TylerYep

stanfordkarel/karel_ascii.py

@@ -221,14 +221,34 @@ def symmetric_difference(
             f"Student: {(first.avenue, first.street)}\n"
             f"Expected: {(second.avenue, second.street)}\n\n"
         )
-    if first.world.beepers != second.world.beepers:
+
+    if first.direction != second.direction:
+        result += (
+            "Karel not facing the correct direction.\n"
+            f"Student: {first.direction}\n"
+            f"Expected: {second.direction}\n\n"
+        )
+
+    if first.world.get_beepers() != second.world.get_beepers():
         extra_a, extra_b = symmetric_difference(
-            first.world.beepers, second.world.beepers
+            first.world.get_beepers(), second.world.get_beepers()
         )
         result += (
             "Beepers do not match: "
             "(Only beepers that appear in one world but not the other are listed)\n"
             f"Student: {extra_a}\n"
             f"Expected: {extra_b}\n\n"
         )
+
+    if first.world.get_colors() != second.world.get_colors():
+        extra_a, extra_b = symmetric_difference(
+            first.world.get_colors(), second.world.get_colors()
+        )
+        result += (
+            "Colors do not match: "
+            "(Only colors that appear in one world but not the other are listed)\n"
+            f"Student: {extra_a}\n"
+            f"Expected: {extra_b}\n\n"
+        )
+
     return result

stanfordkarel/karel_program.py

@@ -289,7 +289,9 @@ def beepers_present(self) -> bool:
             beepers_on_corner (Bool) - True if there's at least one beeper
                                        on Karel's current corner, False otherwise
         """
-        return self.world.beepers[(self.avenue, self.street)] != 0
+        if (self.avenue, self.street) in self.world.beepers:
+            return self.world.beepers[(self.avenue, self.street)] != 0
+        return False
 
     def no_beepers_present(self) -> bool:
         return not self.beepers_present()

stanfordkarel/karel_world.py

@@ -41,7 +41,6 @@
 
 from __future__ import annotations
 
-import collections
 import copy
 import re
 import sys
@@ -90,10 +89,10 @@ def __init__(self, world_file: str) -> None:
         self.world_file = self.process_world(world_file)
 
         # Map of beeper locations to the count of beepers at that location
-        self.beepers: dict[tuple[int, int], int] = collections.defaultdict(int)
+        self.beepers: dict[tuple[int, int], int] = {}
 
         # Map of corner colors, defaults to ""
-        self.corner_colors: dict[tuple[int, int], str] = collections.defaultdict(str)
+        self.corner_colors: dict[tuple[int, int], str] = {}
 
         # Set of Wall objects placed in the world
         self.walls: set[Wall] = set()
@@ -120,10 +119,10 @@ def __init__(self, world_file: str) -> None:
     def __eq__(self, other: object) -> bool:
         if isinstance(other, KarelWorld):
             return (
-                self.beepers == other.beepers
-                and self.walls == other.walls
-                and self.num_streets == other.num_streets
+                self.num_streets == other.num_streets
                 and self.num_avenues == other.num_avenues
+                and self.walls == other.walls
+                and self.beepers == other.beepers
                 and self.corner_colors == other.corner_colors
             )
         return NotImplemented
@@ -263,7 +262,10 @@ def load_from_file(self) -> None:
 
                 elif keyword == "beeper":
                     # add the specified number of beepers to the world
-                    self.beepers[params["location"]] += params["val"]
+                    if params["location"] in self.beepers:
+                        self.beepers[params["location"]] += params["val"]
+                    else:
+                        self.beepers[params["location"]] = params["val"]
 
                 elif keyword == "karel":
                     # Give Karel initial state values
@@ -315,7 +317,9 @@ def paint_corner(self, avenue: int, street: int, color: str) -> None:
         self.corner_colors[(avenue, street)] = color
 
     def corner_color(self, avenue: int, street: int) -> str:
-        return self.corner_colors[(avenue, street)]
+        if (avenue, street) in self.corner_colors:
+            return self.corner_colors[(avenue, street)]
+        return ""
 
     def reset_corner(self, avenue: int, street: int) -> None:
         self.beepers[(avenue, street)] = 0
@@ -331,7 +335,7 @@ def in_bounds(self, avenue: int, street: int) -> bool:
     def reset_world(self) -> None:
         """Reset initial state of beepers in the world"""
         self.beepers = copy.deepcopy(self.init_beepers)
-        self.corner_colors = collections.defaultdict(str)
+        self.corner_colors = {}
 
     def reload_world(self, filename: str | None = None) -> None:
         """Reloads world using constructor."""

tests/programs/indent_error.txt tests/exception_programs/indent_error.txt

@@ -26,7 +26,9 @@
 
 @pytest.mark.parametrize(("code_file", "expected_error"), TEST_CASES)
 def test_exceptions(tmp_path: Path, code_file: str, expected_error: str) -> None:
-    txt_file_contents = Path(f"tests/programs/{code_file}").read_text(encoding="utf-8")
+    txt_file_contents = Path(f"tests/exception_programs/{code_file}").read_text(
+        encoding="utf-8"
+    )
     py_path = (tmp_path / code_file).with_suffix(".py")
     py_path.write_text(txt_file_contents)
     execute_karel_code(
@@ -39,7 +41,7 @@ def test_file_coverage() -> None:
     tested_files = {filepath for filepath, _ in TEST_CASES}
     test_programs = {
         filepath.name
-        for filepath in Path("tests/programs").glob("*.txt")
+        for filepath in Path("tests/exception_programs").glob("*.txt")
         if filepath.name not in IGNORED_FILES
     }
     untested_files = tested_files ^ test_programs

tests/programs/missing_main.txt tests/exception_programs/missing_main.txt

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+from stanfordkarel.karel_application import StudentCode
 from stanfordkarel.karel_program import KarelProgram
 
 STONE_MASON_ASCII_OUTPUT = (
@@ -87,3 +88,48 @@ def test_save_to_file(tmp_path: Path) -> None:
         )
 
         assert output_file.read_text() == "\n".join(expected) + "\n"
+
+    @staticmethod
+    def test_empty_beepers(tmp_path: Path) -> None:
+        code_file = "empty_beeper.txt"
+        txt_file_contents = Path(f"tests/programs/{code_file}").read_text(
+            encoding="utf-8"
+        )
+        py_path = (tmp_path / code_file).with_suffix(".py")
+        py_path.write_text(txt_file_contents)
+
+        test_program = KarelProgram("1x1")
+
+        test_code = StudentCode(py_path)
+        test_code.inject_namespace(test_program)
+        test_code.main()
+
+        ref_program = KarelProgram("1x1")
+
+        assert ref_program.world.beepers == test_program.world.beepers
+
+    @staticmethod
+    def test_empty_colors(tmp_path: Path) -> None:
+        code_file = "empty_color.txt"
+        txt_file_contents = Path(f"tests/programs/{code_file}").read_text(
+            encoding="utf-8"
+        )
+        py_path = (tmp_path / code_file).with_suffix(".py")
+        py_path.write_text(txt_file_contents)
+
+        test_program = KarelProgram("1x1")
+
+        test_code = StudentCode(py_path)
+        test_code.inject_namespace(test_program)
+        test_code.main()
+
+        ref_program = KarelProgram("1x1")
+
+        assert ref_program.world.corner_colors == test_program.world.corner_colors
+
+    @staticmethod
+    def test_equal_worlds() -> None:
+        test_program = KarelProgram("1x1")
+        ref_program = KarelProgram("1x1")
+
+        assert ref_program.world == test_program.world

tests/programs/name_error.txt tests/exception_programs/name_error.txt

@@ -0,0 +1,10 @@
+from stanfordkarel import *
+
+
+def main():
+    if corner_color_is(PINK):
+        turn_left()
+
+
+if __name__ == "__main__":
+    run_karel_program()

tests/programs/syntax_error.txt tests/exception_programs/syntax_error.txt

@@ -0,0 +1,10 @@
+from stanfordkarel import *
+
+
+def main():
+    if beepers_present():
+        turn_left()
+
+
+if __name__ == "__main__":
+    run_karel_program()