Update to use latest protowhat functionality

Author: hermansje

shellwhat/State.py

@@ -4,8 +4,5 @@
 
 
 class State(BaseState):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
     def get_dispatcher(self):
         return Dispatcher.from_module(DEFAULT_PARSER)

shellwhat/test_exercise.py

@@ -30,10 +30,11 @@ def test_exercise(
         solution_conn=solution_conn,
         student_result=student_result,
         solution_result=solution_result,
-        reporter=Reporter(error),
+        reporter=Reporter(errors=error),
         force_diagnose=force_diagnose,
     )
 
+    State.root_state = state
     SCT_CTX["Ex"].root_state = state
 
     try:

tests/test_basic.py

@@ -1,3 +1,5 @@
+from tempfile import NamedTemporaryFile
+
 from shellwhat.test_exercise import test_exercise as te
 from functools import partial
 
@@ -37,11 +39,19 @@ def test_sct(te_sct, code, is_correct):
     assert sct_payload.get("student_code") == "ls -t"
 
 
-def test_sct_check_file():
+@pytest.fixture(scope="function")
+def tf():
+    with NamedTemporaryFile() as tmp:
+        tmp.file.write(b"hey")
+        tmp.file.flush()
+        yield tmp
+
+
+def test_sct_check_file(tf):
     sct_payload = te(
-        "Ex().check_file('file1.sh', use_fs=False).has_code('hey')",
-        student_code={"file1.sh": "echo hey"},
-        solution_code={"file1.sh": "echo ya"},
+        "Ex().check_file('{}').has_code('hey')".format(tf.name),
+        student_code="NA",
+        solution_code="NA",
         pre_exercise_code="",
         student_conn=None,
         solution_conn=None,

tests/test_has_funcs.py

@@ -10,7 +10,7 @@
 
 @pytest.fixture
 def state():
-    return State(
+    state = State(
         student_code="some code\x1b[39;49m",
         solution_code="some code",
         pre_exercise_code="",
@@ -20,6 +20,8 @@ def state():
         solution_result=None,
         reporter=Reporter(),
     )
+    state.root_state = state
+    return state
 
 
 def test_strip_ansi(state):

tests/test_selectors.py

@@ -1,14 +1,21 @@
+import pytest
+
 from shellwhat.State import State
 from protowhat.Reporter import Reporter
 from protowhat.Test import TestFail as TF
 from protowhat.checks.check_funcs import check_node, check_edge, has_equal_ast
+from shellwhat.parsers import OshParser
 
-import pytest
+
+@pytest.fixture(autouse=True)
+def run_around_tests():
+    yield
+    OshParser.nodes = {}
 
 
 @pytest.fixture("function")
 def state():
-    return State(
+    state = State(
         student_code="echo a $b ${c}",
         solution_code="echo a $b ${c} unique",
         pre_exercise_code="",
@@ -18,16 +25,65 @@ def state():
         solution_result="",
         reporter=Reporter(),
     )
+    state.root_state = state
+    return state
 
 
 @pytest.fixture("function")
 def d():
     return state().get_dispatcher()
 
 
+@pytest.fixture("function")
+def shell_script():
+    return """# Use curl, download file from URL and rename 
+curl -o Spotify201812.zip -L https://tinyurl.com/Zipped201812Spotify
+
+# Unzip file then delete original zipped file
+unzip Spotify201812.zip && rm Spotify201812.zip
+
+# View url_list.txt to verify content
+cat url_list.txt
+
+# Use wget, download all files in url_list.txt
+wget -i url_list.txt
+
+# Take a look at all files downloaded
+ls"""
+
+
 @pytest.mark.osh
 class TestOsh:
     # TODO: check top node?
+    def test_osh_parsing(self, d, shell_script):
+        d.ast_mod.parse(shell_script)
+
+    def test_sct(self, shell_script):
+        from shellwhat.test_exercise import test_exercise as te
+
+        sct_payload = te(
+            """
+Ex().check_node('SimpleCommand', 0).multi(
+  check_edge('words', 0).has_equal_ast(),
+  check_edge('words', 1).has_equal_ast(),
+  check_edge('words', 2).has_equal_ast(),
+  check_edge('words', 3).has_equal_ast(),
+  check_edge('words', 4).has_equal_ast()
+)""",
+            student_code=shell_script,
+            solution_code=shell_script,
+            pre_exercise_code="""from urllib.request import urlretrieve
+url = 'https://assets.datacamp.com/production/repositories/4180/datasets/b4e48732f25e87864f6ce23066b8c0d14c7c6430/Chp1Capstone_urlList.txt'
+urlretrieve(url, 'url_list.txt')""",
+            student_conn=None,
+            solution_conn=None,
+            student_result="",
+            solution_result="",
+            ex_type="NormalExercise",
+            error=[],
+        )
+        assert sct_payload.get("correct")
+
     def test_osh_dispatcher_ast_fails_hard(self, d):
         with pytest.raises(d.ParseError):
             d.ast_mod.parse("for ii")
@@ -54,6 +110,12 @@ def test_osh_selector_high_priority(self, state):
         child = check_node(state, "BracedVarSub", priority=99)
         assert isinstance(child.student_ast, target)
         assert child.student_ast.token.val == "c"
+        with pytest.raises(TF):
+            from protowhat.Feedback import Feedback
+
+            fb = Feedback("test")
+            child.report(fb)
+            assert fb.highlight is not None
 
     def test_osh_selector_fail(self, state):
         with pytest.raises(TF):