fix unit test error

mrrtree · Oct 20, 2015 · 3a9e7cb · 3a9e7cb
1 parent 9c69634
commit 3a9e7cb
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 13 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -6,10 +6,9 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
-  //var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  //'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js', */'test/util/*.js', 'test/*.js'];
-  var src = [
-  'test/remote/*.js'];
+  var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
+  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js'/*, 'test/*.js'*/];
+
 
   // Project configuration.
   grunt.initConfig({

diff --git a/test/mock-base/app/mockApplication.js b/test/mock-base/app/mockApplication.js
@@ -20,4 +20,31 @@ Application.get = function(setting){
   return this.settings[setting];
 }
 
+Application.getServersByType = function(serverType) {
+  return this.serverTypeMaps[serverType];
+};
 
+Application.replaceServers = function(servers) {
+  if(!servers) {
+    return;
+  }
+
+  this.servers = servers;
+  this.serverTypeMaps = {};
+  this.serverTypes = [];
+  var serverArray = [];
+  for(var id in servers) {
+    var server = servers[id];
+    var serverType = server['serverType'];
+    var slist = this.serverTypeMaps[serverType];
+    if(!slist) {
+      this.serverTypeMaps[serverType] = slist = [];
+    }
+    this.serverTypeMaps[serverType].push(server);
+    // update global server type list
+    if(this.serverTypes.indexOf(serverType) < 0) {
+      this.serverTypes.push(serverType);
+    }
+    serverArray.push(server);
+  }
+};
diff --git a/test/service/channel.js b/test/service/channel.js
@@ -1,6 +1,7 @@
 var should = require('should');
 var pomelo = require('../../');
 var ChannelService = require('../../lib/common/service/channelService');
+var app = require('../mock-base/app/mockApplication.js');
 
 var mockBase = process.cwd() + '/test';
 var channelName = 'test_channel';
@@ -130,7 +131,7 @@ describe('channel test', function() {
         cb();
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -157,4 +158,4 @@ describe('channel test', function() {
       });
     });
   });
-});
+});
diff --git a/test/service/channelService.js b/test/service/channelService.js
@@ -1,6 +1,7 @@
 var should = require('should');
-var pomelo = require('../../');
+//var pomelo = require('../../');
 var ChannelService = require('../../lib/common/service/channelService');
+var app = require('../mock-base/app/mockApplication.js');
 
 var channelName = 'test_channel';
 var mockBase = process.cwd() + '/test';
@@ -95,7 +96,7 @@ describe('channel manager test', function() {
         cb();
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -105,9 +106,13 @@ describe('channel manager test', function() {
       });
     });
 
+var channelName = 'test_channel';
+var mockBase = process.cwd() + '/test';
+var mockApp = {serverId: 'test-server-1'};
+
     it('should return an err if uids is empty', function(done) {
       var mockMsg = {key: 'some remote message'};
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       var channelService = new ChannelService(app);
 
       channelService.pushMessageByUids(mockMsg, null, function(err) {
@@ -138,7 +143,7 @@ describe('channel manager test', function() {
         cb(new Error('[TestMockError] mock rpc error'));
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -173,7 +178,7 @@ describe('channel manager test', function() {
         }
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -223,9 +228,9 @@ describe('channel manager test', function() {
         cb();
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
-      app.addServers(mockServers);
+      app.replaceServers(mockServers);
       var channelService = new ChannelService(app);
 
       channelService.broadcast(mockSType, mockRoute, mockMsg,