Introduce BaseConnectorTest, merging AbstractTestDistributedQueries and AbstractTestIntegrationSmokeTest

plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloIntegrationSmokeTest.java

@@ -26,6 +26,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAccumuloIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     @Override

plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcCachingQueries.java

@@ -0,0 +1,120 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.plugin.jdbc;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.AbstractTestDistributedQueries;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.JdbcSqlExecutor;
+import io.trino.testing.sql.TestTable;
+import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+
+import static io.trino.plugin.jdbc.H2QueryRunner.createH2QueryRunner;
+
+public class TestJdbcCachingQueries
+        // TODO define shorter tests set that exercises various read and write scenarios (a.k.a. "a smoke test")
+        extends AbstractTestDistributedQueries
+{
+    private Map<String, String> properties;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        properties = ImmutableMap.<String, String>builder()
+                .putAll(TestingH2JdbcModule.createProperties())
+                .put("metadata.cache-ttl", "10m")
+                .put("metadata.cache-missing", "true")
+                .put("allow-drop-table", "true")
+                .build();
+        return createH2QueryRunner(TpchTable.getTables(), properties);
+    }
+
+    @Override
+    protected boolean supportsDelete()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsViews()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsArrays()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnTable()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnColumn()
+    {
+        return false;
+    }
+
+    @Override
+    public void testLargeIn(int valuesCount)
+    {
+        throw new SkipException("This test should pass with H2, but takes too long (currently over a mninute) and is not that important");
+    }
+
+    @Override
+    protected TestTable createTableWithDefaultColumns()
+    {
+        return new TestTable(
+                getSqlExecutor(),
+                "tpch.table",
+                "(col_required BIGINT NOT NULL," +
+                        "col_nullable BIGINT," +
+                        "col_default BIGINT DEFAULT 43," +
+                        "col_nonnull_default BIGINT NOT NULL DEFAULT 42," +
+                        "col_required2 BIGINT NOT NULL)");
+    }
+
+    @Override
+    protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
+    {
+        String typeBaseName = dataMappingTestSetup.getTrinoTypeName().replaceAll("\\([^()]*\\)", "");
+        switch (typeBaseName) {
+            case "boolean":
+            case "decimal":
+            case "char":
+            case "varbinary":
+            case "time":
+            case "timestamp":
+            case "timestamp with time zone":
+                return Optional.of(dataMappingTestSetup.asUnsupported());
+        }
+
+        return Optional.of(dataMappingTestSetup);
+    }
+
+    private JdbcSqlExecutor getSqlExecutor()
+    {
+        return new JdbcSqlExecutor(properties.get("connection-url"), new Properties());
+    }
+}

plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java

@@ -0,0 +1,117 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.plugin.jdbc;
+
+import com.google.common.collect.ImmutableMap;
+import io.trino.testing.BaseConnectorTest;
+import io.trino.testing.QueryRunner;
+import io.trino.testing.sql.JdbcSqlExecutor;
+import io.trino.testing.sql.TestTable;
+import io.trino.tpch.TpchTable;
+import org.testng.SkipException;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+
+import static io.trino.plugin.jdbc.H2QueryRunner.createH2QueryRunner;
+
+public class TestJdbcConnectorTest
+        extends BaseConnectorTest
+{
+    private Map<String, String> properties;
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        properties = ImmutableMap.<String, String>builder()
+                .putAll(TestingH2JdbcModule.createProperties())
+                .put("allow-drop-table", "true")
+                .build();
+        return createH2QueryRunner(TpchTable.getTables(), properties);
+    }
+
+    @Override
+    protected boolean supportsDelete()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsViews()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsArrays()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnTable()
+    {
+        return false;
+    }
+
+    @Override
+    protected boolean supportsCommentOnColumn()
+    {
+        return false;
+    }
+
+    @Override
+    public void testLargeIn(int valuesCount)
+    {
+        throw new SkipException("This test should pass with H2, but takes too long (currently over a mninute) and is not that important");
+    }
+
+    @Override
+    protected TestTable createTableWithDefaultColumns()
+    {
+        return new TestTable(
+                getSqlExecutor(),
+                "tpch.table",
+                "(col_required BIGINT NOT NULL," +
+                        "col_nullable BIGINT," +
+                        "col_default BIGINT DEFAULT 43," +
+                        "col_nonnull_default BIGINT NOT NULL DEFAULT 42," +
+                        "col_required2 BIGINT NOT NULL)");
+    }
+
+    @Override
+    protected Optional<DataMappingTestSetup> filterDataMappingSmokeTestData(DataMappingTestSetup dataMappingTestSetup)
+    {
+        String typeBaseName = dataMappingTestSetup.getTrinoTypeName().replaceAll("\\([^()]*\\)", "");
+        switch (typeBaseName) {
+            case "boolean":
+            case "decimal":
+            case "char":
+            case "varbinary":
+            case "time":
+            case "timestamp":
+            case "timestamp with time zone":
+                return Optional.of(dataMappingTestSetup.asUnsupported());
+        }
+
+        return Optional.of(dataMappingTestSetup);
+    }
+
+    private JdbcSqlExecutor getSqlExecutor()
+    {
+        return new JdbcSqlExecutor(properties.get("connection-url"), new Properties());
+    }
+}

plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcIntegrationSmokeTest.java

@@ -32,6 +32,7 @@
 import static java.lang.String.format;
 
 public class TestJdbcIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private final Map<String, String> properties = TestingH2JdbcModule.createProperties();

plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryIntegrationSmokeTest.java

@@ -29,6 +29,7 @@
 
 @Test
 public class TestBigQueryIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private BigQuerySqlExecutor bigQuerySqlExecutor;

plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraIntegrationSmokeTest.java

@@ -73,6 +73,7 @@
 import static org.testng.Assert.assertEquals;
 
 public class TestCassandraIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private static final String KEYSPACE = "smoke_test";

plugin/trino-druid/src/test/java/io/trino/plugin/druid/BaseDruidIntegrationSmokeTest.java

@@ -29,6 +29,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class BaseDruidIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     protected static final String SELECT_FROM_ORDERS = "SELECT " +

plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchSmokeTest.java

@@ -47,6 +47,7 @@
 import static org.testng.Assert.assertTrue;
 
 public abstract class BaseElasticsearchSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private final String image;

plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveIntegrationSmokeTest.java

@@ -163,6 +163,7 @@
 import static org.testng.FileAssert.assertFile;
 
 public class TestHiveIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private static final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSSSS");

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/AbstractTestIcebergSmoke.java

@@ -91,6 +91,7 @@
 import static org.testng.Assert.assertTrue;
 
 public abstract class AbstractTestIcebergSmoke
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private static final Pattern WITH_CLAUSE_EXTRACTER = Pattern.compile(".*(WITH\\s*\\([^)]*\\))\\s*$", Pattern.DOTALL);

plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaIntegrationSmokeTest.java

@@ -64,6 +64,7 @@
 import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
 
 public class TestKafkaIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private TestingKafka testingKafka;

plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/AbstractKuduIntegrationSmokeTest.java

@@ -35,6 +35,7 @@
 import static org.testng.Assert.assertTrue;
 
 public abstract class AbstractKuduIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private TestingKuduServer kuduServer;

plugin/trino-memsql/src/test/java/io/trino/plugin/memsql/TestMemSqlIntegrationSmokeTest.java

@@ -40,6 +40,7 @@
 import static org.testng.Assert.assertTrue;
 
 public class TestMemSqlIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     protected TestingMemSqlServer memSqlServer;

plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoIntegrationSmokeTest.java

@@ -45,6 +45,7 @@
 
 @Test(singleThreaded = true)
 public class TestMongoIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private MongoServer server;

plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlIntegrationSmokeTest.java

@@ -39,6 +39,7 @@
 import static org.testng.Assert.assertTrue;
 
 abstract class BaseMySqlIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     protected TestingMySqlServer mysqlServer;

plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleIntegrationSmokeTest.java

@@ -34,6 +34,7 @@
 import static org.testng.Assert.assertTrue;
 
 public abstract class BaseOracleIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     @Test

plugin/trino-phoenix/src/test/java/io/trino/plugin/phoenix/TestPhoenixIntegrationSmokeTest.java

@@ -34,6 +34,7 @@
 import static org.testng.Assert.fail;
 
 public class TestPhoenixIntegrationSmokeTest
+        // TODO extend BaseConnectorTest
         extends AbstractTestIntegrationSmokeTest
 {
     private TestingPhoenixServer testingPhoenixServer;