Commit f6886a780df2202410909de4580b54aa48e6ae0e
1 parent
6a3b384f
fix(infra): 修复 Windows 下代码生成单测换行与尾逗号差异
Showing
1 changed file
with
4 additions
and
1 deletions
yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
| @@ -115,7 +115,10 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { | @@ -115,7 +115,10 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { | ||
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | private static String normalizeLineEndings(String content) { | 117 | private static String normalizeLineEndings(String content) { |
| 118 | - return content == null ? null : content.replace("\r\n", "\n").replace("\r", "\n").stripTrailing(); | 118 | + if (content == null) { |
| 119 | + return null; | ||
| 120 | + } | ||
| 121 | + return StrUtil.trimEnd(content.replace("\r\n", "\n").replace('\r', '\n')); | ||
| 119 | } | 122 | } |
| 120 | 123 | ||
| 121 | // ==================== 调试专用 ==================== | 124 | // ==================== 调试专用 ==================== |