Move local state setup function

Author: hermansje

README.md

@@ -34,7 +34,7 @@ _, ctxt = prep_context()
 globals().update(ctxt)
 
 # initialize state with student and solution submission
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 setup_state(stu_code = "x = 5", sol_code = "x = 4")
 
 Ex().check_object('x')
@@ -64,4 +64,4 @@ Bugs? Questions? Suggestions? [Create an issue](https://github.com/datacamp/pyth
 
 
 ## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdatacamp%2Fpythonwhat.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdatacamp%2Fpythonwhat?ref=badge_large)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdatacamp%2Fpythonwhat.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdatacamp%2Fpythonwhat?ref=badge_large)

pythonwhat/local.py

@@ -1,8 +1,6 @@
 import io
 import random
 
-from pythonwhat.sct_syntax import Ex
-from pythonwhat.State import State
 from pythonwhat.reporter import Reporter
 from contextlib import redirect_stdout
 
@@ -26,23 +24,7 @@ def executeTask(self, task):
         return task(self.shell)
 
 
-def setup_state(stu_code="", sol_code="", pec="", pid=None):
-    sol_process, stu_process, raw_stu_output, _ = run_exercise(
-        pec, sol_code, stu_code, pid=pid
-    )
 
-    state = State(
-        student_code=stu_code,
-        solution_code=sol_code,
-        pre_exercise_code=pec,
-        student_process=stu_process,
-        solution_process=sol_process,
-        raw_student_output=raw_stu_output,
-        reporter=Reporter(),
-    )
-
-    State.root_state = state
-    return Ex(state)
 
 
 def run_exercise(pec, sol_code, stu_code, pid=None):

pythonwhat/test_exercise.py

@@ -1,4 +1,6 @@
 from pythonwhat.State import State
+from pythonwhat.local import run_exercise
+from pythonwhat.sct_syntax import Ex
 from pythonwhat.utils import check_str, check_process
 from pythonwhat.reporter import Reporter
 from protowhat.Test import TestFail
@@ -100,3 +102,22 @@ def prep_context():
 
     cntxt.update(v2_check_functions)
     return tree, cntxt
+
+
+def setup_state(stu_code="", sol_code="", pec="", pid=None):
+    sol_process, stu_process, raw_stu_output, _ = run_exercise(
+        pec, sol_code, stu_code, pid=pid
+    )
+
+    state = State(
+        student_code=stu_code,
+        solution_code=sol_code,
+        pre_exercise_code=pec,
+        student_process=stu_process,
+        solution_process=sol_process,
+        raw_student_output=raw_stu_output,
+        reporter=Reporter(),
+    )
+
+    State.root_state = state
+    return Ex(state)

tests/test_author_warnings.py

@@ -2,7 +2,7 @@
 import ast
 import tests.helper as helper
 
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from protowhat.Feedback import InstructorError
 from inspect import signature, Signature, Parameter
 from pythonwhat.checks.check_funcs import assert_ast

tests/test_check_class_def.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from pythonwhat.sct_syntax import v2_check_functions
 
 globals().update(v2_check_functions)

tests/test_check_files.py

@@ -4,7 +4,7 @@
 import tests.helper as helper
 from protowhat.sct_syntax import F
 
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from protowhat.checks import check_files as cf
 
 

tests/test_check_function.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from protowhat.Test import TestFail as TF
 from protowhat.Feedback import InstructorError
 from pythonwhat.sct_syntax import v2_check_functions
@@ -80,7 +80,7 @@ def test_diff_function_types(fun, code, arg):
 
 
 def test_bind_args():
-    from pythonwhat.local import setup_state
+    from pythonwhat.test_exercise import setup_state
     from inspect import signature
     from pythonwhat.checks.check_function import bind_args
 

tests/test_check_function_def.py

@@ -1,7 +1,7 @@
 import pytest
 import tests.helper as helper
 
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from pythonwhat.sct_syntax import v2_check_functions
 
 globals().update(v2_check_functions)

tests/test_check_list_comp.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from pythonwhat.sct_syntax import v2_check_functions
 
 globals().update(v2_check_functions)

tests/test_check_object.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 
 
 @pytest.mark.parametrize(

tests/test_has_code.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 
 
 @pytest.mark.parametrize("stu, passes", [("", False), ("c", False), ("a == c", True)])

tests/test_has_expr.py

@@ -1,5 +1,5 @@
 import pytest
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from protowhat.Feedback import InstructorError
 import tests.helper as helper
 

tests/test_has_import.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 
 
 @pytest.mark.parametrize(

tests/test_has_output.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 
 
 @pytest.mark.parametrize(

tests/test_has_printout.py

@@ -1,5 +1,5 @@
 import pytest
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from protowhat.Test import TestFail as TF
 import tests.helper as helper
 

tests/test_highlighting.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 
 
 def test_disable_highlighting():

tests/test_set_env.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from pythonwhat.sct_syntax import v2_check_functions
 
 set_env = v2_check_functions["set_env"]

tests/test_signatures.py

@@ -1,4 +1,4 @@
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 import pytest
 
 # https://docs.python.org/3.x/library/functions.html

tests/test_test_compound_statement.py

@@ -1,6 +1,6 @@
 import pytest
 import tests.helper as helper
-from pythonwhat.local import setup_state
+from pythonwhat.test_exercise import setup_state
 from pythonwhat.sct_syntax import v2_check_functions
 
 globals().update(v2_check_functions)