DRILL-2889: Rename JdbcTest to JdbcTestBase.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/60c0f86f Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/60c0f86f Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/60c0f86f Branch: refs/heads/master Commit: 60c0f86f5f6033847d9f38d4d3700760a3e7f45a Parents: 7ab51dd Author: dbarclay <[email protected]> Authored: Mon Apr 27 13:25:35 2015 -0700 Committer: Parth Chandra <[email protected]> Committed: Tue May 5 19:29:18 2015 -0700 ---------------------------------------------------------------------- .../jdbc/DatabaseMetaDataGetColumnsTest.java | 2 +- .../java/org/apache/drill/jdbc/JdbcTest.java | 155 ------------------- .../org/apache/drill/jdbc/JdbcTestBase.java | 155 +++++++++++++++++++ .../jdbc/ResultSetGetMethodConversionsTest.java | 2 +- .../jdbc/SingleConnectionCachingFactory.java | 2 +- ...etColumnsDataTypeNotTypeCodeIntBugsTest.java | 4 +- ...39GetBooleanFailsSayingWrongTypeBugTest.java | 4 +- ...rill2461IntervalsBreakInfoSchemaBugTest.java | 4 +- ...2463GetNullsFailedWithAssertionsBugTest.java | 4 +- ...l2489CallsAfterCloseThrowExceptionsTest.java | 4 +- .../apache/drill/jdbc/test/JdbcDataTest.java | 4 +- .../drill/jdbc/test/JdbcTestActionBase.java | 4 +- .../drill/jdbc/test/JdbcTestQueryBase.java | 4 +- .../jdbc/test/TestAggregateFunctionsQuery.java | 4 +- .../drill/jdbc/test/TestJdbcDistQuery.java | 6 +- .../apache/drill/jdbc/test/TestJdbcQuery.java | 2 +- 16 files changed, 180 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java index 19be2fd..a6c2da8 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java @@ -78,7 +78,7 @@ import java.sql.Types; * Based on JDBC 4.1 (Java 7). * </p> */ -public class DatabaseMetaDataGetColumnsTest extends JdbcTest { +public class DatabaseMetaDataGetColumnsTest extends JdbcTestBase { private static final String VIEW_NAME = DatabaseMetaDataGetColumnsTest.class.getSimpleName() + "_View"; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTest.java deleted file mode 100644 index 0042f24..0000000 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTest.java +++ /dev/null @@ -1,155 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 org.apache.drill.jdbc; - -import static org.junit.Assert.fail; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Properties; - -import com.google.common.base.Strings; - -import org.apache.drill.exec.ExecTest; -import org.apache.drill.jdbc.test.JdbcAssert; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; - -// TODO: Document this, especially what writers of unit tests need to know -// (e.g., the reusing of connections, the automatic interception of test -// failures and resetting of connections, etc.). -public class JdbcTest extends ExecTest { - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(JdbcTest.class); - - @Rule - public final TestRule watcher = new TestWatcher() { - @Override - protected void failed(Throwable e, Description description) { - reset(); - } - }; - - private static CachingConnectionFactory factory; - - @BeforeClass - public static void setUpTestCase() { - factory = new SingleConnectionCachingFactory(new ConnectionFactory() { - @Override - public Connection getConnection(ConnectionInfo info) throws Exception { - Class.forName("org.apache.drill.jdbc.Driver"); - return DriverManager.getConnection(info.getUrl(), info.getParamsAsProperties()); - } - }); - JdbcAssert.setFactory(factory); - } - - /** - * Creates a {@link java.sql.Connection connection} using default parameters. - * @param url connection URL - * @throws Exception if connection fails - */ - protected static Connection connect(String url) throws Exception { - return connect(url, JdbcAssert.getDefaultProperties()); - } - - - /** - * Creates a {@link java.sql.Connection connection} using the given parameters. - * @param url connection URL - * @param info connection info - * @throws Exception if connection fails - */ - protected static Connection connect(String url, Properties info) throws Exception { - final Connection conn = factory.getConnection(new ConnectionInfo(url, info)); - changeSchemaIfSupplied(conn, info); - return conn; - } - - /** - * Changes schema of the given connection if the field "schema" is present in {@link java.util.Properties info}. - * Does nothing otherwise. - */ - protected static void changeSchemaIfSupplied(Connection conn, Properties info) { - final String schema = info.getProperty("schema", null); - if (!Strings.isNullOrEmpty(schema)) { - changeSchema(conn, schema); - } - } - - // TODO: Purge nextUntilEnd(...) and calls when remaining fragment race - // conditions are fixed (not just DRILL-2245 fixes). - ///** - // * Calls {@link ResultSet#next} on given {@code ResultSet} until it returns - // * false. (For TEMPORARY workaround for query cancelation race condition.) - // */ - //private static void nextUntilEnd(final ResultSet resultSet) throws SQLException { - // while (resultSet.next()) { - // } - //} - - protected static void changeSchema(Connection conn, String schema) { - final String query = String.format("use %s", schema); - try ( Statement s = conn.createStatement() ) { - ResultSet r = s.executeQuery(query); - // TODO: Purge nextUntilEnd(...) and calls when remaining fragment - // race conditions are fixed (not just DRILL-2245 fixes). - // nextUntilEnd(r); - } catch (SQLException e) { - throw new RuntimeException("unable to change schema", e); - } - } - - /** - * Resets the factory closing all of the active connections. - */ - protected static void reset() { - try { - factory.closeConnections(); - } catch (SQLException e) { - throw new RuntimeException("error while closing connection factory", e); - } - } - - @AfterClass - public static void tearDownTestCase() throws Exception { - factory.closeConnections(); - } - - /** - * Test of whether tests that get connection from JdbcTest.connect(...) - * work with resetting of connections. If enabling this (failing) test method - * causes other test methods to fail, something needs to be fixed. - * (Note: Not a guaranteed test--depends on order in which test methods are - * run.) - */ - @Ignore( "Usually disabled; enable temporarily to check tests" ) - @Test - public void testJdbcTestConnectionResettingCompatibility() { - fail( "Intentional failure--did other test methods still run?" ); - } - -} http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java new file mode 100644 index 0000000..af49f7d --- /dev/null +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java @@ -0,0 +1,155 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.drill.jdbc; + +import static org.junit.Assert.fail; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; + +import com.google.common.base.Strings; + +import org.apache.drill.exec.ExecTest; +import org.apache.drill.jdbc.test.JdbcAssert; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; + +// TODO: Document this, especially what writers of unit tests need to know +// (e.g., the reusing of connections, the automatic interception of test +// failures and resetting of connections, etc.). +public class JdbcTestBase extends ExecTest { + static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(JdbcTestBase.class); + + @Rule + public final TestRule watcher = new TestWatcher() { + @Override + protected void failed(Throwable e, Description description) { + reset(); + } + }; + + private static CachingConnectionFactory factory; + + @BeforeClass + public static void setUpTestCase() { + factory = new SingleConnectionCachingFactory(new ConnectionFactory() { + @Override + public Connection getConnection(ConnectionInfo info) throws Exception { + Class.forName("org.apache.drill.jdbc.Driver"); + return DriverManager.getConnection(info.getUrl(), info.getParamsAsProperties()); + } + }); + JdbcAssert.setFactory(factory); + } + + /** + * Creates a {@link java.sql.Connection connection} using default parameters. + * @param url connection URL + * @throws Exception if connection fails + */ + protected static Connection connect(String url) throws Exception { + return connect(url, JdbcAssert.getDefaultProperties()); + } + + + /** + * Creates a {@link java.sql.Connection connection} using the given parameters. + * @param url connection URL + * @param info connection info + * @throws Exception if connection fails + */ + protected static Connection connect(String url, Properties info) throws Exception { + final Connection conn = factory.getConnection(new ConnectionInfo(url, info)); + changeSchemaIfSupplied(conn, info); + return conn; + } + + /** + * Changes schema of the given connection if the field "schema" is present in {@link java.util.Properties info}. + * Does nothing otherwise. + */ + protected static void changeSchemaIfSupplied(Connection conn, Properties info) { + final String schema = info.getProperty("schema", null); + if (!Strings.isNullOrEmpty(schema)) { + changeSchema(conn, schema); + } + } + + // TODO: Purge nextUntilEnd(...) and calls when remaining fragment race + // conditions are fixed (not just DRILL-2245 fixes). + ///** + // * Calls {@link ResultSet#next} on given {@code ResultSet} until it returns + // * false. (For TEMPORARY workaround for query cancelation race condition.) + // */ + //private static void nextUntilEnd(final ResultSet resultSet) throws SQLException { + // while (resultSet.next()) { + // } + //} + + protected static void changeSchema(Connection conn, String schema) { + final String query = String.format("use %s", schema); + try ( Statement s = conn.createStatement() ) { + ResultSet r = s.executeQuery(query); + // TODO: Purge nextUntilEnd(...) and calls when remaining fragment + // race conditions are fixed (not just DRILL-2245 fixes). + // nextUntilEnd(r); + } catch (SQLException e) { + throw new RuntimeException("unable to change schema", e); + } + } + + /** + * Resets the factory closing all of the active connections. + */ + protected static void reset() { + try { + factory.closeConnections(); + } catch (SQLException e) { + throw new RuntimeException("error while closing connection factory", e); + } + } + + @AfterClass + public static void tearDownTestCase() throws Exception { + factory.closeConnections(); + } + + /** + * Test of whether tests that get connection from JdbcTest.connect(...) + * work with resetting of connections. If enabling this (failing) test method + * causes other test methods to fail, something needs to be fixed. + * (Note: Not a guaranteed test--depends on order in which test methods are + * run.) + */ + @Ignore( "Usually disabled; enable temporarily to check tests" ) + @Test + public void testJdbcTestConnectionResettingCompatibility() { + fail( "Intentional failure--did other test methods still run?" ); + } + +} http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java index 49e41e4..4ad80d1 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java @@ -59,7 +59,7 @@ import java.sql.Statement; * {@link org.apache.drill.jdbc.impl.TypeConvertingAccessor}). * </p> */ -public class ResultSetGetMethodConversionsTest extends JdbcTest { +public class ResultSetGetMethodConversionsTest extends JdbcTestBase { private static Connection connection; private static ResultSet testDataRow; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/SingleConnectionCachingFactory.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/SingleConnectionCachingFactory.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/SingleConnectionCachingFactory.java index 7e3a51b..94ea303 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/SingleConnectionCachingFactory.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/SingleConnectionCachingFactory.java @@ -49,7 +49,7 @@ public class SingleConnectionCachingFactory implements CachingConnectionFactory if (connection == null) { connection = delegate.getConnection(info); } else { - JdbcTest.changeSchemaIfSupplied(connection, info.getParamsAsProperties()); + JdbcTestBase.changeSchemaIfSupplied(connection, info.getParamsAsProperties()); } return new NonClosableConnection(connection); } http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java index d32712d..4203c4a 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java @@ -36,14 +36,14 @@ import java.sql.Types; import org.apache.drill.common.util.TestTools; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; /** * Basic (spot-check/incomplete) tests for DRILL-2128 bugs (many * DatabaseMetaData.getColumns(...) result table problems). */ -public class Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest extends JdbcTest { +public class Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest extends JdbcTestBase { private static Connection connection; private static DatabaseMetaData dbMetadata; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java index bd993fd..113939b 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java @@ -26,7 +26,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import java.sql.Connection; import java.sql.ResultSet; @@ -34,7 +34,7 @@ import java.sql.SQLException; import java.sql.Statement; -public class Drill2439GetBooleanFailsSayingWrongTypeBugTest extends JdbcTest { +public class Drill2439GetBooleanFailsSayingWrongTypeBugTest extends JdbcTestBase { private static Connection connection; private static Statement statement; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java index d9ac3c7..f0a9eb0 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java @@ -23,7 +23,7 @@ import static org.hamcrest.CoreMatchers.*; import org.apache.drill.common.util.TestTools; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; @@ -37,7 +37,7 @@ import java.sql.Statement; import java.sql.SQLException; -public class Drill2461IntervalsBreakInfoSchemaBugTest extends JdbcTest { +public class Drill2461IntervalsBreakInfoSchemaBugTest extends JdbcTestBase { private static final String VIEW_NAME = Drill2461IntervalsBreakInfoSchemaBugTest.class.getSimpleName() + "_View"; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java index ea9c943..c355142 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java @@ -26,7 +26,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import java.sql.Connection; import java.sql.ResultSet; @@ -34,7 +34,7 @@ import java.sql.SQLException; import java.sql.Statement; -public class Drill2463GetNullsFailedWithAssertionsBugTest extends JdbcTest { +public class Drill2463GetNullsFailedWithAssertionsBugTest extends JdbcTestBase { private static Connection connection; private static Statement statement; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java index 1732e5c..0e37efa 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java @@ -48,7 +48,7 @@ import java.util.Properties; import java.util.concurrent.Executor; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import org.apache.drill.jdbc.AlreadyClosedSqlException; /** @@ -68,7 +68,7 @@ import org.apache.drill.jdbc.AlreadyClosedSqlException; * secondary objects such as {@link Clob} or {@link Array}. * </p> */ -public class Drill2489CallsAfterCloseThrowExceptionsTest extends JdbcTest { +public class Drill2489CallsAfterCloseThrowExceptionsTest extends JdbcTestBase { private static Connection closedConnection; private static Statement closedStatement; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java index f257c98..56e58dc 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java @@ -35,7 +35,7 @@ import org.apache.drill.common.logical.data.Project; import org.apache.drill.common.logical.data.Scan; import org.apache.drill.common.logical.data.Store; import org.apache.drill.common.logical.data.Union; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import org.apache.drill.jdbc.test.JdbcAssert.TestDataConnection; import org.apache.calcite.rel.core.JoinRelType; import org.junit.Assert; @@ -53,7 +53,7 @@ import com.google.common.io.Resources; @Ignore // ignore for now. -public class JdbcDataTest extends JdbcTest{ +public class JdbcDataTest extends JdbcTestBase { private static String MODEL; private static String EXPECTED; http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java index 15fe219..1950e44 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; import org.apache.drill.common.util.TestTools; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -40,7 +40,7 @@ import org.junit.runner.Description; import com.google.common.base.Stopwatch; -public class JdbcTestActionBase extends JdbcTest { +public class JdbcTestActionBase extends JdbcTestBase { // Set a timeout unless we're debugging. @Rule public TestRule TIMEOUT = TestTools.getTimeoutRule(40000); http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java index 5c0a0e5..d4eec1e 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java @@ -27,13 +27,13 @@ import java.util.concurrent.TimeUnit; import org.apache.drill.common.util.TestTools; import org.apache.drill.jdbc.DrillResultSet; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import org.junit.Rule; import org.junit.rules.TestRule; import com.google.common.base.Stopwatch; -public class JdbcTestQueryBase extends JdbcTest { +public class JdbcTestQueryBase extends JdbcTestBase { // Set a timeout unless we're debugging. @Rule public TestRule TIMEOUT = TestTools.getTimeoutRule(40000); http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java index aa68e9f..f04c2af 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java @@ -21,12 +21,12 @@ import java.nio.file.Paths; import java.sql.Date; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import org.joda.time.chrono.ISOChronology; import org.junit.Test; -public class TestAggregateFunctionsQuery extends JdbcTest { +public class TestAggregateFunctionsQuery extends JdbcTestBase { public static final String WORKING_PATH; static{ http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java index a8f47c6..35890ec 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; import org.apache.drill.common.util.TestTools; import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; +import org.apache.drill.jdbc.JdbcTestBase; import org.junit.Assert; import org.junit.Ignore; import org.junit.Rule; @@ -39,7 +39,7 @@ import org.junit.rules.TestRule; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; -public class TestJdbcDistQuery extends JdbcTest { +public class TestJdbcDistQuery extends JdbcTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcDistQuery.class); @@ -196,7 +196,7 @@ public class TestJdbcDistQuery extends JdbcTest { boolean success = false; try (Connection c = DriverManager.getConnection("jdbc:drill:zk=local", null);) { // ???? TODO: What is this currently redundant one-time loop for? (If - // it's keep around to make it easy to switch to looping multiple times + // it's kept around to make it easy to switch to looping multiple times // (e.g., for debugging) then define a constant field or local variable // for the number of iterations.) for (int x = 0; x < 1; x++) { http://git-wip-us.apache.org/repos/asf/drill/blob/60c0f86f/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java index 843c1c7..4081696 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java @@ -30,7 +30,7 @@ import org.junit.Test; import com.google.common.base.Function; -public class TestJdbcQuery extends JdbcTestQueryBase{ +public class TestJdbcQuery extends JdbcTestQueryBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcQuery.class); // TODO: Purge nextUntilEnd(...) and calls when remaining fragment race
