diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java index 694f4354d7d..e081e1fd061 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/planner/CalcitePlannerModuleTest.java @@ -36,6 +36,7 @@ import org.apache.druid.sql.calcite.aggregation.SqlAggregator; import org.apache.druid.sql.calcite.expression.SqlOperatorConversion; import org.apache.druid.sql.calcite.schema.DruidSchemaName; import org.apache.druid.sql.calcite.schema.NamedSchema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.easymock.EasyMock; import org.easymock.EasyMockRunner; import org.easymock.Mock; @@ -49,7 +50,7 @@ import javax.validation.Validator; import java.util.Set; @RunWith(EasyMockRunner.class) -public class CalcitePlannerModuleTest +public class CalcitePlannerModuleTest extends CalciteTestBase { private static final String SCHEMA_1 = "SCHEMA_1"; private static final String SCHEMA_2 = "SCHEMA_2"; diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java index 4f1fda05ece..edba60a35c2 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java @@ -42,6 +42,7 @@ import org.apache.druid.server.QueryLifecycleFactory; import org.apache.druid.server.security.AuthorizerMapper; import org.apache.druid.server.security.Escalator; import org.apache.druid.sql.calcite.planner.PlannerConfig; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.apache.druid.sql.calcite.view.ViewManager; import org.easymock.EasyMock; import org.easymock.EasyMockRunner; @@ -55,7 +56,7 @@ import java.util.Set; import java.util.stream.Collectors; @RunWith(EasyMockRunner.class) -public class DruidCalciteSchemaModuleTest +public class DruidCalciteSchemaModuleTest extends CalciteTestBase { private static final String DRUID_SCHEMA_NAME = "druid"; diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java index eb634089108..f4af22be088 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedDruidSchemaTest.java @@ -19,6 +19,7 @@ package org.apache.druid.sql.calcite.schema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.easymock.EasyMockRunner; import org.easymock.Mock; import org.junit.Assert; @@ -27,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith(EasyMockRunner.class) -public class NamedDruidSchemaTest +public class NamedDruidSchemaTest extends CalciteTestBase { private static final String SCHEMA_NAME = "SCHEMA_NAME"; diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java index f81cbd22f6a..22aa9e9f638 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedLookupSchemaTest.java @@ -19,6 +19,7 @@ package org.apache.druid.sql.calcite.schema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.easymock.EasyMockRunner; import org.easymock.Mock; import org.junit.Assert; @@ -27,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith(EasyMockRunner.class) -public class NamedLookupSchemaTest +public class NamedLookupSchemaTest extends CalciteTestBase { private static final String SCHEMA_NAME = "lookup"; diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java index 64889134ade..b4fa99f6f47 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/NamedSystemSchemaTest.java @@ -19,12 +19,13 @@ package org.apache.druid.sql.calcite.schema; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.easymock.Mock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class NamedSystemSchemaTest +public class NamedSystemSchemaTest extends CalciteTestBase { private static final String SCHEMA_NAME = "sys"; diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java index 26b9ab10d83..71f11699793 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/RootSchemaProviderTest.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet; import org.apache.calcite.schema.Schema; import org.apache.calcite.schema.SchemaPlus; import org.apache.druid.java.util.common.ISE; +import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.easymock.EasyMock; import org.easymock.EasyMockRunner; import org.easymock.Mock; @@ -34,7 +35,7 @@ import org.junit.runner.RunWith; import java.util.Set; @RunWith(EasyMockRunner.class) -public class RootSchemaProviderTest +public class RootSchemaProviderTest extends CalciteTestBase { private static final String SCHEMA_1 = "SCHEMA_1"; private static final String SCHEMA_2 = "SCHEMA_2";