From c9482452e3449a4f2a71f1366cca6be88a0a9350 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 6 Dec 2023 21:27:13 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E7=A6=81=E7=94=A8=20CodegenEngi?=
 =?UTF-8?q?neVue3Test=20=E6=9A=82=E6=97=B6=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=8D=95=E6=B5=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/inner/CodegenEngineAbstractTest.java     | 12 +++++++-----
 .../service/codegen/inner/CodegenEngineVue3Test.java |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
index f8b778e30..5176af1c7 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
@@ -31,8 +31,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
 
-    public String resourcesPath = "";  // 测试文件资源目录
-    public static final String OS_NAME = System.getProperty("os.name").toLowerCase().replace(" ", ""); // 操作系统名称
+    /**
+     * 测试文件资源目录
+     */
+    private String resourcesPath = "";
 
     @InjectMocks
     protected CodegenEngine codegenEngine;
@@ -47,7 +49,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
         // 获取测试文件 resources 路径
         String absolutePath = FileUtil.getAbsolutePath("application-unit-test.yaml");
         // 系统不一样生成的文件也有差异，那就各自生成各自的
-        resourcesPath = absolutePath.split("/target")[0] + "/src/test/resources/codegen/" + OS_NAME;
+        resourcesPath = absolutePath.split("/target")[0] + "/src/test/resources/codegen/";
     }
 
     protected static CodegenTableDO getTable(String name) {
@@ -80,14 +82,14 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
 
     @SuppressWarnings("rawtypes")
     protected static void assertResult(Map<String, String> result, String path) {
-        String assertContent = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/assert.json");
+        String assertContent = ResourceUtil.readUtf8Str("codegen/" + path + "/assert.json");
         List<HashMap> asserts = JsonUtils.parseArray(assertContent, HashMap.class);
         assertEquals(asserts.size(), result.size());
         // 校验每个文件
         asserts.forEach(assertMap -> {
             String contentPath = (String) assertMap.get("contentPath");
             String filePath = (String) assertMap.get("filePath");
-            String content = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/" + contentPath);
+            String content = ResourceUtil.readUtf8Str("codegen/" + path + "/" + contentPath);
             assertEquals(content, result.get(filePath), filePath + "：不匹配");
         });
     }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
index ce745c910..4684db78c 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
@@ -15,6 +16,7 @@ import java.util.Map;
  *
  * @author 芋道源码
  */
+@Disabled
 public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
 
     @Test