Skip to content

Refactor test & submit output format #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 23, 2019
Merged

Refactor test & submit output format #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e74f4a
Refactor test & submit output format
Vigilans Aug 23, 2019
2e4ecfc
Fix some CI error
Vigilans Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/commands/submit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';
var util = require('util');
var lodash = require('lodash');

var h = require('../helper');
var file = require('../file');
Expand Down Expand Up @@ -29,7 +30,7 @@ function printResult(actual, k) {
const v = actual[k] || '';
const lines = Array.isArray(v) ? v : [v];
for (let line of lines) {
if (k !== 'state') line = k + ': ' + line;
if (k !== 'state') line = lodash.startCase(k) + ': ' + line;
log.info(' ' + h.prettyText(' ' + line, actual.ok));
}
}
Expand Down Expand Up @@ -98,6 +99,7 @@ cmd.handler = function(argv) {
// ratio.toFixed(2), lang);
// });
} else {
result.testcase = result.testcase.slice(1, -1).replace(/\\n/g, '\n');
printResult(result, 'error');
printResult(result, 'testcase');
printResult(result, 'answer');
Expand Down
34 changes: 18 additions & 16 deletions lib/commands/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';
var _ = require('underscore');
var lodash = require('lodash');
var util = require('util');

var h = require('../helper');
var file = require('../file');
Expand Down Expand Up @@ -36,18 +38,18 @@ const cmd = {
}
};

function printResult(actual, expect, k) {
function printResult(actual, extra, k) {
if (!actual.hasOwnProperty(k)) return;
// HACk: leetcode still return 'Accepted' even the answer is wrong!!
const v = actual[k] || '';
if (k === 'state' && v === 'Accepted') return;

let ok = actual.ok;
if (expect && !_.isEqual(actual[k], expect[k])) ok = false;

const lines = Array.isArray(v) ? v : [v];
for (let line of lines) {
if (k !== 'state') line = k + ': ' + line;
const extraInfo = extra ? ` (${extra})` : '';
if (k !== 'state') line = lodash.startCase(k) + extraInfo + ': ' + line;
log.info(' ' + h.prettyText(' ' + line, ok));
}
}
Expand All @@ -73,23 +75,23 @@ function runTest(argv) {
problem.file = argv.filename;
problem.lang = meta.lang;

log.info('\nInput data:');
log.info(problem.testcase);

core.testProblem(problem, function(e, results) {
if (e) return log.fail(e);

results = _.sortBy(results, x => x.type);
for (let i = 0; i < results.length; ++i) {
log.info();
log.info(chalk.yellow(results[i].type));

printResult(results[i], null, 'state');
printResult(results[i], null, 'runtime');
printResult(results[i], results[i + 1], 'answer');
printResult(results[i], results[i + 1], 'stdout');
printResult(results[i], null, 'error');
}
if (results[0].state === 'Accepted')
results[0].state = 'Finished';
printResult(results[0], null, 'state');
printResult(results[0], null, 'error');

results[0].your_input = problem.testcase;
results[0].output = results[0].answer;
results[1].expected = results[1].answer;
results[0].stdout = results[0].stdout.slice(1, -1).replace(/\\n/g, '\n');
printResult(results[0], null, 'your_input');
printResult(results[0], results[0].runtime, 'output');
printResult(results[1], results[1].runtime, 'expected');
printResult(results[0], null, 'stdout');
});
});
}
Expand Down