From 08c3aae00764b82cdcde4e127749d8c51a034711 Mon Sep 17 00:00:00 2001
From: murgatroid99 <michael.lumish@gmail.com>
Date: Tue, 27 Jan 2015 09:18:30 -0800
Subject: [PATCH] Finished fixing the tests

---
 test/client_server_test.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/client_server_test.js b/test/client_server_test.js
index 62283240..9e1b2a79 100644
--- a/test/client_server_test.js
+++ b/test/client_server_test.js
@@ -99,6 +99,7 @@ function stringSerialize(value) {
  * @return {string} The string value of the buffer
  */
 function stringDeserialize(buffer) {
+  return buffer.toString();
 }
 
 describe('echo client', function() {
@@ -130,10 +131,14 @@ describe('echo client', function() {
     stream.end();
     var index = 0;
     stream.on('data', function(chunk) {
-      assert.equal(messages[index], chunk.toString());
+      assert.equal(messages[index], chunk);
       index += 1;
     });
+    stream.on('status', function(status) {
+      assert.equal(status.code, client.status.OK);
+    });
     stream.on('end', function() {
+      assert.equal(index, messages.length);
       done();
     });
   });
@@ -214,11 +219,14 @@ describe('secure echo client', function() {
     stream.end();
     var index = 0;
     stream.on('data', function(chunk) {
-      assert.equal(messages[index], chunk.toString());
+      assert.equal(messages[index], chunk);
       index += 1;
     });
+    stream.on('status', function(status) {
+      assert.equal(status.code, client.status.OK);
+    });
     stream.on('end', function() {
-      server.shutdown();
+      assert.equal(index, messages.length);
       done();
     });
   });