move out parseJson for testing

ShMcK · ShMcK · commit ef122d30e657 · 2016-03-25T09:30:31.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .cache
 test/__pycache__
 report.json
+node_modules
diff --git a/lib/create-runner.js b/lib/create-runner.js
@@ -27,6 +27,7 @@ function createRunner(config, testFile) {
         'py.test',
         '--json=report.json',
         '-x',
+        'tb=no',
         testFile
     ], options);
 }
diff --git a/lib/parse-json.js b/lib/parse-json.js
@@ -0,0 +1,45 @@
+"use strict";
+var final = null;
+var testNumber = /::Test([0-9]+)/;
+var testMessage = /::test_(.+)$/;
+function formatFailureMessage(message) {
+    return message.split('_').join(' ');
+}
+function parseJson(pathToResults) {
+    var result = JSON.parse(require(pathToResults));
+    if (!result.report || !result.report.tests.length) {
+        console.log('error with test output in report.json');
+        return;
+    }
+    var finalTest = result.report.tests[0];
+    var taskPosition = parseInt(finalTest.name.match(testNumber)[1], 10);
+    if (!taskPosition) {
+        console.log('Error with test. There is no valid task number in the Test class title');
+        return;
+    }
+    if (finalTest.outcome === 'passed') {
+        final = {
+            completed: true,
+            msg: 'Task ${taskPosition} Complete',
+            taskPosition: taskPosition + 1
+        };
+    }
+    else if (finalTest.outcome === 'failed') {
+        var message = finalTest.name.match(testMessage)[1];
+        if (!message) {
+            console.log('Error with test. There is no valid test message');
+            message = '';
+        }
+        final = {
+            completed: false,
+            msg: formatFailureMessage(message),
+            taskPosition: taskPosition,
+            timedOut: false
+        };
+    }
+    else {
+        console.log('error processing result: ', result);
+    }
+    return final;
+}
+exports.parseJson = parseJson;
diff --git a/lib/runner.js b/lib/runner.js
@@ -2,10 +2,8 @@
 var path = require('path');
 var exists_1 = require('./exists');
 var create_runner_1 = require('./create-runner');
+var parse_json_1 = require('./parse-json');
 var pathToResults = path.resolve(__dirname, '', 'report.json');
-function formatFailureMessage(message) {
-    return message.split('_').join(' ');
-}
 function runner(testFile, config, handleResult) {
     var runner = create_runner_1.createRunner(config, testFile);
     var final = null;
@@ -17,40 +15,7 @@ function runner(testFile, config, handleResult) {
                 console.log('error finding test output file: ', data);
                 return;
             }
-            var result = JSON.parse(require(pathToResults));
-            if (!result.report || !result.report.tests.length) {
-                console.log('error with test output in report.json');
-                return;
-            }
-            var finalTest = result.report.tests[0];
-            var taskPosition = parseInt(finalTest.name.match(/::Test([0-9]+)/)[1], 10);
-            if (!taskPosition) {
-                console.log('Error with test. There is no valid task number in the Test class title');
-                return;
-            }
-            if (finalTest.outcome === 'passed') {
-                final = {
-                    completed: true,
-                    msg: 'Task ${taskPosition} Complete',
-                    taskPosition: taskPosition + 1
-                };
-            }
-            else if (finalTest.outcome === 'failed') {
-                var message = finalTest.name.match(/::test_(.+)$/)[1];
-                if (!message) {
-                    console.log('Error with test. There is no valid test message');
-                    message = '';
-                }
-                final = {
-                    completed: false,
-                    msg: formatFailureMessage(message),
-                    taskPosition: taskPosition,
-                    timedOut: false
-                };
-            }
-            else {
-                console.log('error processing result: ', result);
-            }
+            final = parse_json_1.parseJson(pathToResults);
             final.change = final.taskPosition - config.taskPosition;
             final.pass = final.change > 0;
             handleResult(final);
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "pytest test runner & reporter for atom-coderoad",
   "main": "lib/runner.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "ava"
   },
   "repository": {
     "type": "git",
@@ -25,5 +25,8 @@
   "bugs": {
     "url": "https://github.com/coderoad/pytest-coderoad/issues"
   },
-  "homepage": "https://github.com/coderoad/pytest-coderoad#readme"
+  "homepage": "https://github.com/coderoad/pytest-coderoad#readme",
+  "devDependencies": {
+    "ava": "^0.13.0"
+  }
 }
diff --git a/src/create-runner.ts b/src/create-runner.ts
@@ -30,6 +30,7 @@ export function createRunner(config: CR.Config, testFile: string) {
     'py.test',
     '--json=report.json',
     '-x', // stop after first failure
+    'tb=no', // no printing traceback to console
     testFile
   ], options);
 }
diff --git a/src/parse-json.ts b/src/parse-json.ts
@@ -0,0 +1,60 @@
+let final = null;
+const testNumber = /::Test([0-9]+)/;
+const testMessage = /::test_(.+)$/;
+
+interface ParseFinal {
+  complete: boolean;
+  msg: string;
+  taskPosition: number;
+  timedOut?: boolean;
+}
+
+function formatFailureMessage(message: string): string {
+  return message.split('_').join(' ');
+}
+
+export function parseJson(pathToResults: string): ParseFinal {
+  let result = JSON.parse(require(pathToResults));
+  if (!result.report || !result.report.tests.length) {
+    console.log('error with test output in report.json');
+    return;
+  }
+
+  let finalTest = result.report.tests[0];
+  let taskPosition: number = parseInt(finalTest.name.match(testNumber)[1], 10);
+
+  if (!taskPosition) {
+    console.log('Error with test. There is no valid task number in the Test class title');
+    return;
+  }
+
+  if (finalTest.outcome === 'passed') {
+    // pass
+    final = {
+      completed: true,
+      msg: 'Task ${taskPosition} Complete',
+      taskPosition: taskPosition + 1
+    };
+  } else if (finalTest.outcome === 'failed') {
+    // fail: return first failure
+
+    // failure message
+    let message: string = finalTest.name.match(testMessage)[1];
+    if (!message) {
+      console.log('Error with test. There is no valid test message');
+      message = '';
+    }
+
+    final = {
+      completed: false,
+      msg: formatFailureMessage(message),
+      taskPosition,
+      timedOut: false // TODO
+    };
+
+  } else {
+    console.log('error processing result: ', result);
+  }
+
+  return final;
+}
diff --git a/src/runner.ts b/src/runner.ts
@@ -1,13 +1,10 @@
 import * as path from 'path';
 import exists from './exists';
 import {createRunner} from './create-runner';
+import {parseJson} from './parse-json';
 
 const pathToResults = path.resolve(__dirname, '', 'report.json');
 
-function formatFailureMessage(message: string) {
-  return message.split('_').join(' ');
-}
-
 export default function runner(testFile: string, config: CR.Config,
   handleResult: (result) => CR.TestResult) {
 
@@ -28,48 +25,7 @@ export default function runner(testFile: string, config: CR.Config,
         return;
       }
 
-      let result = JSON.parse(require(pathToResults));
-      if (!result.report || !result.report.tests.length) {
-        console.log('error with test output in report.json');
-        return;
-      }
-
-      let finalTest = result.report.tests[0];
-
-      let taskPosition: number = parseInt(finalTest.name.match(/::Test([0-9]+)/)[1], 10);
-      if (!taskPosition) {
-        console.log('Error with test. There is no valid task number in the Test class title');
-        return;
-      }
-
-      if (finalTest.outcome === 'passed') {
-        // pass
-        final = {
-          completed: true,
-          msg: 'Task ${taskPosition} Complete',
-          taskPosition: taskPosition + 1
-        };
-      } else if (finalTest.outcome === 'failed') {
-        // fail: return first failure
-
-        // failure message
-        let message: string = finalTest.name.match(/::test_(.+)$/)[1];
-        if (!message) {
-          console.log('Error with test. There is no valid test message');
-          message = '';
-        }
-
-        final = {
-          completed: false,
-          msg: formatFailureMessage(message),
-          taskPosition,
-          timedOut: false // TODO
-        };
-
-      } else {
-        console.log('error processing result: ', result);
-      }
-
+      final = parseJson(pathToResults);
       final.change = final.taskPosition - config.taskPosition;
       final.pass = final.change > 0;
 
diff --git a/test/runner.spec.js b/test/runner.spec.js
@@ -0,0 +1 @@
+import test from 'ava';
diff --git a/tsconfig.json b/tsconfig.json
@@ -17,6 +17,7 @@
   "files": [
     "src/create-runner.ts",
     "src/exists.ts",
+    "src/parse-json.ts",
     "src/runner.ts",
     "src/typings/cr/cr.d.ts",
     "src/typings/cr/globals.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ function createRunner(config, testFile) {`
`27`	`27`	`'py.test',`
`28`	`28`	`'--json=report.json',`
`29`	`29`	`'-x',`
	`30`	`+ 'tb=no',`
`30`	`31`	`testFile`
`31`	`32`	`], options);`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export function createRunner(config: CR.Config, testFile: string) {`
`30`	`30`	`'py.test',`
`31`	`31`	`'--json=report.json',`
`32`	`32`	`'-x', // stop after first failure`
	`33`	`+ 'tb=no', // no printing traceback to console`
`33`	`34`	`testFile`
`34`	`35`	`], options);`
`35`	`36`	`}`