Added cli tests and a base class for tests.

Author: BatuhanSA

tests/base.py

@@ -0,0 +1,21 @@
+import json
+import unittest
+
+FORMAT_STR = "\n--- Expected ---\n%s\n--- Actual ---\n%s\n---\n"
+
+class BaseTest(unittest.TestCase):
+    """
+    A base class for tests.
+    """
+
+    def assertListEqual(self, a, b):
+        a_json = json.dumps(a, indent = 4)
+        b_json = json.dumps(b, indent = 4)
+
+        super().assertListEqual(a, b, FORMAT_STR % (a_json, b_json))
+
+    def assertDictEqual(self, a, b):
+        a_json = json.dumps(a, indent = 4)
+        b_json = json.dumps(b, indent = 4)
+
+        super().assertDictEqual(a, b, FORMAT_STR % (a_json, b_json))

tests/cli/test_cli.py

@@ -107,7 +107,7 @@ def _load_allowed_arg_keys(self, module_name):
 
 def _prepare_string(text, temp_dir):
     replacements = [
-        (tests.server.base.DATA_DIR_ID, DATA_DIR),
+        (tests.server.base.DATA_DIR_ID, os.path.abspath(DATA_DIR)),
         (TEMP_DIR_ID, temp_dir),
     ]
 

tests/cli/testdata/config/config_list_base.txt

@@ -0,0 +1,9 @@
+{
+    "cli": "autograder.cli.config.list",
+    "arguments": [
+        "--config", "__DATA_DIR__(configs/simple/autograder.json)",
+        "--global-config", "__DATA_DIR__(configs/empty)"
+    ]
+}
+---
+user: user@test.edulinq.org

tests/cli/testdata/config/config_list_sources.txt

@@ -0,0 +1,10 @@
+{
+    "cli": "autograder.cli.config.list",
+    "arguments": [
+        "--config", "__DATA_DIR__(configs/simple/autograder.json)",
+        "--global-config", "__DATA_DIR__(configs/empty)",
+        "--show-origin"
+    ]
+}
+---
+__DATA_DIR__(configs/simple/autograder.json)	user: user@test.edulinq.org

tests/server/base.py

@@ -1,17 +1,16 @@
-import json
 import os
-import unittest
 import re
 
 import autograder.error
 import tests.server.server
+import tests.base
 
 SERVER_URL_FORMAT = "http://127.0.0.1:%s"
 FORMAT_STR = "\n--- Expected ---\n%s\n--- Actual ---\n%s\n---\n"
 
 DATA_DIR_ID = tests.server.server.DATA_DIR_ID
 
-class ServerBaseTest(unittest.TestCase):
+class ServerBaseTest(tests.base.BaseTest):
     """
     A base tests that need to call the mock server.
     """
@@ -42,18 +41,6 @@ def tearDownClass(cls):
     def get_base_arguments(self):
         return ServerBaseTest._base_arguments.copy()
 
-    def assertDictEqual(self, a, b):
-        a_json = json.dumps(a, indent = 4)
-        b_json = json.dumps(b, indent = 4)
-
-        super().assertDictEqual(a, b, FORMAT_STR % (a_json, b_json))
-
-    def assertListEqual(self, a, b):
-        a_json = json.dumps(a, indent = 4)
-        b_json = json.dumps(b, indent = 4)
-
-        super().assertListEqual(a, b, FORMAT_STR % (a_json, b_json))
-
 def replace_path(text, key, base_dir):
     match = re.search(r'%s\(([^)]*)\)' % (key), text)
     if (match is not None):