Added additional test of keep-function

src/snipper/fix_bf.py

@@ -7,9 +7,6 @@ from snipper.block_parsing import block_split, block_join
 def fix_f(lines, debug, keep=False):
     lines2 = []
     i = 0
-    # if "GymPacmanEnvironment" in lines[0]:
-    #     print("\n".join(lines))
-    #     z = 324
     while i < len(lines):
         l = lines[i]
         dx = l.find("#!f")

tests/setup_test_files.py

 import os.path
 import shutil
-from snipper import snip_dir
+
 
 def setup(source, dest):
     if os.path.isdir(dest):
         shutil.rmtree(dest)
     os.mkdir(dest)
     os.mkdir(dest + "/output")
-
+    from snipper import snip_dir
     snip_dir(source, dest_dir=dest + "/code", clean_destination_dir=True, output_dir=dest + "/output")
 
 
+def setup_keep(source, dest):
+
+    from snipper import snipper_main
+    # snip_dir(source, dest_dir=dest + "/code", clean_destination_dir=True, output_dir=dest + "/output")
+    with open(source, 'r') as f:
+        lines = f.read().strip().splitlines()
+
+    lines2 = snipper_main.censor_code(lines, keep=True)
+    assert len(lines) == len(lines2)
+    with open(dest, 'w') as f:
+        f.write("\n".join(lines2))
+    return lines, lines2
+
 if __name__ == "__main__":
     print("File used for setting up sets -- don't run this script unless repository known to work (Tue, 2022)")
-
-    if os.path.isdir("student_repo"):
-        shutil.rmtree("student_repo")
+    assert False
+    # if os.path.isdir("student_repo"):
+    #     shutil.rmtree("student_repo")
 
     from snipper import snip_dir
-
     # if not os.path.isdir("student_correct_output"):
     #     os.mkdir("student_correct_output")
-
-
-
-    setup("demo1", "demo1_correct")
-
-    def compare(source, dest):
-
-
-
-        pass
-
+    for file in ['demo1']:
+        setup(file, file+"_correct")
+    setup_keep("demo2/framework.py", "demo2/framework_correct.txt")
 
     a= 234
     # assert False

tests/test_python.py

 
+import filecmp
 from unittest import TestCase
 import filecmp
+import os.path
 
 class dircmp(filecmp.dircmp):
     """
@@ -16,8 +18,6 @@ class dircmp(filecmp.dircmp):
                                  shallow=False)
         self.same_files, self.diff_files, self.funny_files = fcomp
 
-import os.path
-
 def is_same(dir1, dir2):
     """
     Compare two directory trees content.
@@ -34,9 +34,20 @@ def is_same(dir1, dir2):
 
 class TestPython(TestCase):
     def test_demo1(self):
-        from setup_test_files import setup
+        from setup_test_files import setup, setup_keep
         setup("demo1", "demo1_tmp")
-        import filecmp
         report = filecmp.dircmp("demo1_correct", "demo1_tmp")
         print("Different", report.report())
         self.assertTrue(is_same("demo1_correct", "demo1_tmp"))
+
+    def test_demo2(self):
+        from setup_test_files import setup, setup_keep
+        # base = 'demo2'
+        setup_keep("demo2/framework.py", "demo2/framework_tmp.txt")
+        with open("demo2/framework_tmp.txt") as f:
+            tmp = f.read()
+
+        with open("demo2/framework_correct.txt") as f:
+            correct = f.read()
+
+        self.assertEqual(tmp, correct)