drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prog...@apache.org
Subject [02/22] drill git commit: DRILL-5783, DRILL-5841, DRILL-5894: Rationalize test temp directories
Date Wed, 15 Nov 2017 01:46:48 GMT
http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java
index 7fdccca..9b85973 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java
@@ -49,8 +49,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3AscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3 ASC NULLS FIRST" )
@@ -63,8 +62,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3AscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+     withNoDefaultSchema()
          .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
                "FROM cp.`donuts.json` AS tbl \n" +
                "ORDER BY topping3 ASC NULLS LAST" )
@@ -78,8 +76,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3AscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3 ASC" )
@@ -92,8 +89,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3DescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3 DESC NULLS FIRST" )
@@ -106,8 +102,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3DescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3 DESC NULLS LAST" )
@@ -120,8 +115,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3DescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3 DESC" )
@@ -134,8 +128,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3DefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3 NULLS FIRST" )
@@ -148,7 +141,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3DefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3 NULLS LAST" )
@@ -161,8 +154,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDonutsTopping3DefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, tbl.topping[3].type AS topping3 \n" +
               "FROM cp.`donuts.json` AS tbl \n" +
               "ORDER BY topping3" )
@@ -179,8 +171,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -192,8 +183,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharAscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+     withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -206,8 +196,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -219,8 +208,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharDescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -232,8 +220,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharDescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -245,8 +232,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharDescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -258,8 +244,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharDefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -271,7 +256,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharDefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -283,8 +268,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderVarCharDefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_VarChar AS VARCHAR ) AS as_VARCHAR \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -300,8 +284,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -313,8 +296,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntAscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+      withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -327,8 +309,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -340,8 +321,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntDescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -353,8 +333,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntDescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -366,8 +345,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntDescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -379,8 +357,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntDefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -392,7 +369,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntDefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -404,8 +381,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntDefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Int AS INT ) AS as_INT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -421,8 +397,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -434,13 +409,12 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatAscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
-         .sql( "SELECT tbl.id, \n" +
+     withNoDefaultSchema()
+        .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
                "ORDER BY as_FLOAT ASC NULLS LAST" )
-         .returns( "id=3; as_FLOAT=19.0\n" +
+        .returns( "id=3; as_FLOAT=19.0\n" +
                    "id=1; as_FLOAT=180.0\n" +
                    "id=2; as_FLOAT=null"
                    );
@@ -448,8 +422,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -461,8 +434,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatDescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -474,8 +446,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatDescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -487,8 +458,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatDescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -500,8 +470,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatDefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -513,7 +482,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatDefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -525,8 +494,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderFloatDefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Float AS FLOAT ) AS as_FLOAT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -542,8 +510,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -555,8 +522,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntAscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+     withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -569,8 +535,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -582,8 +547,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntDescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -595,8 +559,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntDescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -608,8 +571,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntDescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -621,8 +583,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntDefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -634,7 +595,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntDefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -646,8 +607,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderBigIntDefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_BigInt AS BIGINT ) AS as_BIGINT \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -663,8 +623,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -676,8 +635,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateAscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+      withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -690,8 +648,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -703,8 +660,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateDescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -716,8 +672,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateDescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -729,8 +684,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateDescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -742,8 +696,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateDefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -755,7 +708,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateDefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -767,8 +720,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDateDefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Date AS DATE ) AS as_DATE \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -784,8 +736,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -797,8 +748,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalAscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+     withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -811,8 +761,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -824,8 +773,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalDescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -837,8 +785,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalDescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -850,8 +797,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalDescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -863,8 +809,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalDefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -876,7 +821,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalDefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -888,8 +833,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderIntervalDefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Interval AS INTERVAL HOUR ) AS as_INTERVAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -905,8 +849,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -918,8 +861,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalAscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+     withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -932,8 +874,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -945,8 +886,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalDescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -958,8 +898,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalDescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -971,8 +910,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalDescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -984,8 +922,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalDefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -997,7 +934,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalDefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1009,8 +946,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimalDefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal AS DECIMAL ) AS as_DECIMAL \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1028,8 +964,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5AscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1041,8 +976,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5AscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+     withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1055,8 +989,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5AscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1068,8 +1001,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5DescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1081,8 +1013,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5DescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1094,8 +1025,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5DescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1107,8 +1037,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5DefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1120,7 +1049,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5DefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1132,8 +1061,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal5DefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal5 AS DECIMAL(5) ) AS as_DECIMAL5 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1151,8 +1079,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35AscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1164,8 +1091,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35AscNullsLast() throws Exception {
-     JdbcAssert
-         .withNoDefaultSchema()
+     withNoDefaultSchema()
          .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
                "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1178,8 +1104,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35AscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1191,8 +1116,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35DescNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1204,8 +1128,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35DescNullsLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1217,8 +1140,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35DescNullsDefaultFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1230,8 +1152,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35DefaultedAscNullsFirst() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1243,7 +1164,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35DefaultedAscNullsLast() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1255,8 +1176,7 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
 
   @Test
   public void testOrderDecimal35DefaultedAscNullsDefaultLast() throws Exception {
-    JdbcAssert
-        .withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql( "SELECT tbl.id, \n" +
               "       CAST( tbl.for_Decimal35 AS DECIMAL(35) ) AS as_DECIMAL35 \n" +
               "FROM cp.`null_ordering_and_grouping_data.json` AS tbl \n" +
@@ -1265,6 +1185,4 @@ public class JdbcNullOrderingAndGroupingTest extends JdbcTestQueryBase {
                   "id=1; as_DECIMAL35=43210987654321098765432109876543210\n" +
                   "id=2; as_DECIMAL35=null" );
   }
-
-
 }

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/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 5b307d3..baabca4 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
@@ -18,16 +18,13 @@
 package org.apache.drill.jdbc.test;
 
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.drill.common.util.TestTools;
+import org.apache.drill.test.TestTools;
 import org.apache.drill.jdbc.Driver;
 import org.apache.drill.jdbc.JdbcTestBase;
 import org.junit.AfterClass;
@@ -35,34 +32,28 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
 
 import com.google.common.base.Stopwatch;
 
 public class JdbcTestActionBase extends JdbcTestBase {
   // Set a timeout unless we're debugging.
-  @Rule
-  public TestRule TIMEOUT = TestTools.getTimeoutRule(40000);
+  static Connection connection;
 
-  protected static final String WORKING_PATH;
   static {
     Driver.load();
-    WORKING_PATH = Paths.get("").toAbsolutePath().toString();
-
   }
 
-  protected void testQuery(final String sql) throws Exception {
-    testAction(new JdbcAction() {
+  @Rule
+  public TestRule TIMEOUT = TestTools.getTimeoutRule(40000);
 
-      @Override
-      public ResultSet getResult(Connection c) throws SQLException {
-        Statement s = c.createStatement();
-        ResultSet r = s.executeQuery(sql);
-        return r;
-      }
+  @BeforeClass
+  public static void openClient() throws Exception {
+    connection = connect();
+  }
 
-    });
+  @AfterClass
+  public static void closeClient() throws IOException, SQLException {
+    connection.close();
   }
 
   protected void testAction(JdbcAction action) throws Exception {
@@ -103,36 +94,7 @@ public class JdbcTestActionBase extends JdbcTestBase {
 
   }
 
-  public static interface JdbcAction {
+  public interface JdbcAction {
     ResultSet getResult(Connection c) throws SQLException;
   }
-
-  static void resetConnection() throws Exception {
-    closeClient();
-    openClient();
-  }
-
-  static Connection connection;
-
-  @BeforeClass
-  public static void openClient() throws Exception {
-    connection = DriverManager.getConnection("jdbc:drill:zk=local", JdbcAssert.getDefaultProperties());
-  }
-
-  @AfterClass
-  public static void closeClient() throws IOException, SQLException {
-    connection.close();
-  }
-
-  public final TestRule resetWatcher = new TestWatcher() {
-    @Override
-    protected void failed(Throwable e, Description description) {
-      try {
-        resetConnection();
-      } catch (Exception e1) {
-        throw new RuntimeException("Failure while resetting client.", e1);
-      }
-    }
-  };
-
 }

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/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 bde08b9..6c3289f 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
@@ -17,14 +17,13 @@
  */
 package org.apache.drill.jdbc.test;
 
-import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.Statement;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.drill.common.util.TestTools;
+import org.apache.drill.test.TestTools;
 import org.apache.drill.jdbc.DrillResultSet;
 import org.apache.drill.jdbc.Driver;
 import org.apache.drill.jdbc.JdbcTestBase;
@@ -38,16 +37,13 @@ public class JdbcTestQueryBase extends JdbcTestBase {
   @Rule
   public TestRule TIMEOUT = TestTools.getTimeoutRule(40000);
 
-  protected static final String WORKING_PATH;
   static{
     Driver.load();
-    WORKING_PATH = Paths.get("").toAbsolutePath().toString();
-
   }
 
   protected static void testQuery(String sql) throws Exception{
     boolean success = false;
-    try (Connection conn = connect("jdbc:drill:zk=local")) {
+    try (Connection conn = connect()) {
       for (int x = 0; x < 1; x++) {
         Stopwatch watch = Stopwatch.createStarted();
         Statement s = conn.createStatement();

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/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 554d428..1b78bd5 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
@@ -17,7 +17,6 @@
  */
 package org.apache.drill.jdbc.test;
 
-import java.nio.file.Paths;
 import java.sql.Date;
 
 import org.apache.drill.exec.planner.physical.PlannerSettings;
@@ -43,36 +42,31 @@ public class TestAggregateFunctionsQuery extends JdbcTestQueryBase {
     testQuery(String.format("alter session set `%s` = false", PlannerSettings.ENABLE_DECIMAL_DATA_TYPE_KEY));
   }
 
-  public static final String WORKING_PATH;
   static{
     Driver.load();
-    WORKING_PATH = Paths.get("").toAbsolutePath().toString();
-
   }
+
   @Test
   public void testDateAggFunction() throws Exception{
-    String query = new String("SELECT max(cast(HIRE_DATE as date)) as MAX_DATE, min(cast(HIRE_DATE as date)) as MIN_DATE" +
-        " FROM `employee.json`");
-
+    String query = "SELECT max(cast(HIRE_DATE as date)) as MAX_DATE, min(cast(HIRE_DATE as date)) as MIN_DATE" +
+        " FROM `employee.json`";
 
     String t  = new Date(ISOChronology.getInstance().getDateTimeMillis(1998, 1, 1, 0)).toString();
     String t1 = new Date(ISOChronology.getInstance().getDateTimeMillis(1993, 5, 1, 0)).toString();
-    //String t = new Date(1998, 1, 1).toString();
-    //String t1 = new Date(1993, 5, 1).toString();
 
-    String result = String.format("MAX_DATE="+ t + "; " + "MIN_DATE=" + t1 + "\n");
+    String result = "MAX_DATE="+ t + "; " + "MIN_DATE=" + t1 + "\n";
 
-    JdbcAssert.withFull("cp")
+    withFull("cp")
         .sql(query)
         .returns(result);
   }
 
   @Test
   public void testIntervalAggFunction() throws Exception{
-    String query = new String("select max(date_diff(date'2014-5-2', cast(HIRE_DATE as date))) as MAX_DAYS,  min(date_diff(date'2014-5-2', cast(HIRE_DATE as date))) MIN_DAYS" +
-        " FROM `employee.json`");
+    String query = "select max(date_diff(date'2014-5-2', cast(HIRE_DATE as date))) as MAX_DAYS, min(date_diff(date'2014-5-2', cast(HIRE_DATE as date))) MIN_DAYS" +
+        " FROM `employee.json`";
 
-    JdbcAssert.withFull("cp")
+    withFull("cp")
         .sql(query)
         .returns(
             "MAX_DAYS=P7671D; " +
@@ -82,14 +76,14 @@ public class TestAggregateFunctionsQuery extends JdbcTestQueryBase {
 
   @Test
   public void testDecimalAggFunction() throws Exception{
-    String query = new String("SELECT " +
+    String query = "SELECT " +
         "max(cast(EMPLOYEE_ID as decimal(9, 2))) as MAX_DEC9, min(cast(EMPLOYEE_ID as decimal(9, 2))) as MIN_DEC9," +
         "max(cast(EMPLOYEE_ID as decimal(18, 4))) as MAX_DEC18, min(cast(EMPLOYEE_ID as decimal(18, 4))) as MIN_DEC18," +
         "max(cast(EMPLOYEE_ID as decimal(28, 9))) as MAX_DEC28, min(cast(EMPLOYEE_ID as decimal(28, 9))) as MIN_DEC28," +
         "max(cast(EMPLOYEE_ID as decimal(38, 11))) as MAX_DEC38, min(cast(EMPLOYEE_ID as decimal(38, 11))) as MIN_DEC38" +
-        " FROM `employee.json`");
+        " FROM `employee.json`";
 
-    JdbcAssert.withFull("cp")
+    withFull("cp")
         .sql(query)
         .returns(
             "MAX_DEC9=1156.00; " +
@@ -103,13 +97,11 @@ public class TestAggregateFunctionsQuery extends JdbcTestQueryBase {
         );
   }
 
-
   @Test
   public void testVarCharAggFunction() throws Exception{
-    String query = new String("select max(full_name) as MAX_NAME,  min(full_name) as MIN_NAME" +
-        " FROM `employee.json`");
+    String query = "select max(full_name) as MAX_NAME, min(full_name) as MIN_NAME FROM `employee.json`";
 
-    JdbcAssert.withFull("cp")
+    withFull("cp")
         .sql(query)
         .returns(
             "MAX_NAME=Zach Lovell; " +

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
index 16a3c09..7e0934c 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
@@ -19,6 +19,7 @@ package org.apache.drill.jdbc.test;
 
 import static java.sql.ResultSetMetaData.columnNoNulls;
 import static java.sql.ResultSetMetaData.columnNullable;
+import static org.apache.drill.exec.util.StoragePluginTestUtils.DFS_TMP_SCHEMA;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
@@ -56,7 +57,6 @@ import org.junit.experimental.categories.Category;
 @Category(JdbcTest.class)
 public class TestInformationSchemaColumns extends JdbcTestBase {
 
-  private static final String VIEW_SCHEMA = "dfs_test.tmp";
   private static final String VIEW_NAME =
       TestInformationSchemaColumns.class.getSimpleName() + "_View";
 
@@ -173,7 +173,7 @@ public class TestInformationSchemaColumns extends JdbcTestBase {
     // (Note: Can't use JdbcTest's connect(...) because JdbcTest closes
     // Connection--and other JDBC objects--on test method failure, but this test
     // class uses some objects across methods.)
-    connection = new Driver().connect( "jdbc:drill:zk=local", JdbcAssert.getDefaultProperties() );
+    connection = new Driver().connect( "jdbc:drill:zk=local", getDefaultProperties());
     final Statement stmt = connection.createStatement();
 
     ResultSet util;
@@ -206,7 +206,7 @@ public class TestInformationSchemaColumns extends JdbcTestBase {
     TODO(DRILL-3253)(end) */
 
     // Create temporary test-columns view:
-    util = stmt.executeQuery( "USE dfs_test.tmp" );
+    util = stmt.executeQuery( "USE dfs.tmp" );
     assertTrue( util.next() );
     assertTrue( "Error setting schema for test: " + util.getString( 2 ), util.getBoolean( 1 ) );
 
@@ -267,48 +267,48 @@ public class TestInformationSchemaColumns extends JdbcTestBase {
 
     // Set up result rows for temporary test view and Hivetest columns:
 
-    mdrOptBOOLEAN        = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptBOOLEAN" );
+    mdrOptBOOLEAN        = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptBOOLEAN" );
 
     // TODO(DRILL-2470): Uncomment when TINYINT is implemented:
     //mdrReqTINYINT        = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqTINYINT" );
     // TODO(DRILL-2470): Uncomment when SMALLINT is implemented:
     //mdrOptSMALLINT       = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptSMALLINT" );
-    mdrReqINTEGER        = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTEGER" );
-    mdrOptBIGINT         = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptBIGINT" );
+    mdrReqINTEGER        = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTEGER" );
+    mdrOptBIGINT         = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptBIGINT" );
 
     // TODO(DRILL-2683): Uncomment when REAL is implemented:
     //mdrOptREAL           = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptREAL" );
-    mdrOptFLOAT          = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptFLOAT" );
-    mdrReqDOUBLE         = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqDOUBLE" );
-
-    mdrReqDECIMAL_5_3    = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqDECIMAL_5_3" );
-
-    mdrReqVARCHAR_10     = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqVARCHAR_10" );
-    mdrOptVARCHAR        = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptVARCHAR" );
-    mdrReqCHAR_5         = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqCHAR_5" );
-    mdrOptVARBINARY_16   = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptVARBINARY_16" );
-    mdrOptBINARY_1048576 = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptBINARY_1048576" );
-
-    mdrReqDATE           = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqDATE" );
-    mdrReqTIME           = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqTIME" );
-    mdrOptTIME_7         = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptTIME_7" );
-    mdrOptTIMESTAMP      = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrOptTIMESTAMP" );
-
-    mdrReqINTERVAL_Y     = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_Y" );
-    mdrReqINTERVAL_3Y_Mo = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3Y_Mo" );
-    mdrReqINTERVAL_Mo    = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_Mo" );
-    mdrReqINTERVAL_D     = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_D" );
-    mdrReqINTERVAL_4D_H  = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_4D_H" );
-    mdrReqINTERVAL_3D_Mi = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3D_Mi" );
-    mdrReqINTERVAL_2D_S5 = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_2D_S5" );
-    mdrReqINTERVAL_H     = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_H" );
-    mdrReqINTERVAL_1H_Mi = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_1H_Mi" );
-    mdrReqINTERVAL_3H_S1 = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3H_S1" );
-    mdrReqINTERVAL_Mi    = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_Mi" );
-    mdrReqINTERVAL_5Mi_S = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_5Mi_S" );
-    mdrReqINTERVAL_S     = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_S" );
-    mdrReqINTERVAL_3S    = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3S" );
-    mdrReqINTERVAL_3S1   = setUpRow( VIEW_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3S1" );
+    mdrOptFLOAT          = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptFLOAT" );
+    mdrReqDOUBLE         = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqDOUBLE" );
+
+    mdrReqDECIMAL_5_3    = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqDECIMAL_5_3" );
+
+    mdrReqVARCHAR_10     = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqVARCHAR_10" );
+    mdrOptVARCHAR        = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptVARCHAR" );
+    mdrReqCHAR_5         = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqCHAR_5" );
+    mdrOptVARBINARY_16   = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptVARBINARY_16" );
+    mdrOptBINARY_1048576 = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptBINARY_1048576" );
+
+    mdrReqDATE           = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqDATE" );
+    mdrReqTIME           = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqTIME" );
+    mdrOptTIME_7         = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptTIME_7" );
+    mdrOptTIMESTAMP      = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrOptTIMESTAMP" );
+
+    mdrReqINTERVAL_Y     = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_Y" );
+    mdrReqINTERVAL_3Y_Mo = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3Y_Mo" );
+    mdrReqINTERVAL_Mo    = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_Mo" );
+    mdrReqINTERVAL_D     = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_D" );
+    mdrReqINTERVAL_4D_H  = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_4D_H" );
+    mdrReqINTERVAL_3D_Mi = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3D_Mi" );
+    mdrReqINTERVAL_2D_S5 = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_2D_S5" );
+    mdrReqINTERVAL_H     = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_H" );
+    mdrReqINTERVAL_1H_Mi = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_1H_Mi" );
+    mdrReqINTERVAL_3H_S1 = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3H_S1" );
+    mdrReqINTERVAL_Mi    = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_Mi" );
+    mdrReqINTERVAL_5Mi_S = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_5Mi_S" );
+    mdrReqINTERVAL_S     = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_S" );
+    mdrReqINTERVAL_3S    = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3S" );
+    mdrReqINTERVAL_3S1   = setUpRow( DFS_TMP_SCHEMA, VIEW_NAME, "mdrReqINTERVAL_3S1" );
 
     /* TODO(DRILL-3253)(start): Update this once we have test plugin supporting all needed types.
     mdrReqARRAY   = setUpRow( "hive_test.default", "infoschematest", "listtype" );
@@ -472,7 +472,7 @@ public class TestInformationSchemaColumns extends JdbcTestBase {
 
   @Test
   public void test_TABLE_SCHEMA_hasRightValue_mdrOptBOOLEAN() throws SQLException {
-    assertThat( mdrOptBOOLEAN.getString( "TABLE_SCHEMA" ), equalTo( VIEW_SCHEMA ) );
+    assertThat( mdrOptBOOLEAN.getString( "TABLE_SCHEMA" ), equalTo( DFS_TMP_SCHEMA ) );
   }
 
   // Not bothering with other _local_view_ test columns for TABLE_SCHEM.

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/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 08617fc..b13b967 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
@@ -19,7 +19,6 @@ package org.apache.drill.jdbc.test;
 
 import java.nio.file.Paths;
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -27,11 +26,12 @@ import java.sql.Statement;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.drill.common.util.TestTools;
+import org.apache.drill.test.TestTools;
 import org.apache.drill.jdbc.Driver;
 import org.apache.drill.jdbc.JdbcTestBase;
 import org.apache.drill.categories.JdbcTest;
 import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,17 +43,17 @@ import com.google.common.collect.Lists;
 
 @Category(JdbcTest.class)
 public class TestJdbcDistQuery extends JdbcTestBase {
-  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcDistQuery.class);
-
-
   // Set a timeout unless we're debugging.
-  @Rule public TestRule TIMEOUT = TestTools.getTimeoutRule(50000);
+  @Rule
+  public TestRule TIMEOUT = TestTools.getTimeoutRule(50000);
 
-  private static final String WORKING_PATH;
   static{
     Driver.load();
-    WORKING_PATH = Paths.get("").toAbsolutePath().toString();
+  }
 
+  @BeforeClass
+  public static void setup() {
+    dirTestWatcher.copyFileToRoot(Paths.get("sample-data"));
   }
 
   // TODO:  Purge nextUntilEnd(...) and calls when remaining fragment race
@@ -69,134 +69,124 @@ public class TestJdbcDistQuery extends JdbcTestBase {
 
   @Test
   public void testSimpleQuerySingleFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, R_NAME "
-        + "from dfs_test.`%s/../../sample-data/regionsSF/`", WORKING_PATH));
+    testQuery("select R_REGIONKEY, R_NAME from dfs.`sample-data/regionsSF/`");
   }
 
   @Test
   public void testSimpleQueryMultiFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, R_NAME "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/`", WORKING_PATH));
+    testQuery("select R_REGIONKEY, R_NAME from dfs.`sample-data/regionsMF/`");
   }
 
   @Test
   public void testWhereOverSFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, R_NAME "
-        + "from dfs_test.`%s/../../sample-data/regionsSF/` "
-        + "WHERE R_REGIONKEY = 1", WORKING_PATH));
+    testQuery("select R_REGIONKEY, R_NAME from dfs.`sample-data/regionsSF/` WHERE R_REGIONKEY = 1");
   }
 
   @Test
   public void testWhereOverMFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, R_NAME "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` "
-        + "WHERE R_REGIONKEY = 1", WORKING_PATH));
+    testQuery("select R_REGIONKEY, R_NAME from dfs.`sample-data/regionsMF/` WHERE R_REGIONKEY = 1");
   }
 
 
   @Test
   public void testAggSingleFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY "
-        + "from dfs_test.`%s/../../sample-data/regionsSF/` "
-        + "group by R_REGIONKEY", WORKING_PATH));
+    testQuery("select R_REGIONKEY from dfs.`sample-data/regionsSF/` group by R_REGIONKEY");
   }
 
   @Test
   public void testAggMultiFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` "
-        + "group by R_REGIONKEY", WORKING_PATH));
+    testQuery("select R_REGIONKEY from dfs.`sample-data/regionsMF/` group by R_REGIONKEY");
   }
 
   @Test
   public void testAggOrderByDiffGKeyMultiFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, SUM(cast(R_REGIONKEY AS int)) As S "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` "
-        + "group by R_REGIONKEY ORDER BY S", WORKING_PATH));
+    testQuery("select R_REGIONKEY, SUM(cast(R_REGIONKEY AS int)) As S "
+        + "from dfs.`sample-data/regionsMF/` "
+        + "group by R_REGIONKEY ORDER BY S");
   }
 
   @Test
   public void testAggOrderBySameGKeyMultiFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, SUM(cast(R_REGIONKEY AS int)) As S "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` "
+    testQuery("select R_REGIONKEY, SUM(cast(R_REGIONKEY AS int)) As S "
+        + "from dfs.`sample-data/regionsMF/` "
         + "group by R_REGIONKEY "
-        + "ORDER BY R_REGIONKEY", WORKING_PATH));
+        + "ORDER BY R_REGIONKEY");
   }
 
   @Ignore
   @Test
   public void testJoinSingleFile() throws Exception{
-    testQuery(String.format("select T1.R_REGIONKEY "
-        + "from dfs_test.`%s/../../sample-data/regionsSF/` as T1 "
-        + "join dfs_test.`%s/../../sample-data/nationsSF/` as T2 "
-        + "on T1.R_REGIONKEY = T2.N_REGIONKEY", WORKING_PATH, WORKING_PATH));
+    testQuery("select T1.R_REGIONKEY "
+        + "from dfs.`sample-data/regionsSF/` as T1 "
+        + "join dfs.`sample-data/nationsSF/` as T2 "
+        + "on T1.R_REGIONKEY = T2.N_REGIONKEY");
   }
 
   @Ignore
   @Test
   public void testJoinMultiFile() throws Exception{
-    testQuery(String.format("select T1.R_REGIONKEY "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` as T1 "
-        + "join dfs_test.`%s/../../sample-data/nationsMF/` as T2 "
-        + "on T1.R_REGIONKEY = T2.N_REGIONKEY", WORKING_PATH, WORKING_PATH));
+    testQuery("select T1.R_REGIONKEY "
+        + "from dfs.`sample-data/regionsMF/` as T1 "
+        + "join dfs.`sample-data/nationsMF/` as T2 "
+        + "on T1.R_REGIONKEY = T2.N_REGIONKEY");
   }
 
   @Ignore
   @Test
   public void testJoinMFileWhere() throws Exception{
-    testQuery(String.format("select T1.R_REGIONKEY, T1.R_NAME "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` as T1 "
-        + "join dfs_test.`%s/../../sample-data/nationsMF/` as T2 "
+    testQuery("select T1.R_REGIONKEY, T1.R_NAME "
+        + "from dfs.`sample-data/regionsMF/` as T1 "
+        + "join dfs.`sample-data/nationsMF/` as T2 "
         + "on T1.R_REGIONKEY = T2.N_REGIONKEY "
-        + "WHERE T1.R_REGIONKEY  = 3 ", WORKING_PATH, WORKING_PATH));
+        + "WHERE T1.R_REGIONKEY  = 3 ");
   }
 
   @Test
   //NPE at ExternalSortBatch.java : 151
   public void testSortSingleFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY "
-        + "from dfs_test.`%s/../../sample-data/regionsSF/` "
-        + "order by R_REGIONKEY", WORKING_PATH));
+    testQuery("select R_REGIONKEY "
+        + "from dfs.`sample-data/regionsSF/` "
+        + "order by R_REGIONKEY");
   }
 
   @Test
   //NPE at ExternalSortBatch.java : 151
   public void testSortMultiFile() throws Exception{
-    testQuery(String.format("select R_REGIONKEY "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` "
-        + "order by R_REGIONKEY", WORKING_PATH));
+    testQuery("select R_REGIONKEY "
+        + "from dfs.`sample-data/regionsMF/` "
+        + "order by R_REGIONKEY");
   }
 
   @Test
   public void testSortMFileWhere() throws Exception{
-    testQuery(String.format("select R_REGIONKEY "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` "
+    testQuery("select R_REGIONKEY "
+        + "from dfs.`sample-data/regionsMF/` "
         + "WHERE R_REGIONKEY = 1 "
-        + "order by R_REGIONKEY ", WORKING_PATH ));
+        + "order by R_REGIONKEY");
   }
 
   @Ignore
   @Test
   public void testJoinAggSortWhere() throws Exception{
-    testQuery(String.format("select T1.R_REGIONKEY, COUNT(1) as CNT "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` as T1 "
-        + "join dfs_test.`%s/../../sample-data/nationsMF/` as T2 "
+    testQuery("select T1.R_REGIONKEY, COUNT(1) as CNT "
+        + "from dfs.`sample-data/regionsMF/` as T1 "
+        + "join dfs.`sample-data/nationsMF/` as T2 "
         + "on T1.R_REGIONKEY = T2.N_REGIONKEY "
         + "WHERE T1.R_REGIONKEY  = 3 "
         + "GROUP BY T1.R_REGIONKEY "
-        + "ORDER BY T1.R_REGIONKEY",WORKING_PATH, WORKING_PATH ));
+        + "ORDER BY T1.R_REGIONKEY");
   }
 
   @Test
   public void testSelectLimit() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, R_NAME "
-        + "from dfs_test.`%s/../../sample-data/regionsMF/` "
-        + "limit 2", WORKING_PATH));
+    testQuery("select R_REGIONKEY, R_NAME "
+        + "from dfs.`sample-data/regionsMF/` "
+        + "limit 2");
   }
 
  private void testQuery(String sql) throws Exception{
     boolean success = false;
-    try (Connection c = DriverManager.getConnection("jdbc:drill:zk=local", null);) {
+    try (Connection c = connect()) {
       // ???? TODO:  What is this currently redundant one-time loop for?  (If
       // 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
@@ -240,7 +230,7 @@ public class TestJdbcDistQuery extends JdbcTestBase {
   @Test
   public void testSchemaForEmptyResultSet() throws Exception {
     String query = "select fullname, occupation, postal_code from cp.`customer.json` where 0 = 1";
-    try (Connection c = DriverManager.getConnection("jdbc:drill:zk=local", null);) {
+    try (Connection c = connect()) {
       Statement s = c.createStatement();
       ResultSet r = s.executeQuery(query);
       ResultSetMetaData md = r.getMetaData();
@@ -258,5 +248,4 @@ public class TestJdbcDistQuery extends JdbcTestBase {
       nextUntilEnd(r);
     }
   }
-
 }

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
index f8c880d..b5f7d7c 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java
@@ -21,7 +21,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.drill.common.util.TestTools;
+import org.apache.drill.test.TestTools;
 import org.apache.drill.categories.JdbcTest;
 import org.junit.Rule;
 import org.junit.Test;
@@ -30,9 +30,6 @@ import org.junit.rules.TestRule;
 
 @Category(JdbcTest.class)
 public class TestJdbcMetadata extends JdbcTestActionBase {
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcMetadata.class);
-
-
   @Rule
   public TestRule TIMEOUT = TestTools.getTimeoutRule( 120_000 /* ms */ );
 
@@ -63,7 +60,7 @@ public class TestJdbcMetadata extends JdbcTestActionBase {
       public ResultSet getResult(Connection c) throws SQLException {
         return c.getMetaData().getSchemas("DRILL", "%fs%");
       }
-    }, 6);
+    }, 3);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/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 ca72d9f..0066753 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
@@ -19,12 +19,15 @@ package org.apache.drill.jdbc.test;
 
 import static org.junit.Assert.assertEquals;
 
+import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.sql.Types;
 
 import org.apache.drill.categories.JdbcTest;
+import org.apache.drill.jdbc.JdbcTestBase;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -33,7 +36,6 @@ import org.junit.experimental.categories.Category;
 
 @Category(JdbcTest.class)
 public class TestJdbcQuery extends JdbcTestQueryBase {
-//  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcQuery.class);
 
   // TODO:  Purge nextUntilEnd(...) and calls when remaining fragment race
   // conditions are fixed (not just DRILL-2245 fixes).
@@ -46,15 +48,20 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
   //  }
   //}
 
+  @BeforeClass
+  public static void setupFiles() {
+    dirTestWatcher.copyFileToRoot(Paths.get("sample-data"));
+  }
+
   @Test // DRILL-3635
   public void testFix3635() throws Exception {
     // When we run a CTAS query, executeQuery() should return after the table has been flushed to disk even though we
     // didn't yet receive a terminal message. To test this, we run CTAS then immediately run a query on the newly
     // created table.
 
-    final String tableName = "dfs_test.tmp.`testDDLs`";
+    final String tableName = "dfs.tmp.`testDDLs`";
 
-    try (Connection conn = connect("jdbc:drill:zk=local")) {
+    try (Connection conn = connect()) {
       Statement s = conn.createStatement();
       s.executeQuery(String.format("CREATE TABLE %s AS SELECT * FROM cp.`employee.json`", tableName));
     }
@@ -70,19 +77,19 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testCast() throws Exception{
-    testQuery(String.format("select R_REGIONKEY, cast(R_NAME as varchar(15)) as region, cast(R_COMMENT as varchar(255)) as comment from dfs_test.`%s/../../sample-data/region.parquet`", WORKING_PATH));
+    testQuery("select R_REGIONKEY, cast(R_NAME as varchar(15)) as region, cast(R_COMMENT as varchar(255)) as comment from dfs.`sample-data/region.parquet`");
   }
 
   @Test
   @Ignore
   public void testWorkspace() throws Exception{
-    testQuery(String.format("select * from dfs_test.home.`%s/../../sample-data/region.parquet`", WORKING_PATH));
+    testQuery("select * from dfs.root.`sample-data/region.parquet`");
   }
 
   @Test
   @Ignore
   public void testWildcard() throws Exception{
-    testQuery(String.format("select * from dfs_test.`%s/../../sample-data/region.parquet`", WORKING_PATH));
+    testQuery("select * from dfs.`sample-data/region.parquet`");
   }
 
   @Test
@@ -98,24 +105,24 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
   @Test
   @Ignore
   public void testLogicalExplain() throws Exception{
-    testQuery(String.format("EXPLAIN PLAN WITHOUT IMPLEMENTATION FOR select * from dfs_test.`%s/../../sample-data/region.parquet`", WORKING_PATH));
+    testQuery("EXPLAIN PLAN WITHOUT IMPLEMENTATION FOR select * from dfs.`sample-data/region.parquet`");
   }
 
   @Test
   @Ignore
   public void testPhysicalExplain() throws Exception{
-    testQuery(String.format("EXPLAIN PLAN FOR select * from dfs_test.`%s/../../sample-data/region.parquet`", WORKING_PATH));
+    testQuery("EXPLAIN PLAN FOR select * from dfs.`sample-data/region.parquet`");
   }
 
   @Test
   @Ignore
   public void checkUnknownColumn() throws Exception{
-    testQuery(String.format("SELECT unknownColumn FROM dfs_test.`%s/../../sample-data/region.parquet`", WORKING_PATH));
+    testQuery("SELECT unknownColumn FROM dfs.`sample-data/region.parquet`");
   }
 
   @Test
   public void testLikeNotLike() throws Exception{
-    JdbcAssert.withNoDefaultSchema()
+    withNoDefaultSchema()
       .sql("SELECT TABLE_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS " +
         "WHERE TABLE_NAME NOT LIKE 'C%' AND COLUMN_NAME LIKE 'TABLE_%E'")
       .returns(
@@ -127,7 +134,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testSimilarNotSimilar() throws Exception{
-    JdbcAssert.withNoDefaultSchema()
+    withNoDefaultSchema()
       .sql("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.`TABLES` "+
         "WHERE TABLE_NAME SIMILAR TO '%(H|I)E%' AND TABLE_NAME NOT SIMILAR TO 'C%' ORDER BY TABLE_NAME")
       .returns(
@@ -139,14 +146,14 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testIntegerLiteral() throws Exception{
-    JdbcAssert.withNoDefaultSchema()
+    withNoDefaultSchema()
       .sql("select substring('asd' from 1 for 2) from INFORMATION_SCHEMA.`TABLES` limit 1")
       .returns("EXPR$0=as\n");
   }
 
   @Test
   public void testNullOpForNullableType() throws Exception{
-    JdbcAssert.withNoDefaultSchema()
+    withNoDefaultSchema()
         .sql("SELECT * FROM cp.`test_null_op.json` WHERE intType IS NULL AND varCharType IS NOT NULL")
         .returns("intType=null; varCharType=val2");
   }
@@ -154,7 +161,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
   @Test
   public void testNullOpForNonNullableType() throws Exception{
     // output of (intType IS NULL) is a non-nullable type
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT * FROM cp.`test_null_op.json` "+
             "WHERE (intType IS NULL) IS NULL AND (varCharType IS NOT NULL) IS NOT NULL")
         .returns("");
@@ -162,22 +169,22 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testTrueOpForNullableType() throws Exception{
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE booleanType IS TRUE")
         .returns("data=set to true");
 
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE booleanType IS FALSE")
         .returns("data=set to false");
 
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE booleanType IS NOT TRUE")
         .returns(
             "data=set to false\n" +
             "data=not set"
         );
 
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE booleanType IS NOT FALSE")
         .returns(
             "data=set to true\n" +
@@ -188,22 +195,22 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
   @Test
   public void testTrueOpForNonNullableType() throws Exception{
     // Output of IS TRUE (and others) is a Non-nullable type
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE (booleanType IS TRUE) IS TRUE")
         .returns("data=set to true");
 
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE (booleanType IS FALSE) IS FALSE")
         .returns(
             "data=set to true\n" +
             "data=not set"
         );
 
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE (booleanType IS NOT TRUE) IS NOT TRUE")
         .returns("data=set to true");
 
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT data FROM cp.`test_true_false_op.json` WHERE (booleanType IS NOT FALSE) IS NOT FALSE")
         .returns(
             "data=set to true\n" +
@@ -213,7 +220,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testDateTimeAccessors() throws Exception{
-    JdbcAssert.withNoDefaultSchema().withConnection(new Function<Connection, Void>() {
+    withNoDefaultSchema().withConnection(new Function<Connection, Void>() {
       public Void apply(Connection connection) {
         try {
           final Statement statement = connection.createStatement();
@@ -258,7 +265,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testVerifyMetadata() throws Exception{
-    JdbcAssert.withNoDefaultSchema().withConnection(new Function<Connection, Void>() {
+     withNoDefaultSchema().withConnection(new Function<Connection, Void>() {
       public Void apply(Connection connection) {
         try {
           final Statement statement = connection.createStatement();
@@ -270,7 +277,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
           assertEquals( Types.TIMESTAMP, resultSet.getMetaData().getColumnType(1) );
           assertEquals( Types.DATE, resultSet.getMetaData().getColumnType(2) );
 
-          System.out.println(JdbcAssert.toString(resultSet));
+          System.out.println(JdbcTestBase.toString(resultSet));
           resultSet.close();
           statement.close();
           return null;
@@ -283,7 +290,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testCaseWithNoElse() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT employee_id, CASE WHEN employee_id < 100 THEN first_name END from cp.`employee.json` " +
             "WHERE employee_id = 99 OR employee_id = 100")
         .returns(
@@ -294,7 +301,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testCaseWithElse() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT employee_id, CASE WHEN employee_id < 100 THEN first_name ELSE 'Test' END from cp.`employee.json` " +
             "WHERE employee_id = 99 OR employee_id = 100")
         .returns(
@@ -305,7 +312,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testCaseWith2ThensAndNoElse() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT employee_id, CASE WHEN employee_id < 100 THEN first_name WHEN employee_id = 100 THEN last_name END " +
             "from cp.`employee.json` " +
             "WHERE employee_id = 99 OR employee_id = 100 OR employee_id = 101")
@@ -318,7 +325,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testCaseWith2ThensAndElse() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT employee_id, CASE WHEN employee_id < 100 THEN first_name WHEN employee_id = 100 THEN last_name ELSE 'Test' END " +
             "from cp.`employee.json` " +
             "WHERE employee_id = 99 OR employee_id = 100 OR employee_id = 101")
@@ -331,7 +338,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testAggWithDrillFunc() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT extract(year from max(to_timestamp(hire_date, 'yyyy-MM-dd HH:mm:SS.SSS' ))) as MAX_YEAR " +
             "from cp.`employee.json` ")
         .returns(
@@ -341,7 +348,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testLeftRightReplace() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT `left`('abcdef', 2) as LEFT_STR, `right`('abcdef', 2) as RIGHT_STR, `replace`('abcdef', 'ab', 'zz') as REPLACE_STR " +
             "from cp.`employee.json` limit 1")
         .returns(
@@ -353,7 +360,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testLengthUTF8VarCharInput() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("select length('Sheri', 'UTF8') as L_UTF8 " +
             "from cp.`employee.json` where employee_id = 1")
         .returns(
@@ -363,7 +370,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test
   public void testTimeIntervalAddOverflow() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("select extract(hour from (interval '10 20' day to hour + time '10:00:00')) as TIME_INT_ADD " +
             "from cp.`employee.json` where employee_id = 1")
         .returns(
@@ -373,8 +380,8 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test // DRILL-1051
   public void testOldDateTimeJulianCalendar() throws Exception {
-    // Should work with any timezone
-    JdbcAssert.withNoDefaultSchema()
+     // Should work with any timezone
+     withNoDefaultSchema()
         .sql("select cast(to_timestamp('1581-12-01 23:32:01', 'yyyy-MM-dd HH:mm:ss') as date) as `DATE`, " +
             "to_timestamp('1581-12-01 23:32:01', 'yyyy-MM-dd HH:mm:ss') as `TIMESTAMP`, " +
             "cast(to_timestamp('1581-12-01 23:32:01', 'yyyy-MM-dd HH:mm:ss') as time) as `TIME` " +
@@ -384,8 +391,8 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test // DRILL-1051
   public void testOldDateTimeLocalMeanTime() throws Exception {
-    // Should work with any timezone
-    JdbcAssert.withNoDefaultSchema()
+     // Should work with any timezone
+     withNoDefaultSchema()
         .sql("select cast(to_timestamp('1883-11-16 01:32:01', 'yyyy-MM-dd HH:mm:ss') as date) as `DATE`, " +
             "to_timestamp('1883-11-16 01:32:01', 'yyyy-MM-dd HH:mm:ss') as `TIMESTAMP`, " +
             "cast(to_timestamp('1883-11-16 01:32:01', 'yyyy-MM-dd HH:mm:ss') as time) as `TIME` " +
@@ -395,9 +402,8 @@ public class TestJdbcQuery extends JdbcTestQueryBase {
 
   @Test // DRILL-5792
   public void testConvertFromInEmptyInputSql() throws Exception {
-    JdbcAssert.withNoDefaultSchema()
+     withNoDefaultSchema()
         .sql("SELECT CONVERT_FROM(columns[1], 'JSON') as col1 from cp.`empty.csv`")
         .returns("");
   }
-
 }

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestLegacyJdbcMetadata.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestLegacyJdbcMetadata.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestLegacyJdbcMetadata.java
index 97f7931..caa9da1 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestLegacyJdbcMetadata.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestLegacyJdbcMetadata.java
@@ -28,7 +28,7 @@ import org.junit.BeforeClass;
 public class TestLegacyJdbcMetadata extends TestJdbcMetadata {
   @BeforeClass
   public static void openClient() throws Exception {
-    Properties defaultProperties = JdbcAssert.getDefaultProperties();
+    Properties defaultProperties = getDefaultProperties();
     defaultProperties.setProperty("server.metadata.disabled", "true");
 
     connection = DriverManager.getConnection("jdbc:drill:zk=local", defaultProperties);

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/exec/memory/base/src/main/java/org/apache/drill/exec/memory/ChildAllocator.java
----------------------------------------------------------------------
diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/ChildAllocator.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/ChildAllocator.java
index 1e4e030..c9aa758 100644
--- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/ChildAllocator.java
+++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/ChildAllocator.java
@@ -30,16 +30,13 @@ class ChildAllocator extends BaseAllocator {
   /**
    * Constructor.
    *
-   * @param parentAllocator parent allocator -- the one creating this child
-   * @param allocatorOwner a handle to the object making the request
-   * @param allocationPolicy the allocation policy to use; the policy for all
-   *   allocators must match for each invocation of a drillbit
-   * @param initReservation initial amount of space to reserve (obtained from the parent)
+   * @param parentAllocator parent allocator -- the one creating this child.
+   * @param name The name of the allocator.
+   * @param initReservation initial amount of space to reserve (obtained from the parent).
    * @param maxAllocation maximum amount of space that can be obtained from this allocator;
    *   note this includes direct allocations (via {@see BufferAllocator#buffer(int, int)}
    *   et al) and requests from descendant allocators. Depending on the allocation policy in
-   *   force, even less memory may be available
-   * @param flags one or more of BaseAllocator.F_* flags
+   *   force, even less memory may be available.
    */
   ChildAllocator(
       BaseAllocator parentAllocator,

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
----------------------------------------------------------------------
diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
index 2b6fde0..63f4528 100644
--- a/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
+++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java
@@ -31,8 +31,6 @@ import org.apache.drill.exec.record.MaterializedField;
 import org.apache.drill.exec.record.TransferPair;
 
 public abstract class BaseValueVector implements ValueVector {
-//  private static final Logger logger = LoggerFactory.getLogger(BaseValueVector.class);
-
   /**
    * Physical maximum allocation. This is the value prior to Drill 1.11.
    * This size causes memory fragmentation. Please use

http://git-wip-us.apache.org/repos/asf/drill/blob/acc5ed92/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java
----------------------------------------------------------------------
diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java
index 5125626..a090cad 100644
--- a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java
+++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java
@@ -20,6 +20,7 @@ package org.apache.drill.exec.vector;
 import java.io.Closeable;
 import java.util.Set;
 
+import com.google.common.annotations.VisibleForTesting;
 import io.netty.buffer.DrillBuf;
 
 import org.apache.drill.exec.exception.OutOfMemoryException;


Mime
View raw message