Merge pull request #11 from vnma0/tcase-parser-fix

Fix parser failed to read test log correctly
vnma0 · Mar 25, 2019 · 7cffe0a · 7cffe0a
2 parents ed09b52 + c20d249
commit 7cffe0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kon",
-  "version": "1.0.0",
+  "version": "1.5.0",
   "description": "Themis wrapper for Wafter",
   "main": "src/server.js",
   "bin": "build/server.js",

diff --git a/src/util/parser.js b/src/util/parser.js
@@ -181,14 +181,14 @@ function parseTestCase(rawTestCase) {
 async function parseLog(filePath) {
     if (!isFile(filePath)) return null;
 
-    const file = await promisify(readFile)(filePath, "utf8");
+    const file = await promisify(readFile)(filePath, "utf-8");
     const { id, problem } = logName2Data(basename(filePath));
 
     const lines = file.split(EOL);
 
     const header = esr(`${id}‣${problem}`);
     const rVerdict = new RegExp(header + ": (.*)", "i");
-    const rScore = new RegExp(header + "‣Test[0-9]{2}: (.*)", "i");
+    const rScore = new RegExp(header + "‣.+?: (.*)", "i");
 
     const findVerdict = lines[0].match(rVerdict);
     const finalScore = Number(findVerdict[1]);
@@ -212,11 +212,13 @@ async function parseLog(filePath) {
         2
     );
 
+    const parsedTestSuite = rawTestSuite.map(parseTestCase);
+
     return {
         id,
         problem,
         finalScore,
-        tests: rawTestSuite.map(parseTestCase)
+        tests: parsedTestSuite
     };
 }