From 6fb658639629f7c69f4cbe2326599e587e5507bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Kokosi=C5=84ski?= Date: Thu, 25 Feb 2021 13:43:51 +0100 Subject: [PATCH] Simplify PostgreSQL testCaseSensitiveDataMapping skipping --- .../postgresql/TestPostgreSqlConnectorTest.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java index 6a44b46cc366..6fc2633985ba 100644 --- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java +++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConnectorTest.java @@ -25,6 +25,7 @@ import io.trino.testing.sql.JdbcSqlExecutor; import io.trino.testing.sql.TestTable; import org.intellij.lang.annotations.Language; +import org.testng.SkipException; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -42,7 +43,6 @@ import static java.util.stream.Collectors.joining; import static java.util.stream.IntStream.range; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -731,14 +731,8 @@ public void testTimestampColumnAndTimestampWithTimeZoneConstant() @Override public void testCaseSensitiveDataMapping(DataMappingTestSetup dataMappingTestSetup) { - try { - super.testCaseSensitiveDataMapping(dataMappingTestSetup); - } - catch (AssertionError ignored) { - // TODO https://github.com/trinodb/trino/issues/3645 - PostgreSQL has different collation than Trino - assertThatThrownBy(() -> super.testCaseSensitiveDataMapping(dataMappingTestSetup)) - .hasStackTraceContaining("not equal\nActual rows"); - } + // TODO - https://github.com/trinodb/trino/issues/3645 + throw new SkipException("PostgreSQL has different collation than Trino"); } private String getLongInClause(int start, int length)