自动化回归测试：新增对通过颜色对对比结果分级

TommyLemon · TommyLemon · commit 6edcec4a6870 · 2018-03-10T19:39:42.000+08:00
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
@@ -160,7 +160,125 @@ var JSONResponse = {
       fullName = fullName.substring(index + 1);
     }
     return fullName;
+  },
+
+
+
+  COMPARE_NO_STANDARD: -1,
+  COMPARE_EQUAL: 0,
+  COMPARE_KEY_MORE: 1,
+  COMPARE_VALUE_CHANGE: 2,
+  COMPARE_KEY_LESS: 3,
+  COMPARE_TYPE_CHANGE: 4,
+  COMPARE_NUMBER_TYPE_CHANGE: 3,
+  COMPARE_CODE_CHANGE: 4,
+
+  /**&#27979;&#35797;compare: &#23545;&#27604; &#26032;&#30340;&#35831;&#27714;&#19982;&#19978;&#27425;&#35831;&#27714;&#30340;&#32467;&#26524;
+   0-&#30456;&#21516;&#65292;&#26080;&#39068;&#33394;&#65307;
+   1-&#23545;&#35937;&#26032;&#22686;&#23383;&#27573;&#25110;&#25968;&#32452;&#26032;&#22686;&#20540;&#65292;&#32511;&#33394;&#65307;
+   2-&#20540;&#25913;&#21464;&#65292;&#34013;&#33394;&#65307;
+   3-&#23545;&#35937;&#32570;&#23569;&#23383;&#27573;/&#25972;&#25968;&#21464;&#23567;&#25968;&#65292;&#40644;&#33394;&#65307;
+   4-&#31867;&#22411;/code&#25913;&#21464;&#65292;&#32418;&#33394;&#65307;
+   */
+  compareResponse: function(target, real) {
+    if (target == null || target.code == null) {
+      return JSONResponse.COMPARE_NO_STANDARD; //&#26410;&#19978;&#20256;&#23545;&#27604;&#26631;&#20934;&#65288;&#27491;&#30830;&#30340;&#32467;&#26524;&#65289;
+    }
+    if (target.code != real.code) {
+      return JSONResponse.COMPARE_CODE_CHANGE;
+    }
+
+    delete target.code;
+    delete real.code;
+
+    delete target.message;
+    delete real.message;
+
+    return JSONResponse.compare(target, real);
+  },
+
+  /**&#27979;&#35797;compare: &#23545;&#27604; &#26032;&#30340;&#35831;&#27714;&#19982;&#19978;&#27425;&#35831;&#27714;&#30340;&#32467;&#26524;
+   0-&#30456;&#21516;&#65292;&#26080;&#39068;&#33394;&#65307;
+   1-&#23545;&#35937;&#26032;&#22686;&#23383;&#27573;&#25110;&#25968;&#32452;&#26032;&#22686;&#20540;&#65292;&#32511;&#33394;&#65307;
+   2-&#20540;&#25913;&#21464;&#65292;&#34013;&#33394;&#65307;
+   3-&#23545;&#35937;&#32570;&#23569;&#23383;&#27573;/&#25972;&#25968;&#21464;&#23567;&#25968;&#65292;&#40644;&#33394;&#65307;
+   4-&#31867;&#22411;/success/errCode&#25913;&#21464;&#65292;&#32418;&#33394;&#65307;
+   */
+  compare: function(target, real) {
+    if (target == null) {
+      return real == null ? JSONResponse.COMPARE_EQUAL : JSONResponse.COMPARE_KEY_MORE;
+    }
+    if (real == null) { //&#23569;&#20102;key
+      return JSONResponse.COMPARE_KEY_LESS;
+    }
+
+    var type = typeof target;
+    if (type != typeof real) { //&#31867;&#22411;&#25913;&#21464;
+      return JSONResponse.COMPARE_TYPE_CHANGE;
+    }
+
+    var max = JSONResponse.COMPARE_EQUAL;
+    var each = JSONResponse.COMPARE_EQUAL;
+    if (target instanceof Array) { // JSONArray
+      if (target.length != real.length) {
+        max = JSONResponse.COMPARE_VALUE_CHANGE;
+      }
+
+      var length = Math.min(target.length, real.length); //&#22810;&#25110;&#23569;&#37117;&#19981;&#24433;&#21709;
+
+      //TODO &#38656;&#35201;&#25226;&#25152;&#26377;&#20540;&#21512;&#24182;&#65292;&#24471;&#21040;&#26368;&#20840;&#30340;&#65292;&#33267;&#20110;&#31867;&#22411;&#65292;Java&#26159;&#24456;&#31283;&#23450;&#30340;&#65292;&#21516;&#26679;&#30340;key&#22312;&#25152;&#26377;Object&#30340;type&#37117;&#30456;&#21516;&#12290;
+      for (var i = 0; i < length; i++) { //&#36941;&#21382;&#24182;&#36882;&#24402;&#19979;&#19968;&#23618;
+        each = JSONResponse.compare(target[i], real[i]);
+        if (max < each) {
+          max = each;
+        }
+        if (max >= JSONResponse.COMPARE_TYPE_CHANGE) {
+          break;
+        }
+      }
+    }
+    else if (target instanceof Object) { // JSONObject
+      var tks = Object.keys(target);
+      var key;
+      for (var i = 0; i< tks.length; i++) { //&#36941;&#21382;&#24182;&#36882;&#24402;&#19979;&#19968;&#23618;
+        key = tks[i];
+        if (key == null) {
+          continue;
+        }
+
+        each = JSONResponse.compare(target[key], real[key]);
+        if (max < each) {
+          max = each;
+        }
+        if (max >= JSONResponse.COMPARE_TYPE_CHANGE) {
+          break;
+        }
+      }
+
+
+      if (max < JSONResponse.COMPARE_KEY_MORE) { //&#22810;&#20986;key
+        for (var k in real) {
+          if (k != null && tks.indexOf(k) < 0) {
+            max = JSONResponse.COMPARE_KEY_MORE;
+          }
+        }
+      }
+    }
+    else { // Boolean, Number, String
+      if (type == 'number') { //&#25968;&#23383;&#31867;&#22411;&#30001;&#25972;&#25968;&#21464;&#20026;&#23567;&#25968;
+        if (String(target).indexOf('.') < 0 && String(real).indexOf('.') >= 0) {
+          return JSONResponse.COMPARE_NUMBER_TYPE_CHANGE;
+        }
+      }
+
+      if (target !== real) { //&#20540;&#19981;&#21516;
+        return JSONResponse.COMPARE_VALUE_CHANGE;
+      }
+    }
+
+    return max;
   }
 
 
+
 }
diff --git a/index.html b/index.html
@@ -95,7 +95,7 @@
       <ul v-show="isRemoteShow" class="historys" style="width: 100%;height: 100%;overflow: hidden;overflow-y: scroll;padding-bottom: 50px">
         <li v-for="(item, index) in remotes" >
           <a href="javascript:void(0)" @click="restore(item)" > {{(item.version > 0 ? 'V' + item.version : 'V*') + ' ' + item.name  + '    ' + item.url}}</a>
-          <div v-show="item.compare != null && item.compare > 0" style="position: absolute;right: 30px;display: inline-block;">
+          <div :style="{ background: item.compareColor }" v-show="item.compare != null && item.compare > 0" style="position: absolute;right: 30px;display: inline-block;">
             <button @click="handleTest(false, index, item)" style="position: relative;color: red">&#38169;&#35823;&#65292;&#24050;&#35299;&#20915;</button>
             <svg class="icon" style="position: relative;margin-left: 10px" @click="downloadTest(index, item)">
               <use xlink:href="svg/icon.svg#export-txt"></use>
diff --git a/js/main.js b/js/main.js
@@ -131,6 +131,7 @@
       remotes: [],
       tests: [],
       testProcess: '',
+      compareColor: '#0000',
       isDelayShow: false,
       isSaveShow: false,
       isExportShow: false,
@@ -1183,7 +1184,7 @@
        1-&#23545;&#35937;&#26032;&#22686;&#23383;&#27573;&#25110;&#25968;&#32452;&#26032;&#22686;&#20540;&#65292;&#32511;&#33394;&#65307;
        2-&#20540;&#25913;&#21464;&#65292;&#34013;&#33394;&#65307;
        3-&#23545;&#35937;&#32570;&#23569;&#23383;&#27573;&#65292;&#40644;&#33394;&#65307;
-       4-&#31867;&#22411;&#25913;&#21464;&#65292;&#32418;&#33394;&#65307;
+       4-&#31867;&#22411;/success/errCode&#25913;&#21464;&#65292;&#32418;&#33394;&#65307;
        */
       test: function () {
         var baseUrl = App.getBaseUrl() || ''
@@ -1230,14 +1231,28 @@
             response = JSON.stringify(res.data || {})
 
             var it = item || {} //&#35831;&#27714;&#24322;&#27493;
-            it.compare = it.response == response ? 0 : 4
+            it.compare = JSONResponse.compareResponse(it.response == null ? null : JSON.parse(it.response), res.data)
             console.log('i = ' + index + '; item.name = ' + it.name + '; item.compare = ' + it.compare)
             // if (it.compare > 0) {
             //   alert('i = ' + index + '; item.name = ' + it.name + '; item.compare = ' + it.compare
             //     + '; it.response = \n' + it.response
             //     + '\n\n\n res.data = \n' + response
             //   )
             // }
+            switch (it.compare) {
+              case JSONResponse.COMPARE_KEY_MORE:
+                it.compareColor = 'green'
+                break;
+              case JSONResponse.COMPARE_VALUE_CHANGE:
+                it.compareColor = 'blue'
+                break;
+              case JSONResponse.COMPARE_KEY_LESS:
+                it.compareColor = 'yellow'
+                break;
+              case JSONResponse.COMPARE_TYPE_CHANGE:
+                it.compareColor = 'red'
+                break;
+            }
 
             App.testProcess = index <= allCount ? '' : '&#27491;&#22312;&#27979;&#35797;: ' + index + '/' + allCount
 
