test-debugger-repl improvements

diff --git a/test/fixtures/breakpoints.js b/test/fixtures/breakpoints.js
new file mode 100644 (file)
index 0000000..ec6c526
--- /dev/null
+++ b/test/fixtures/breakpoints.js
@@ -0,0 +1,16 @@
+// wrapper line
+debugger;
+debugger;
+function a(x) {
+  var i = 10;
+  while (--i != 0);
+  debugger;
+  return i;
+};
+function b() {
+  return ['hello', 'world'].join(' ');
+};
+a();
+a(1);
+b();
+b();

diff --git a/test/simple/test-debugger-repl.js b/test/simple/test-debugger-repl.js
index 1897f28..9d96993 100644 (file)
--- a/test/simple/test-debugger-repl.js
+++ b/test/simple/test-debugger-repl.js
@@ -25,28 +25,12 @@ var assert = require('assert');
 var spawn = require('child_process').spawn;
 var debug = require('_debugger');
 
-var code = [
-  '',
-  'debugger;',
-  'debugger;',
-  'function a(x) {',
-  '  var i = 10;',
-  '  while (--i != 0);',
-  '  debugger;',
-  '  return i;',
-  '}',
-  'function b() {',
-  '  return ["hello", "world"].join(" ");',
-  '}',
-  'a()',
-  'a(1)',
-  'b()',
-  'b()'
-].join('\n');
+var code = require('fs').readFileSync(common.fixturesDir + '/breakpoints.js');
 
 var child = spawn(process.execPath, ['debug', '-e', code]);
 
 var buffer = '';
+child.stdout.setEncoding('utf-8');
 child.stdout.on('data', function(data) {
   data = (buffer + data.toString()).split(/\n/g);
   buffer = data.pop();
@@ -102,10 +86,10 @@ addTest(null, [
 addTest('n', [
   "debug> debug> debug> break in [unnamed]:13",
   " 11   return [\"hello\", \"world\"].join(\" \");",
-  " 12 }",
-  " 13 a()",
-  " 14 a(1)",
-  " 15 b()"
+  " 12 };",
+  " 13 a();",
+  " 14 a(1);",
+  " 15 b();"
 ]);
 
 // Continue
@@ -115,23 +99,22 @@ addTest('c', [
   "  6   while (--i != 0);",
   "  7   debugger;",
   "  8   return i;",
-  "  9 }"
+  "  9 };"
 ]);
 
 
 // Step out
 addTest('o', [
   "debug> debug> debug> break in [unnamed]:14",
-  " 12 }",
-  " 13 a()",
-  " 14 a(1)",
-  " 15 b()",
-  " 16 b()"
+  " 12 };",
+  " 13 a();",
+  " 14 a(1);",
+  " 15 b();",
+  " 16 b();"
 ]);
 
 
 function finish() {
-  console.log('passed');
   process.exit(0);
 };