From 08d8116f6b518cec8536b13659607906212324eb Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 1 Dec 2010 13:43:05 -0800 Subject: [PATCH] style --- test/simple/test-repl.js | 103 +++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/test/simple/test-repl.js b/test/simple/test-repl.js index b788583ce0..08176039c3 100644 --- a/test/simple/test-repl.js +++ b/test/simple/test-repl.js @@ -41,54 +41,56 @@ function clean_up() { } function error_test() { - // The other stuff is done so reuse unix socket - var read_buffer = ""; - client_unix.removeAllListeners('data'); + // The other stuff is done so reuse unix socket + var read_buffer = ""; + client_unix.removeAllListeners('data'); + + client_unix.addListener('data', function (data) { + read_buffer += data.toString('ascii', 0, data.length); + common.error("Unix data: " + JSON.stringify(read_buffer) + ", expecting " + + (client_unix.expect.exec ? client_unix.expect : + JSON.stringify(client_unix.expect))); + + if (read_buffer.indexOf(prompt_unix) !== -1) { + assert.ok(read_buffer.match(client_unix.expect)); + common.error("match"); + read_buffer = ""; + if (client_unix.list && client_unix.list.length > 0) { + send_expect(client_unix.list); + } else { + common.error("End of Error test, running TCP test."); + tcp_test(); + } - client_unix.addListener('data', function (data) { - read_buffer += data.toString('ascii', 0, data.length); - common.error("Unix data: " + JSON.stringify(read_buffer) + ", expecting " - + (client_unix.expect.exec ? client_unix.expect : JSON.stringify(client_unix.expect))); - if (read_buffer.indexOf(prompt_unix) !== -1) { - assert.ok(read_buffer.match(client_unix.expect)); - common.error("match"); - read_buffer = ""; - if (client_unix.list && client_unix.list.length > 0) { - send_expect(client_unix.list); - } else { - common.error("End of Error test, running TCP test."); - tcp_test(); - } - } - else if(read_buffer === prompt_multiline) { - // Check that you meant to send a multiline test - assert.strictEqual(prompt_multiline, client_unix.expect); - read_buffer = ""; - if (client_unix.list && client_unix.list.length > 0) { - send_expect(client_unix.list); - } else { - common.error("End of Error test, running TCP test.\n"); - tcp_test(); - } - } - else { - common.error("didn't see prompt yet, buffering."); - } - }); + } else if (read_buffer === prompt_multiline) { + // Check that you meant to send a multiline test + assert.strictEqual(prompt_multiline, client_unix.expect); + read_buffer = ""; + if (client_unix.list && client_unix.list.length > 0) { + send_expect(client_unix.list); + } else { + common.error("End of Error test, running TCP test.\n"); + tcp_test(); + } - send_expect([ - // Uncaught error throws and prints out - { client: client_unix, send: "throw new Error('test error');", expect: /^Error: test error/ }, - // Common syntax error is treated as multiline command - { client: client_unix, send: "function test_func() {", expect: prompt_multiline }, - // You can recover with the .break command - { client: client_unix, send: ".break", expect: prompt_unix }, - // Can parse valid JSON - { client: client_unix, send: "JSON.parse('{\"valid\": \"json\"}');", expect: "{ valid: 'json' }"}, - // invalid input to JSON.parse error is special case of syntax error, should throw - { client: client_unix, send: "JSON.parse('{invalid: \\'json\\'}');", - expect: /^SyntaxError: Unexpected token ILLEGAL/ } - ]); + } else { + common.error("didn't see prompt yet, buffering."); + } + }); + + send_expect([ + // Uncaught error throws and prints out + { client: client_unix, send: "throw new Error('test error');", expect: /^Error: test error/ }, + // Common syntax error is treated as multiline command + { client: client_unix, send: "function test_func() {", expect: prompt_multiline }, + // You can recover with the .break command + { client: client_unix, send: ".break", expect: prompt_unix }, + // Can parse valid JSON + { client: client_unix, send: "JSON.parse('{\"valid\": \"json\"}');", expect: "{ valid: 'json' }"}, + // invalid input to JSON.parse error is special case of syntax error, should throw + { client: client_unix, send: "JSON.parse('{invalid: \\'json\\'}');", + expect: /^SyntaxError: Unexpected token ILLEGAL/ } + ]); } function tcp_test() { @@ -131,13 +133,11 @@ function tcp_test() { read_buffer = ""; if (client_tcp.list && client_tcp.list.length > 0) { send_expect(client_tcp.list); - } - else { + } else { common.error("End of TCP test.\n"); clean_up(); } - } - else { + } else { common.error("didn't see prompt yet, buffering"); } }); @@ -195,8 +195,7 @@ function unix_test() { common.error("End of Unix test, running Error test.\n"); process.nextTick(error_test); } - } - else { + } else { common.error("didn't see prompt yet, buffering."); } });