Rewrite readStdin()

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

lib/commands/test.js

@@ -49,12 +49,7 @@ function prettyLine(actual, expected, key) {
   log.info('    ' + h.prettyText(line, ok));
 }
 
-cmd.handler = function(argv) {
-  var testcase = argv.testcase;
-  if (argv.i) {
-    testcase = h.readStdin();
-  }
-
+function runTest(argv) {
   // use the 1st section in filename as keyword
   // e.g. two-sum.cpp, or two-sum.78502271.ac.cpp
   var keyword = h.getFilename(argv.filename).split('.')[0];
@@ -65,8 +60,8 @@ cmd.handler = function(argv) {
     if (!problem.testable)
       return log.fail('not testable? please submit directly!');
 
-    if (testcase)
-      problem.testcase = testcase.replace(/\\n/g, '\n');
+    if (argv.testcase)
+      problem.testcase = argv.testcase.replace(/\\n/g, '\n');
 
     if (!problem.testcase)
       return log.fail('missing testcase?');
@@ -91,6 +86,18 @@ cmd.handler = function(argv) {
       }
     });
   });
+}
+
+cmd.handler = function(argv) {
+  if (!argv.i)
+    return runTest(argv);
+
+  h.readStdin(function(e, data) {
+    if (e) return log.fail(e);
+
+    argv.testcase = data;
+    return runTest(argv);
+  });
 };
 
 module.exports = cmd;

lib/helper.js

@@ -124,9 +124,18 @@ h.getConfigFile = function() {
   return this.getHomeDir() + '/.lcconfig';
 };
 
-h.readStdin = function() {
-  // FIXME: not work for win32
-  return fs.readFileSync('/dev/stdin').toString();
+h.readStdin = function(cb) {
+  var stdin = process.stdin;
+  var bufs = [];
+
+  stdin.on('readable', function() {
+    var data = stdin.read();
+    if (data) bufs.push(data);
+  });
+  stdin.on('end', function() {
+    cb(null, Buffer.concat(bufs).toString());
+  });
+  stdin.on('error', cb);
 };
 
 h.getSetCookieValue = function(resp, key) {

test/test_helper.js

@@ -144,10 +144,34 @@ describe('helper', function() {
           'key2=value2; path=/; Httponly']
         }
       };
+      var respNoSetCookie = {
+        headers: {}
+      };
 
       assert.equal(h.getSetCookieValue(resp, 'key1'), 'value1');
       assert.equal(h.getSetCookieValue(resp, 'key2'), 'value2');
       assert.equal(h.getSetCookieValue(resp, 'key3'), null);
+      assert.equal(h.getSetCookieValue(respNoSetCookie, 'key1'), null);
     });
   }); // #getSetCookieValue
+
+  describe('#readStdin', function() {
+    function hijackStdin(data) {
+      var stream = require('stream');
+      var rs = new stream.Readable();
+      rs.push(data);
+      rs.push(null);
+
+      Object.defineProperty(process, 'stdin', {value: rs});
+    }
+
+    it('should ok', function(done) {
+      hijackStdin('[1,2]\n3');
+
+      h.readStdin(function(e, data) {
+        assert.equal(data, '[1,2]\n3');
+        done();
+      });
+    });
+  }); // #readStdin
 });