1 files changed, 29 insertions, 27 deletions
diff --git a/src/node/test/server_test.js b/src/node/test/server_test.js
index 61aef4677e..5fad9a5564 100644
--- a/src/node/test/server_test.js
+++ b/src/node/test/server_test.js
@@ -33,7 +33,7 @@
 
 var assert = require('assert');
 var grpc = require('bindings')('grpc.node');
-var Server = require('../server');
+var Server = require('../src/server');
 
 /**
  * This is used for testing functions with multiple asynchronous calls that
@@ -65,44 +65,28 @@ function echoHandler(stream) {
 }
 
 describe('echo server', function() {
-  it('should echo inputs as responses', function(done) {
-    done = multiDone(done, 4);
-    var server = new Server();
+  var server;
+  var channel;
+  before(function() {
+    server = new Server();
     var port_num = server.bind('[::]:0');
     server.register('echo', echoHandler);
     server.start();
 
+    channel = new grpc.Channel('localhost:' + port_num);
+  });
+  it('should echo inputs as responses', function(done) {
+    done = multiDone(done, 4);
+
     var req_text = 'echo test string';
     var status_text = 'OK';
 
-    var channel = new grpc.Channel('localhost:' + port_num);
     var deadline = new Date();
     deadline.setSeconds(deadline.getSeconds() + 3);
     var call = new grpc.Call(channel,
                              'echo',
                              deadline);
-    call.startInvoke(function(event) {
-      assert.strictEqual(event.type,
-                         grpc.completionType.INVOKE_ACCEPTED);
-      call.startWrite(
-          new Buffer(req_text),
-          function(event) {
-            assert.strictEqual(event.type,
-                               grpc.completionType.WRITE_ACCEPTED);
-            assert.strictEqual(event.data, grpc.opError.OK);
-            call.writesDone(function(event) {
-              assert.strictEqual(event.type,
-                                 grpc.completionType.FINISH_ACCEPTED);
-              assert.strictEqual(event.data, grpc.opError.OK);
-              done();
-            });
-          }, 0);
-      call.startRead(function(event) {
-        assert.strictEqual(event.type, grpc.completionType.READ);
-        assert.strictEqual(event.data.toString(), req_text);
-        done();
-      });
-    },function(event) {
+    call.invoke(function(event) {
       assert.strictEqual(event.type,
                          grpc.completionType.CLIENT_METADATA_READ);
       done();
@@ -114,5 +98,23 @@ describe('echo server', function() {
       server.shutdown();
       done();
     }, 0);
+    call.startWrite(
+        new Buffer(req_text),
+        function(event) {
+          assert.strictEqual(event.type,
+                             grpc.completionType.WRITE_ACCEPTED);
+          assert.strictEqual(event.data, grpc.opError.OK);
+          call.writesDone(function(event) {
+            assert.strictEqual(event.type,
+                               grpc.completionType.FINISH_ACCEPTED);
+            assert.strictEqual(event.data, grpc.opError.OK);
+            done();
+          });
+        }, 0);
+    call.startRead(function(event) {
+      assert.strictEqual(event.type, grpc.completionType.READ);
+      assert.strictEqual(event.data.toString(), req_text);
+      done();
+    });
   });
 });