From 78d798bbe907d632488281c352d306967653b7ca Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 4 Jun 2026 01:18:37 +0800 Subject: [PATCH] fix(infra): 修复 windows 代码生成单测换行符差异 --- yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java index 7d1be13..d09f1eb 100644 --- a/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java +++ b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java @@ -108,14 +108,16 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { asserts.forEach(assertMap -> { String contentPath = (String) assertMap.get("contentPath"); String filePath = (String) assertMap.get("filePath"); - String expected = ResourceUtil.readUtf8Str("codegen/" + path + "/" + contentPath) - .replace("\r\n", "\n"); + String expected = normalizeLineEndings(ResourceUtil.readUtf8Str("codegen/" + path + "/" + contentPath)); String actual = result.get(filePath); - assertEquals(expected, actual == null ? null : actual.replace("\r\n", "\n"), - filePath + "：不匹配"); + assertEquals(expected, normalizeLineEndings(actual), filePath + "：不匹配"); }); } + private static String normalizeLineEndings(String content) { + return content == null ? null : content.replace("\r\n", "\n").replace("\r", "\n"); + } + // ==================== 调试专用 ==================== /** @@ -149,10 +151,10 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { + '/' + StrUtil.subBefore(lastFilePath, '.', true); asserts.add(MapUtil.builder().put("filePath", filePath) .put("contentPath", contentPath).build()); - FileUtil.writeUtf8String(fileContent, basePath + "/" + contentPath); + FileUtil.writeUtf8String(normalizeLineEndings(fileContent), basePath + "/" + contentPath); }); // 写入 assert.json 文件 - FileUtil.writeUtf8String(JsonUtils.toJsonPrettyString(asserts), basePath + "/assert.json"); + FileUtil.writeUtf8String(normalizeLineEndings(JsonUtils.toJsonPrettyString(asserts)), basePath + "/assert.json"); } } -- libgit2 0.21.4