Update test framework

cx1111 · Nov 20, 2019 · 8fedaaf · 8fedaaf
1 parent 8e2fa9e
commit 8fedaaf
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/epi_judge_cpp/test_framework/generic_test.h b/epi_judge_cpp/test_framework/generic_test.h
@@ -72,10 +72,10 @@ void UpdateTestPassed(std::string test_file, int tests_passed) {
   buffer << problem_mapping_file_data.rdbuf();
   std::string err;
   std::string js_file_str = buffer.str();
-  const std::string kJsBeginPattern = "run(";
+  const std::string kJsBeginPattern = "problem_mapping = ";
   js_file_str.replace(js_file_str.find(kJsBeginPattern),
                       kJsBeginPattern.size(), "");
-  const std::string kJsEndPattern = ");";
+  const std::string kJsEndPattern = "};";
   js_file_str.replace(js_file_str.find(kJsEndPattern), kJsEndPattern.size(),
                       "");
   json chapter_to_problem_to_language_solution_mapping =

diff --git a/epi_judge_cpp_solutions/test_framework/generic_test.h b/epi_judge_cpp_solutions/test_framework/generic_test.h
@@ -72,10 +72,10 @@ void UpdateTestPassed(std::string test_file, int tests_passed) {
   buffer << problem_mapping_file_data.rdbuf();
   std::string err;
   std::string js_file_str = buffer.str();
-  const std::string kJsBeginPattern = "run(";
+  const std::string kJsBeginPattern = "problem_mapping = ";
   js_file_str.replace(js_file_str.find(kJsBeginPattern),
                       kJsBeginPattern.size(), "");
-  const std::string kJsEndPattern = ");";
+  const std::string kJsEndPattern = "};";
   js_file_str.replace(js_file_str.find(kJsEndPattern), kJsEndPattern.size(),
                       "");
   json chapter_to_problem_to_language_solution_mapping =

diff --git a/epi_judge_java/epi/test_framework/GenericTest.java b/epi_judge_java/epi/test_framework/GenericTest.java
@@ -174,8 +174,8 @@ private static void updateTestPassed(String testFile, int testsPassed) {
     Path problemMappingFilePath =
         Paths.get(TestUtils.getFilePathInJudgeDir("problem_mapping.js"));
     JsonValue chapterToProblemToLanguageSolutionMapping = null;
-    final String JS_BEGIN_PATTERN = "run(";
-    final String JS_END_PATTERN = ");";
+    final String JS_BEGIN_PATTERN = "problem_mapping = ";
+    final String JS_END_PATTERN = ";";
     try {
       String jsFileStr = new String(Files.readAllBytes(problemMappingFilePath));
       jsFileStr =

diff --git a/epi_judge_java_solutions/epi/test_framework/GenericTest.java b/epi_judge_java_solutions/epi/test_framework/GenericTest.java
@@ -174,8 +174,8 @@ private static void updateTestPassed(String testFile, int testsPassed) {
     Path problemMappingFilePath =
         Paths.get(TestUtils.getFilePathInJudgeDir("problem_mapping.js"));
     JsonValue chapterToProblemToLanguageSolutionMapping = null;
-    final String JS_BEGIN_PATTERN = "run(";
-    final String JS_END_PATTERN = ");";
+    final String JS_BEGIN_PATTERN = "problem_mapping = ";
+    final String JS_END_PATTERN = ";";
     try {
       String jsFileStr = new String(Files.readAllBytes(problemMappingFilePath));
       jsFileStr =

diff --git a/epi_judge_python/test_framework/generic_test.py b/epi_judge_python/test_framework/generic_test.py
@@ -138,7 +138,7 @@ def run_tests(handler, config, res_printer):
 def update_test_passed(test_file, tests_passed):
     problem_mapping_file_path = get_file_path_in_judge_dir(
         'problem_mapping.js')
-    js_begin_pattern, js_end_pattern = 'run(', ');'
+    js_begin_pattern, js_end_pattern = 'problem_mapping = ', ';'
     with open(problem_mapping_file_path) as problem_mapping_file:
         chapter_to_problem_to_language_solution_mapping = json.loads(
             problem_mapping_file.read().replace(js_begin_pattern, '').replace(

diff --git a/epi_judge_python_solutions/test_framework/generic_test.py b/epi_judge_python_solutions/test_framework/generic_test.py
@@ -138,7 +138,7 @@ def run_tests(handler, config, res_printer):
 def update_test_passed(test_file, tests_passed):
     problem_mapping_file_path = get_file_path_in_judge_dir(
         'problem_mapping.js')
-    js_begin_pattern, js_end_pattern = 'run(', ');'
+    js_begin_pattern, js_end_pattern = 'problem_mapping = ', ';'
     with open(problem_mapping_file_path) as problem_mapping_file:
         chapter_to_problem_to_language_solution_mapping = json.loads(
             problem_mapping_file.read().replace(js_begin_pattern, '').replace(

diff --git a/epijudge_ci_test_tool.py b/epijudge_ci_test_tool.py
@@ -113,7 +113,7 @@ def check_judge(dir: str, lang: str, mode: str):
 
     for i, f in enumerate(files):
         print(f"[{i + 1}/{len(files)}] {f}")
-        execute_program(['python3', str(f)], mode)
+        execute_program([sys.executable, str(f)], mode)
     print('Success')