Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4f2299c

Browse files
committed
fix: remove interpret_expected_id task
1 parent df69a65 commit 4f2299c

File tree

4 files changed

+15
-34
lines changed

4 files changed

+15
-34
lines changed

lib/commands/session.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
'use strict';
2-
var prompt = require('prompt');
32

43
var h = require('../helper');
54
var chalk = require('../chalk');

lib/commands/test.js

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
2-
var _ = require('underscore');
32
var lodash = require('lodash');
4-
var util = require('util');
53

64
var h = require('../helper');
75
var file = require('../file');
@@ -78,23 +76,19 @@ function runTest(argv) {
7876
core.testProblem(problem, function(e, results) {
7977
if (e) return log.fail(e);
8078

81-
results = _.sortBy(results, x => x.type);
82-
if (results[0].state === 'Accepted')
83-
results[0].state = 'Finished';
84-
printResult(results[0], null, 'state');
85-
printResult(results[0], null, 'error');
86-
87-
results[0].your_input = problem.testcase;
88-
results[0].output = results[0].answer;
89-
// LeetCode-CN returns the actual and expected answer into two separate responses
90-
if (results[1]) {
91-
results[0].expected_answer = results[1].answer;
92-
}
93-
results[0].stdout = results[0].stdout.slice(1, -1).replace(/\\n/g, '\n');
94-
printResult(results[0], null, 'your_input');
95-
printResult(results[0], results[0].runtime, 'output');
96-
printResult(results[0], null, 'expected_answer');
97-
printResult(results[0], null, 'stdout');
79+
const result = results[0];
80+
if (result.state === 'Accepted')
81+
result.state = 'Finished';
82+
printResult(result, null, 'state');
83+
printResult(result, null, 'error');
84+
85+
result.your_input = problem.testcase;
86+
result.output = result.answer;
87+
result.stdout = result.stdout.slice(1, -1).replace(/\\n/g, '\n');
88+
printResult(result, null, 'your_input');
89+
printResult(result, result.runtime, 'output');
90+
printResult(result, null, 'expected_answer');
91+
printResult(result, null, 'stdout');
9892
});
9993
});
10094
}

lib/plugins/leetcode.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,8 @@ plugin.testProblem = function(problem, cb) {
292292
runCode(opts, problem, function(e, task) {
293293
if (e) return cb(e);
294294

295-
const tasks = [
296-
{type: 'Actual', id: task.interpret_id},
297-
];
295+
const tasks = [{type: 'Actual', id: task.interpret_id}];
298296

299-
// Used by LeetCode-CN
300-
if (task.interpret_expected_id) {
301-
tasks.push({type: 'Expected', id: task.interpret_expected_id});
302-
}
303297
const q = new Queue(tasks, {opts: opts, results: []}, verifyResult);
304298
q.run(null, function(e, ctx) {
305299
return cb(e, ctx.results);

test/plugins/test_leetcode.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,7 @@ describe('plugin:leetcode', function() {
405405
it('should ok', function(done) {
406406
nock('https://leetcode.com')
407407
.post('/problems/find-the-difference/interpret_solution/')
408-
.reply(200, '{"interpret_expected_id": "id1", "interpret_id": "id2"}');
409-
410-
nock('https://leetcode.com')
411-
.get('/submissions/detail/id1/check/')
412-
.reply(200, '{"state": "SUCCESS", "run_success": true, "status_msg": "Accepted", "submission_id": "interpret_expected_id1"}');
408+
.reply(200, '{"interpret_id": "id2"}');
413409

414410
nock('https://leetcode.com')
415411
.get('/submissions/detail/id2/check/')
@@ -419,8 +415,6 @@ describe('plugin:leetcode', function() {
419415
assert.equal(e, null);
420416
assert.equal(results[0].id, 'id2');
421417
assert.equal(results[0].ok, false);
422-
assert.equal(results[1].id, 'id1');
423-
assert.equal(results[1].ok, true);
424418
done();
425419
});
426420
});

0 commit comments

Comments
 (0)