From 53efa4ef4039245e086ffda18d7d7d8cf541cb8a Mon Sep 17 00:00:00 2001 From: serge-rider Date: Sun, 19 May 2024 16:53:54 +0200 Subject: [PATCH] Tests fix (windows crlf) --- .../test/platform/SQLQueryTranslatorTest.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java index 4420ead0b2..3c06bbce97 100644 --- a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java +++ b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java @@ -27,6 +27,7 @@ import org.jkiss.dbeaver.model.impl.sql.BasicSQLDialect; import org.jkiss.dbeaver.model.sql.SQLDialect; import org.jkiss.dbeaver.model.sql.translate.SQLQueryTranslator; import org.jkiss.dbeaver.runtime.DBWorkbench; +import org.jkiss.dbeaver.utils.GeneralUtils; import org.junit.Assert; import org.junit.Test; @@ -191,10 +192,15 @@ public class SQLQueryTranslatorTest { ); Assert.assertEquals( entry.getKey().getDialectId() + " has invalid syntax " + translated, - entry.getValue().toLowerCase(), - translated.toLowerCase() + normalizeScript(entry.getValue()), + normalizeScript(translated) ); } } + private static String normalizeScript(String script) { + // Unify for tests + return script.toLowerCase().replace(GeneralUtils.getDefaultLineSeparator(), "\n"); + } + }