From 72268b7c57b20a38a6f7cc2e82ac9d3c0308a0c4 Mon Sep 17 00:00:00 2001 From: Jack Klamer Date: Thu, 2 Feb 2023 16:15:12 -0600 Subject: [PATCH 1/2] Refactor mock catalog init in BaseConnectorTest --- .../java/io/trino/testing/BaseConnectorTest.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java index 294ba9508552..280465a85803 100644 --- a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java +++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java @@ -164,7 +164,14 @@ public abstract class BaseConnectorTest private final ConcurrentMap>> mockTableListings = new ConcurrentHashMap<>(); @BeforeClass - public void addMockCatalog() + public void initMockCatalog() + { + QueryRunner queryRunner = getQueryRunner(); + queryRunner.installPlugin(buildMockConnectorPlugin()); + queryRunner.createCatalog("mock_dynamic_listing", "mock", Map.of()); + } + + protected MockConnectorPlugin buildMockConnectorPlugin() { MockConnectorFactory connectorFactory = MockConnectorFactory.builder() .withListSchemaNames(session -> ImmutableList.copyOf(mockTableListings.keySet())) @@ -177,9 +184,7 @@ public void addMockCatalog() .apply(session); }) .build(); - QueryRunner queryRunner = getQueryRunner(); - queryRunner.installPlugin(new MockConnectorPlugin(connectorFactory)); - queryRunner.createCatalog("mock_dynamic_listing", "mock", Map.of()); + return new MockConnectorPlugin(connectorFactory); } /** From 99004bf153d6e34bb6799587360da9b52a081f53 Mon Sep 17 00:00:00 2001 From: Jack Klamer Date: Tue, 7 Feb 2023 13:03:41 -0600 Subject: [PATCH 2/2] Empty