From 2637bd92d99bbb127573b11cc6c8f1830d83d913 Mon Sep 17 00:00:00 2001 From: msojocs Date: Fri, 9 Sep 2022 20:30:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AA=E7=8E=AF=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/node-modules/cases/wcc/wcc.test.js | 9 ++++----- test/node-modules/cases/wcsc/wcsc.test.js | 9 ++++----- test/runner/node.js | 2 +- test/runner/wine.js | 2 +- test/wcc/lla/lla.test.js | 24 ++++++++++++----------- test/wcc/llw/llw.test.js | 19 +++++++++--------- test/wcsc/{ => ll}/ll.test.js | 4 ++-- test/wcsc/{ => raw}/raw.test.js | 4 ++-- 8 files changed, 36 insertions(+), 37 deletions(-) rename test/wcsc/{ => ll}/ll.test.js (98%) rename test/wcsc/{ => raw}/raw.test.js (99%) diff --git a/test/node-modules/cases/wcc/wcc.test.js b/test/node-modules/cases/wcc/wcc.test.js index 5657f14..9c7878d 100644 --- a/test/node-modules/cases/wcc/wcc.test.js +++ b/test/node-modules/cases/wcc/wcc.test.js @@ -5,16 +5,15 @@ const scan = require("../../utils/scan"); const fs = require("fs"); const COMPILER = require("../../../../wcc_node/lib/index"); -const originDE = assert.deepEqual; -assert.deepEqual = function () { +assert.deepEqual2 = function () { // console.log(arguments[0]) try { - originDE.apply(this, arguments); + assert.deepEqual.apply(this, arguments); } catch (error) { console.log("\t默认deepEqual检测失败，尝试检测语法"); const dw = ASTHelper.code2ast(JSON.stringify(arguments[0])); const dn = ASTHelper.code2ast(JSON.stringify(arguments[1])); - originDE(dw, dn); + assert.deepEqual(dw, dn); } }; @@ -45,7 +44,7 @@ describe("module wcc", function () { `${casePath}/output/wine-output.json` )); fs.writeFileSync(`${storagePath}/node-output.json`, JSON.stringify(nodeResult, null, 4)); - assert.deepEqual(wineResult, nodeResult); + assert.deepEqual2(wineResult, nodeResult); }else{ nodeResult = nodeResult.substring(0, nodeResult.length - 1); const wineResult = fs.readFileSync( diff --git a/test/node-modules/cases/wcsc/wcsc.test.js b/test/node-modules/cases/wcsc/wcsc.test.js index e14aebd..047c958 100644 --- a/test/node-modules/cases/wcsc/wcsc.test.js +++ b/test/node-modules/cases/wcsc/wcsc.test.js @@ -5,16 +5,15 @@ const scan = require("../../utils/scan"); const fs = require("fs"); const COMPILER = require("../../../../wcc_node/lib/index"); -const originDE = assert.deepEqual; -assert.deepEqual = function () { +assert.deepEqual2 = function () { // console.log(arguments[0]) try { - originDE.apply(this, arguments); + assert.deepEqual.apply(this, arguments); } catch (error) { console.log("\t默认deepEqual检测失败，尝试检测语法"); const dw = ASTHelper.code2ast(JSON.stringify(arguments[0])); const dn = ASTHelper.code2ast(JSON.stringify(arguments[1])); - originDE(dw, dn); + assert.deepEqual(dw, dn); } }; @@ -44,7 +43,7 @@ describe("module wcsc", function () { `${casePath}/output/wine-output.json` ).toString()); fs.writeFileSync(`${storagePath}/node-output.json`, JSON.stringify(nodeResult, null, 4)); - assert.deepEqual(wineResult, nodeResult); + assert.deepEqual2(wineResult, nodeResult); }); }); } diff --git a/test/runner/node.js b/test/runner/node.js index 62c537a..9c09287 100644 --- a/test/runner/node.js +++ b/test/runner/node.js @@ -81,7 +81,7 @@ const wcc = (args, projectPath, outputPath = undefined) => { }); }; -export { +module.exports= { wcsc, wcc } \ No newline at end of file diff --git a/test/runner/wine.js b/test/runner/wine.js index 2592ec3..ce85ae2 100644 --- a/test/runner/wine.js +++ b/test/runner/wine.js @@ -73,7 +73,7 @@ const wcc = (args, projectPath) => { }); }; -export { +module.exports = { wcsc, wcc } \ No newline at end of file diff --git a/test/wcc/lla/lla.test.js b/test/wcc/lla/lla.test.js index c2b5963..48e94a0 100644 --- a/test/wcc/lla/lla.test.js +++ b/test/wcc/lla/lla.test.js @@ -5,16 +5,15 @@ const ASTHelper = require("../../runner/ast-helper"); const path = require("path"); const fs = require("fs"); -const originDE = assert.deepEqual -assert.deepEqual = function(){ +assert.deepEqual2 = function(){ // console.log(arguments[0]) try { - originDE.apply(this, arguments) + assert.deepEqual.apply(this, arguments) } catch (error) { console.log('\t默认deepEqual检测失败，尝试检测语法') const dw = ASTHelper.code2ast(JSON.stringify(arguments[0])) const dn = ASTHelper.code2ast(JSON.stringify(arguments[1])) - originDE(dw, dn); + assert.deepEqual(dw, dn); } } @@ -74,7 +73,7 @@ describe("wcc - lla", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("组件 - 视图容器", async function () { const projectPath = path.resolve( @@ -136,8 +135,10 @@ describe("wcc - lla", function () { try { fs.mkdirSync(storagePath, { recursive: true }); } catch (error) {} - const w = JSON.parse(await wine.wcc(args, projectPath)); const n = JSON.parse(await node.wcc(args, projectPath, storagePath)); + // console.log(n) + const w = JSON.parse(await wine.wcc(args, projectPath)); + console.log(w) fs.writeFileSync( `${storagePath}/wine-output.json`, JSON.stringify(w, null, 4) @@ -146,7 +147,8 @@ describe("wcc - lla", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + console.log(w, n) + assert.deepEqual2(w, n); }); it("组件 - skyline", async function () { const projectPath = path.resolve( @@ -188,7 +190,7 @@ describe("wcc - lla", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("组件 - skyline - 自定义路由 #变量名不同导致比较不通过，需要手动检查", async function () { const projectPath = path.resolve( @@ -239,7 +241,7 @@ describe("wcc - lla", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("扩展能力 - 表单 - cell", async function () { const projectPath = path.resolve( @@ -332,7 +334,7 @@ describe("wcc - lla", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("接口 - 微信登录", async function () { const projectPath = path.resolve( @@ -447,7 +449,7 @@ describe("wcc - lla", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); }); }); diff --git a/test/wcc/llw/llw.test.js b/test/wcc/llw/llw.test.js index bff54b3..343162b 100644 --- a/test/wcc/llw/llw.test.js +++ b/test/wcc/llw/llw.test.js @@ -5,16 +5,15 @@ const ASTHelper = require("../../runner/ast-helper"); const path = require("path"); const fs = require("fs"); -const originDE = assert.deepEqual -assert.deepEqual = function(){ +assert.deepEqual2 = function(){ // console.log(arguments[0]) try { - originDE.apply(this, arguments) + assert.deepEqual.apply(this, arguments) } catch (error) { console.log('\t默认deepEqual检测失败，尝试检测语法') const dw = ASTHelper.code2ast(JSON.stringify(arguments[0])) const dn = ASTHelper.code2ast(JSON.stringify(arguments[1])) - originDE(dw, dn); + assert.deepEqual(dw, dn); } } @@ -74,7 +73,7 @@ describe("wcc - llw", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("组件 - 视图容器", async function () { const projectPath = path.resolve( @@ -146,7 +145,7 @@ describe("wcc - llw", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("组件 - skyline", async function () { const projectPath = path.resolve( @@ -188,7 +187,7 @@ describe("wcc - llw", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("组件 - skyline - 自定义路由 # 变量名不同，需要手动检测", async function () { const projectPath = path.resolve( @@ -239,7 +238,7 @@ describe("wcc - llw", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("扩展能力 - 表单 - cell # 变量名不同，需要手动检测", async function () { const projectPath = path.resolve( @@ -290,7 +289,7 @@ describe("wcc - llw", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); it("接口 - 微信登录", async function () { const projectPath = path.resolve( @@ -405,7 +404,7 @@ describe("wcc - llw", function () { `${storagePath}/node-output.json`, JSON.stringify(n, null, 4) ); - assert.deepEqual(w, n); + assert.deepEqual2(w, n); }); }); }); diff --git a/test/wcsc/ll.test.js b/test/wcsc/ll/ll.test.js similarity index 98% rename from test/wcsc/ll.test.js rename to test/wcsc/ll/ll.test.js index c9ccfd9..37ab4f1 100644 --- a/test/wcsc/ll.test.js +++ b/test/wcsc/ll/ll.test.js @@ -1,6 +1,6 @@ const assert = require("assert"); -const node = require("../runner/node"); -const wine = require("../runner/wine"); +const node = require("../../runner/node"); +const wine = require("../../runner/wine"); const path = require("path"); const fs = require("fs"); diff --git a/test/wcsc/raw.test.js b/test/wcsc/raw/raw.test.js similarity index 99% rename from test/wcsc/raw.test.js rename to test/wcsc/raw/raw.test.js index 10ca41d..fce4254 100644 --- a/test/wcsc/raw.test.js +++ b/test/wcsc/raw/raw.test.js @@ -1,6 +1,6 @@ const assert = require("assert"); -const node = require("../runner/node"); -const wine = require("../runner/wine"); +const node = require("../../runner/node"); +const wine = require("../../runner/wine"); const path = require("path"); const fs = require("fs");