Fixed unit tests

Author: Julien Ruaux

subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchClientModule.java

@@ -3,6 +3,8 @@
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static java.util.Objects.requireNonNull;
 
+import java.util.Optional;
+
 import javax.inject.Singleton;
 
 import com.google.inject.Binder;
@@ -29,8 +31,9 @@ public void configure(Binder binder) {
 	@Provides
 	public static RediSearchSession createRediSearchSession(TypeManager typeManager, RediSearchConfig config) {
 		requireNonNull(config, "config is null");
-		if (config.getUri().isPresent()) {
-			RedisModulesClient client = RedisModulesClient.create(config.getUri().get());
+		Optional<String> uri = config.getUri();
+		if (uri.isPresent()) {
+			RedisModulesClient client = RedisModulesClient.create(uri.get());
 			return new RediSearchSession(typeManager, client.connect(), config);
 		}
 		throw new IllegalArgumentException("No Redis URI specified");

subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchSession.java

@@ -13,6 +13,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -89,8 +90,9 @@ public void shutdown() {
 	}
 
 	public List<HostAddress> getAddresses() {
-		if (config.getUri().isPresent()) {
-			RedisURI redisURI = RedisURI.create(config.getUri().get());
+		Optional<String> uri = config.getUri();
+		if (uri.isPresent()) {
+			RedisURI redisURI = RedisURI.create(uri.get());
 			return Collections.singletonList(HostAddress.fromParts(redisURI.getHost(), redisURI.getPort()));
 		}
 		return Collections.emptyList();

subprojects/trino-redisearch/src/test/java/com/redis/trino/RediSearchQueryRunner.java

@@ -12,8 +12,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.redis.trino.RediSearchConnectorFactory;
-import com.redis.trino.RediSearchPlugin;
 
 import io.airlift.log.Logger;
 import io.airlift.log.Logging;

subprojects/trino-redisearch/src/test/java/com/redis/trino/TestRediSearchConfig.java

@@ -9,7 +9,6 @@
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.redis.trino.RediSearchConfig;
 
 import io.airlift.configuration.ConfigurationFactory;
 

subprojects/trino-redisearch/src/test/java/com/redis/trino/TestRediSearchConnectorTest.java

@@ -3,6 +3,7 @@
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static io.trino.testing.DataProviders.toDataProvider;
 import static io.trino.testing.MaterializedResult.resultBuilder;
+import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_CREATE_TABLE;
 import static io.trino.testing.TestingConnectorBehavior.SUPPORTS_INSERT;
 import static io.trino.testing.assertions.Assert.assertEquals;
 import static io.trino.tpch.TpchTable.CUSTOMER;
@@ -102,22 +103,6 @@ protected TestTable createTableWithDefaultColumns() {
 		throw new SkipException("test disabled for RediSearch");
 	}
 
-	@Test
-	public void testLimitMax() {
-		int maxLimit = 1000000;
-		// max int
-		assertQuery("SELECT orderkey FROM orders LIMIT " + maxLimit);
-		assertQuery("SELECT orderkey FROM orders ORDER BY orderkey LIMIT " + maxLimit);
-
-		// max long; a connector may attempt a pushdown while remote system may not
-		// accept such high limit values
-		assertQuery("SELECT nationkey FROM nation LIMIT " + maxLimit, "SELECT nationkey FROM nation");
-		// Currently this is not supported but once it's supported, it should be tested
-		// with connectors as well
-		assertQueryFails("SELECT nationkey FROM nation ORDER BY nationkey LIMIT " + Long.MAX_VALUE,
-				"ORDER BY LIMIT > 2147483647 is not supported");
-	}
-
 	@Override
 	public void testShowSchemasLikeWithEscape() {
 		throw new SkipException("Not supported by RediSearch connector");
@@ -158,6 +143,24 @@ public void testShowColumns() {
 		throw new SkipException("Not supported by RediSearch connector");
 	}
 
+	@Override
+	@Test
+	public void testLimitMax() {
+		int maxLimit = 1000000;
+		// max int
+		assertQuery("SELECT orderkey FROM orders LIMIT " + maxLimit);
+		assertQuery("SELECT orderkey FROM orders ORDER BY orderkey LIMIT " + maxLimit);
+
+		// max long; a connector may attempt a pushdown while remote system may not
+		// accept such high limit values
+		assertQuery("SELECT nationkey FROM nation LIMIT " + maxLimit, "SELECT nationkey FROM nation");
+		// Currently this is not supported but once it's supported, it should be tested
+		// with connectors as well
+		assertQueryFails("SELECT nationkey FROM nation ORDER BY nationkey LIMIT " + Long.MAX_VALUE,
+				"ORDER BY LIMIT > 2147483647 is not supported");
+	}
+
+	@SuppressWarnings("resource")
 	@Test
 	public void testInsert() {
 		if (!hasBehavior(SUPPORTS_INSERT)) {
@@ -167,9 +170,7 @@ public void testInsert() {
 
 		String query = "SELECT phone, custkey, acctbal FROM customer";
 
-		try (QueryRunner queryRunner = getQueryRunner();
-				TestTable table = new TestTable(queryRunner::execute, "test_insert_",
-						"AS " + query + " WITH NO DATA")) {
+		try (TestTable table = new TestTable(getQueryRunner()::execute, "test_insert_", "AS " + query + " WITH NO DATA")) {
 			assertQuery("SELECT count(*) FROM " + table.getName() + "", "SELECT 0");
 
 			assertUpdate("INSERT INTO " + table.getName() + " " + query, "SELECT count(*) FROM customer");
@@ -233,17 +234,20 @@ public void testDescribeTable() {
 		assertEquals(actualColumns, expectedColumns);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test(dataProvider = "testCaseSensitiveDataMappingProvider", enabled = false)
 	public void testCaseSensitiveDataMapping(DataMappingTestSetup dataMappingTestSetup) {
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test(dataProvider = "testRediSearchDataMappingSmokeTestDataProvider")
 	public void testDataMappingSmokeTest(DataMappingTestSetup dataMappingTestSetup) {
 		testDataMapping(dataMappingTestSetup);
 	}
 
+	@SuppressWarnings("deprecation")
 	private void testDataMapping(DataMappingTestSetup dataMappingTestSetup) {
-		skipTestUnless(supportsCreateTable());
+		skipTestUnless(hasBehavior(SUPPORTS_CREATE_TABLE));
 
 		String trinoTypeName = dataMappingTestSetup.getTrinoTypeName();
 		String sampleValueLiteral = dataMappingTestSetup.getSampleValueLiteral();
@@ -289,12 +293,14 @@ private void testDataMapping(DataMappingTestSetup dataMappingTestSetup) {
 		assertUpdate("DROP TABLE " + tableName);
 	}
 
+	@SuppressWarnings("deprecation")
 	@DataProvider
 	public final Object[][] testRediSearchDataMappingSmokeTestDataProvider() {
 		return testDataMappingSmokeTestData().stream().map(this::filterDataMappingSmokeTestData)
 				.flatMap(Optional::stream).collect(toDataProvider());
 	}
 
+	@SuppressWarnings("deprecation")
 	private List<DataMappingTestSetup> testDataMappingSmokeTestData() {
 		return ImmutableList.<DataMappingTestSetup>builder()
 //                .add(new DataMappingTestSetup("boolean", "false", "true"))

subprojects/trino-redisearch/src/test/java/com/redis/trino/TestRediSearchPlugin.java

@@ -8,13 +8,13 @@
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.redis.trino.RediSearchPlugin;
 
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
 
 public class TestRediSearchPlugin {
+
 	private RediSearchServer server;
 
 	@BeforeClass

subprojects/trino-redisearch/src/test/java/com/redis/trino/TestRediSearchQueryBuilder.java

@@ -12,8 +12,6 @@
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.redis.trino.RediSearchColumnHandle;
-import com.redis.trino.RediSearchQueryBuilder;
 
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.predicate.Domain;

subprojects/trino-redisearch/src/test/java/com/redis/trino/TestRediSearchTableHandle.java

@@ -1,12 +1,11 @@
 package com.redis.trino;
 
-import io.airlift.json.JsonCodec;
-import io.trino.spi.connector.SchemaTableName;
-import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
 
-import com.redis.trino.RediSearchTableHandle;
+import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
+import io.airlift.json.JsonCodec;
+import io.trino.spi.connector.SchemaTableName;
 
 public class TestRediSearchTableHandle
 {