removed un-necessary parameter of mock client APIs

samzh72 · May 20, 2019 · a922c3d · a922c3d
1 parent b980a07
commit a922c3d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@samzh72/httpunit",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "programable http server for micro-service unit testing",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/index.js b/src/index.js
@@ -6,27 +6,37 @@
     let bodyParser = require('body-parser');
 
     let mockServer, proxyServer;
+    let mockOptions;
+    let proxyOptions;
 
     module.exports.serve = function (options) {
         logger.configure(options.logOptions);
         logger.info('httpunit: programable http server');
 
         if (options.mockOptions) {
+            mockOptions = JSON.parse(JSON.stringify(options.mockOptions));
+            if (!mockOptions.host) {
+                mockOptions.host = 'localhost';
+            }
             let app = express();
             app.use(bodyParser.json({ limit: '50mb' }));
             app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
             mock.serve(app);
-            mockServer = app.listen(options.mockOptions.port, options.mockOptions.host);
-            logger.info('mock server listen on:' + options.mockOptions.port);
+            mockServer = app.listen(mockOptions.port, mockOptions.host);
+            logger.info('mock server listen on:' + mockOptions.port);
         }
 
         if (options.proxyOptions) {
+            proxyOptions = JSON.parse(JSON.stringify(options.proxyOptions));
+            if (!proxyOptions.host) {
+                proxyOptions.host = 'localhost';
+            }
             let app = express();
             app.use(bodyParser.json({ limit: '50mb' }));
             app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
             proxy.serve(app);
-            proxyServer = app.listen(options.proxyOptions.port, options.proxyOptions.host);
-            logger.info('proxy server listen on:' + options.proxyOptions.port);
+            proxyServer = app.listen(proxyOptions.port, proxyOptions.host);
+            logger.info('proxy server listen on:' + proxyOptions.port);
         }
     }
 
@@ -41,7 +51,28 @@
         }
     }
 
-    module.exports.createServer = mock.createServer;
-    module.exports.deleteServer = mock.deleteServer;
-    module.exports.installHandler = mock.installHandler;
+    module.exports.mockCreateServer = function (port, host) {
+        if (!mockOptions) {
+            logger.error('mock server is not launched');
+        }
+        else {
+            return mock.createServer(mockOptions.port, mockOptions.host, port, host);
+        }
+    }
+    module.exports.mockDeleteServer = function (serverId) {
+        if (!mockOptions) {
+            logger.error('mock server is not launched');
+        }
+        else {
+            return mock.deleteServer(mockOptions.port, mockOptions.host, serverId);
+        }
+    }
+    module.exports.mockInstallHandler = function (serverId, response) {
+        if (!mockOptions) {
+            logger.error('mock server is not launched');
+        }
+        else {
+            return mock.installHandler(mockOptions.port, mockOptions.host, serverId, response);
+        }
+    }
 }())
diff --git a/test/mock/handlers.test.js b/test/mock/handlers.test.js
@@ -2,7 +2,7 @@
     const assert = require('assert');
     const rp = require('request-promise');
     const config = require('config');
-    const mock = require('../../src/mock');
+    const hu = require('../../src');
 
     const mockPort = config.mockOptions.port;
     const SERVER_PORT = 9000;
@@ -44,7 +44,7 @@
     ]
 
     function testHandler(routePath, method, requestPath, response, verifyRes, verifyErr) {
-        mock.installHandler(mockPort, 'localhost', serverId, {
+        hu.mockInstallHandler(serverId, {
             path: routePath,
             method: method,
             response: response
@@ -73,7 +73,7 @@
 
     describe('handler API', () => {
         before(done => {
-            mock.createServer(mockPort, 'localhost', SERVER_PORT)
+            hu.mockCreateServer(SERVER_PORT)
                 .then(sid => {
                     serverId = sid;
                     assert(serverId);
@@ -86,7 +86,7 @@
         });
 
         after(done => {
-            mock.deleteServer(mockPort, 'localhost', serverId)
+            hu.mockDeleteServer(serverId)
                 .then(() => {
                     done();
                 })

diff --git a/test/mock/servers.test.js b/test/mock/servers.test.js
@@ -2,14 +2,14 @@
     const assert = require('assert');
     const rp = require('request-promise');
     const config = require('config');
-    const mock = require('../../src/mock');
+    const hu = require('../../src');
 
     const mockPort = config.mockOptions.port;
     let serverId_9000, serverId_9001;
 
     describe('servers API - create server', () => {
         it('create server - with port only', done => {
-            mock.createServer(mockPort, 'localhost', 9000)
+            hu.mockCreateServer(9000)
                 .then(serverId => {
                     assert(serverId);
                     serverId_9000 = serverId;
@@ -21,7 +21,7 @@
                 })
         })
         it('create server - with port and host', done => {
-            mock.createServer(mockPort, 'localhost', 9001)
+            hu.mockCreateServer(9001)
                 .then(serverId => {
                     assert(serverId);
                     serverId_9001 = serverId;
@@ -33,7 +33,7 @@
                 })
         })
         it('create server - with nothing', done => {
-            mock.createServer(mockPort, 'localhost', undefined)
+            hu.mockCreateServer(undefined)
                 .then(serverId => {
                     done(new Error('unexpected createServer success'));
                 })
@@ -45,7 +45,7 @@
 
     describe('servers API - delete server', () => {
         it('delete server 9000', done => {
-            mock.deleteServer(mockPort, 'localhost', serverId_9000)
+            hu.mockDeleteServer(serverId_9000)
                 .then(() => {
                     done();
                 })
@@ -55,7 +55,7 @@
         });
 
         it('delete server 9001', done => {
-            mock.deleteServer(mockPort, 'localhost', serverId_9001)
+            hu.mockDeleteServer(serverId_9001)
                 .then(() => {
                     done();
                 })
@@ -65,7 +65,7 @@
         });
 
         it('delete server which not exist', done => {
-            mock.deleteServer(mockPort, 'localhost', 00000000)
+            hu.mockDeleteServer(00000000)
                 .then(() => {
                     done(new Error('unexpected deleteServer success'));
                 })