Fix test method overrides

trinodb · Oct 30, 2019 · 964e496 · 964e496
1 parent f4e5002
commit 964e496
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/...earch/src/test/java/io/prestosql/elasticsearch/TestElasticsearchIntegrationSmokeTest.java b/...earch/src/test/java/io/prestosql/elasticsearch/TestElasticsearchIntegrationSmokeTest.java
@@ -75,31 +75,13 @@ public final void destroy()
     }
 
     @Test
+    @Override
     public void testSelectAll()
     {
         // List columns explicitly, as there's no defined order in Elasticsearch
         assertQuery("SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment  FROM orders");
     }
 
-    @Test
-    public void testRangePredicate()
-    {
-        // List columns explicitly, as there's no defined order in Elasticsearch
-        assertQuery("" +
-                "SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment " +
-                "FROM orders " +
-                "WHERE orderkey BETWEEN 10 AND 50");
-    }
-
-    @Test
-    public void testMultipleRangesPredicate()
-    {
-        assertQuery("" +
-                "SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment " +
-                "FROM orders " +
-                "WHERE orderkey BETWEEN 10 AND 50 OR orderkey BETWEEN 100 AND 150");
-    }
-
     @Test
     @Override
     public void testDescribeTable()

diff --git a/presto-tests/src/main/java/io/prestosql/tests/AbstractTestIntegrationSmokeTest.java b/presto-tests/src/main/java/io/prestosql/tests/AbstractTestIntegrationSmokeTest.java
@@ -86,13 +86,21 @@ public void testLimit()
     @Test
     public void testMultipleRangesPredicate()
     {
-        assertQuery("SELECT * FROM orders WHERE orderkey BETWEEN 10 AND 50 OR orderkey BETWEEN 100 AND 150");
+        // List columns explicitly. Some connectors do not maintain column ordering.
+        assertQuery("" +
+                "SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment " +
+                "FROM orders " +
+                "WHERE orderkey BETWEEN 10 AND 50");
     }
 
     @Test
     public void testRangePredicate()
     {
-        assertQuery("SELECT * FROM orders WHERE orderkey BETWEEN 10 AND 50");
+        // List columns explicitly. Some connectors do not maintain column ordering.
+        assertQuery("" +
+                "SELECT orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment " +
+                "FROM orders " +
+                "WHERE orderkey BETWEEN 10 AND 50");
     }
 
     @Test