From 9c55891521d7fccadfa7fae5f37c765429226093 Mon Sep 17 00:00:00 2001 From: brianc Date: Wed, 6 Oct 2010 21:34:51 -0500 Subject: [PATCH] test tweaks --- test/communication-tests.js | 12 ++++++++++++ test/parser-tests.js | 6 ++---- test/test-helper.js | 6 +++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/test/communication-tests.js b/test/communication-tests.js index 962e0ca7..0859001e 100644 --- a/test/communication-tests.js +++ b/test/communication-tests.js @@ -1,4 +1,5 @@ require(__dirname+'/test-helper'); +var buffers = require(__dirname+'/test-buffers'); test('client can take existing stream', function() { var stream = new MemoryStream(); @@ -44,3 +45,14 @@ test('using opened stream', function() { client.connect(); }); }); + +test('query queue', function() { + var stream = new MemoryStream(); + stream.readyState = 'open'; + var client = new Client({stream: stream}); + client.query('select * from bang'); + assert.empty(stream.packets); + + stream.emit('data', buffers.ReadyForQuery); + assert.equal(stream.packets.length, 1); +}); diff --git a/test/parser-tests.js b/test/parser-tests.js index 1d974ac7..21f0bf5a 100644 --- a/test/parser-tests.js +++ b/test/parser-tests.js @@ -1,5 +1,5 @@ require(__dirname+'/test-helper'); - +var buffers = require(__dirname+'/test-buffers'); var PARSE = function(buffer) { return new Parser(buffer).parse(); }; @@ -18,9 +18,7 @@ var backendKeyDataBuffer = new BufferList() .addInt32(2) .join(true,'K'); -var readyForQueryBuffer = new BufferList() - .add(Buffer('I')) - .join(true,'Z'); +var readyForQueryBuffer = buffers.readyForQuery; var commandCompleteBuffer = new BufferList() .addCString("SELECT 3") diff --git a/test/test-helper.js b/test/test-helper.js index 1dab50a5..68e50557 100644 --- a/test/test-helper.js +++ b/test/test-helper.js @@ -10,6 +10,10 @@ assert.same = function(actual, expected) { } }; +assert.empty = function(actual) { + assert.equal(actual.length, 0); +}; + test = function(name, action) { for(var i = 0; i < test.tabout; i++) { @@ -97,9 +101,9 @@ BufferList.concat = function() { MemoryStream = function() { EventEmitter.call(this); + this.packets = []; }; sys.inherits(MemoryStream, EventEmitter); var p = MemoryStream.prototype; -