feat: add test case and 支持了mock期望深度匹配

common/lib.js

@@ -18,33 +18,93 @@ function getPluginConfig(name, type) {
   }
 }
 
-module.exports = {
-  /**
+function isObj(object) {  
+  return object && typeof (object) == 'object' && Object.prototype.toString.call(object).toLowerCase() == "[object object]";  
+}  
+
+function isArray(object) {  
+  return object && typeof (object) == 'object' && object.constructor == Array;  
+}  
+
+function getLength(object) {  
+  return Object.keys(object).length; 
+}  
+
+function Compare(objA, objB) {  
+  if (!isObj(objA) && !isObj(objB)){
+    return objA === objB;
+  }
+  if (!isObj(objA) || !isObj(objB)) return false;   
+  if (getLength(objA) != getLength(objB)) return false;   
+  return CompareObj(objA, objB, true);  
+}  
+
+function CompareObj(objA, objB, flag) {  
+  for (var key in objA) {  
+      if (!flag)   
+          break;  
+      if (!objB.hasOwnProperty(key)) { flag = false; break; }  
+      if (!isArray(objA[key])) {   
+          if (objB[key] != objA[key]) { flag = false; break; }  
+      } else {  
+          if (!isArray(objB[key])) { flag = false; break; }  
+          var oA = objA[key], oB = objB[key];  
+          if (oA.length != oB.length) { flag = false; break; }  
+          for (var k in oA) {  
+              if (!flag)   
+                  break;  
+              flag = CompareObj(oA[k], oB[k], flag);  
+          }  
+      }  
+  }  
+  return flag;  
+}  
+
+/**
    * type @string enum[plugin, ext] plugin是外部插件，ext是内部插件
    */
-  initPlugins: function (plugins, type) {
-    if (!plugins) {
-      return [];
-    }
-    if (typeof plugins !== 'object' || !Array.isArray(plugins)) {
-      throw new Error('插件配置有误，请检查', plugins);
-    }
-
-    return plugins.map(item => {
-      let pluginConfig;
-      if (item && typeof item === 'string') {
-        pluginConfig = getPluginConfig(item, type);
-        return Object.assign({}, pluginConfig, { name: item, enable: true })
-      } else if (item && typeof item === 'object') {
-        pluginConfig = getPluginConfig(item.name, type);
-        return Object.assign({},
-          pluginConfig,
-          {
-            name: item.name,
-            options: item.options,
-            enable: item.enable === false ? false : true
-          })
-      }
-    })
+exports.initPlugins = function (plugins, type) {
+  if (!plugins) {
+    return [];
   }
+  if (typeof plugins !== 'object' || !Array.isArray(plugins)) {
+    throw new Error('插件配置有误，请检查', plugins);
+  }
+
+  return plugins.map(item => {
+    let pluginConfig;
+    if (item && typeof item === 'string') {
+      pluginConfig = getPluginConfig(item, type);
+      return Object.assign({}, pluginConfig, { name: item, enable: true })
+    } else if (item && typeof item === 'object') {
+      pluginConfig = getPluginConfig(item.name, type);
+      return Object.assign({},
+        pluginConfig,
+        {
+          name: item.name,
+          options: item.options,
+          enable: item.enable === false ? false : true
+        })
+    }
+  })
+}
+exports.jsonEqual = Compare;
+
+exports.isDeepMatch = function(obj, properties){
+  if(!properties || typeof properties !== 'object'){
+    return false;
+  }
+
+  if(!obj || typeof obj !== 'object'){
+    return true;
+  }
+
+  let match = true;
+  for(var i in properties){
+    if(!Compare(obj[i], properties[i])){
+      match = false;
+      break;
+    }
+  }
+  return match;
 }

exts/yapi-plugin-advanced-mock/server.js

@@ -4,6 +4,8 @@ const caseModel = require('./caseModel.js');
 const yapi = require('yapi.js');
 const mongoose = require('mongoose');
 const _ = require('underscore');
+const path = require('path');
+const lib = require(path.resolve(yapi.WEBROOT, 'common/lib.js' ));
 
 function arrToObj(arr){
   let obj = {};
@@ -44,7 +46,7 @@ module.exports = function(){
     let matchList = [];
     listWithIp.forEach(item=>{
       let params = item.params;
-      if(_.isMatch(reqParams, params)){
+      if(lib.isDeepMatch(reqParams, params)){
         matchList.push(item); 
       }
     })
@@ -55,7 +57,7 @@ module.exports = function(){
       }).select('_id params')
       list.forEach(item=>{
         let params = item.params;
-        if(_.isMatch(reqParams, item.params)){
+        if(lib.isDeepMatch(reqParams, item.params)){
           matchList.push(item); 
         }
       })

test/json-schema-mockjs.test.js

@@ -0,0 +1,204 @@
+import test from 'ava';
+const jsm = require('../common/json-schema-mockjs.js');
+
+test('jsmBase', t=>{
+  let json1 = {
+    "title": "Person",
+    "type": "object",
+    "properties": {
+        "firstName": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "age": {
+            "description": "Age in years",
+            "type": "integer",
+            "minimum": 0
+        }
+    },
+    "required": ["firstName", "lastName"]
+  };
+  t.deepEqual(jsm(json1), {
+    firstName: '@string',
+    lastName: '@string',
+    age: "@integer"
+  });
+})
+
+test('jsmRef', t=>{
+  let json2 = {
+    "$ref": "#/definitions/Pet",
+    "definitions": {
+      "Order": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "petId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "quantity": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "shipDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "status": {
+            "type": "string",
+            "description": "Order Status",
+            "enum": [
+              "placed",
+              "approved",
+              "delivered"
+            ]
+          },
+          "complete": {
+            "type": "boolean",
+            "default": false
+          }
+        },
+        "xml": {
+          "name": "Order"
+        }
+      },
+      "Category": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "xml": {
+          "name": "Category"
+        }
+      },
+      "User": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "username": {
+            "type": "string"
+          },
+          "firstName": {
+            "type": "string"
+          },
+          "lastName": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          },
+          "password": {
+            "type": "string"
+          },
+          "phone": {
+            "type": "string"
+          },
+          "userStatus": {
+            "type": "integer",
+            "format": "int32",
+            "description": "User Status"
+          }
+        },
+        "xml": {
+          "name": "User"
+        }
+      },
+      "Tag": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "xml": {
+          "name": "Tag"
+        }
+      },
+      "Pet": {
+        "type": "object",
+        "required": [
+          "name",
+          "photoUrls"
+        ],
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "category": {
+            "$ref": "#/definitions/Category"
+          },
+          "name": {
+            "type": "string",
+            "example": "doggie"
+          },
+          "photoUrls": {
+            "type": "array",
+            "xml": {
+              "name": "photoUrl",
+              "wrapped": true
+            },
+            "items": {
+              "type": "string"
+            }
+          },
+          "status": {
+            "type": "string",
+            "description": "pet status in the store"
+          }
+        },
+        "xml": {
+          "name": "Pet"
+        }
+      },
+      "ApiResponse": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "type": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+
+  const destJson2 = {
+    id: '@integer',
+    category: {
+      id: '@integer',
+      name: '@string'
+    },
+    name: '@string',
+    photoUrls: ['@string'],
+    status: '@string'
+  }
+  t.deepEqual(jsm(json2), destJson2);
+
+
+})

test/lib.test.js

@@ -0,0 +1,43 @@
+import test from 'ava';
+
+const rewire = require("rewire");
+const lib = require('../common/lib.js');
+
+
+test('testJsonEqual', t=>{
+  let json1 = {
+    a:"1",
+    b:2,
+    c:{
+      t:3,
+      x: [11,22]
+    }
+  };
+
+  let json2 = {    
+    c:{
+      x: [11,22],
+      t:3
+    },
+    b:2,
+    a:"1"
+  }
+  t.true(lib.jsonEqual(json1, json1));
+})
+
+test('testJsonEqualBase', t=>{
+  t.true(lib.jsonEqual(1,1));
+})
+
+test('testJsonEqualBaseString', t=>{
+  t.true(lib.jsonEqual('2', '2'));
+})
+
+
+test('isDeepMatch', t=>{
+  t.true(lib.isDeepMatch({a:'aaaaa', b:2}, {a:'aaaaa'}))
+})
+
+test('isDeepMatch', t=>{
+  t.true(lib.isDeepMatch({a:1, b:2, c: {t:'ttt'}}, {c: {t:'ttt'}}))
+})

test/mock-extra.test.js

@@ -0,0 +1,107 @@
+import test from 'ava';
+const mockExtra = require('../common/mock-extra.js');
+
+
+test('mock-extra', t=>{
+  let data = '@string ${body.a}';
+  t.is(mockExtra(data), '@string ${body.a}');
+  let data2 = {
+    a:'@string',
+    b:{
+      t:'${body.a}'
+    }
+  }
+  t.deepEqual(mockExtra(data2,{
+    body: {
+      a: 3
+    }
+  }), {
+    a:'@string',
+    b:{
+      t:3
+    }
+  }, 'message');
+
+  //test object
+  let data3 = {
+    a:'@string',
+    b:{
+      t:'${body}'
+    }
+  }
+  t.deepEqual(mockExtra(data3,{
+    body: {
+      a: 3,
+      t: 5
+    }
+  }), {
+    a:'@string',
+    b:{
+      t:{
+        a: 3,
+        t: 5
+      }
+    }
+  }, 'message');
+
+  //test array
+  let data4 = {
+    a:'@string',
+    b:{
+      t:'${query.arr}'
+    }
+  }
+
+  t.deepEqual(mockExtra(data4, {query: {
+    arr: [1,2,3]
+  }}), {
+    a: '@string',
+    b:{
+      t: [1,2,3]
+    }
+  
+  }, 'message');
+
+  //test var
+  let data5 = {
+    a:'@string',
+    b:{
+      t:'${ttt.arr}'
+    }
+  }
+
+  t.deepEqual(mockExtra(data5, {ttt: {
+    arr: [1,2,3]
+  }}), {
+    a: '@string',
+    b:{
+      t: [1,2,3]
+    }
+  
+  }, 'message');
+
+//test var
+let data6 = {
+  a:'@string',
+  b:{
+    "ttt|regexp":'a|b'
+  }
+}
+
+//test regexp
+t.deepEqual(mockExtra(data6, {ttt: {
+  arr: [1,2,3]
+}}), {
+  a: '@string',
+  b:{
+    ttt: /a|b/
+  }
+
+}, 'message');
+
+
+
+
+
+})
+

test/server/mockServer.test.js

@@ -22,107 +22,3 @@ test('matchApi', t => {
 
 
 });
-
-test('mock-extra', t=>{
-  let data = '@string ${body.a}';
-  t.is(mockExtra(data), '@string ${body.a}');
-  let data2 = {
-    a:'@string',
-    b:{
-      t:'${body.a}'
-    }
-  }
-  t.deepEqual(mockExtra(data2,{
-    body: {
-      a: 3
-    }
-  }), {
-    a:'@string',
-    b:{
-      t:3
-    }
-  }, 'message');
-
-  //test object
-  let data3 = {
-    a:'@string',
-    b:{
-      t:'${body}'
-    }
-  }
-  t.deepEqual(mockExtra(data3,{
-    body: {
-      a: 3,
-      t: 5
-    }
-  }), {
-    a:'@string',
-    b:{
-      t:{
-        a: 3,
-        t: 5
-      }
-    }
-  }, 'message');
-
-  //test array
-  let data4 = {
-    a:'@string',
-    b:{
-      t:'${query.arr}'
-    }
-  }
-
-  t.deepEqual(mockExtra(data4, {query: {
-    arr: [1,2,3]
-  }}), {
-    a: '@string',
-    b:{
-      t: [1,2,3]
-    }
-  
-  }, 'message');
-
-  //test var
-  let data5 = {
-    a:'@string',
-    b:{
-      t:'${ttt.arr}'
-    }
-  }
-
-  t.deepEqual(mockExtra(data5, {ttt: {
-    arr: [1,2,3]
-  }}), {
-    a: '@string',
-    b:{
-      t: [1,2,3]
-    }
-  
-  }, 'message');
-
-//test var
-let data6 = {
-  a:'@string',
-  b:{
-    "ttt|regexp":'a|b'
-  }
-}
-
-//test regexp
-t.deepEqual(mockExtra(data6, {ttt: {
-  arr: [1,2,3]
-}}), {
-  a: '@string',
-  b:{
-    ttt: /a|b/
-  }
-
-}, 'message');
-
-
-
-
-
-})
-