Skip to content

Commit a33f89f

Browse files
committed
Refactor AbstractTestQueries testcases for native-tests
1 parent 8884b41 commit a33f89f

File tree

6 files changed

+158
-79
lines changed

6 files changed

+158
-79
lines changed

presto-accumulo/src/test/java/com/facebook/presto/accumulo/TestAccumuloDistributedQueries.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.common.collect.ImmutableList;
2020
import com.google.common.collect.ImmutableMap;
2121
import org.intellij.lang.annotations.Language;
22+
import org.testng.annotations.Optional;
2223
import org.testng.annotations.Test;
2324

2425
import static com.facebook.presto.accumulo.AccumuloQueryRunner.createAccumuloQueryRunner;
@@ -324,7 +325,7 @@ public void testScalarSubquery()
324325
}
325326

326327
@Override
327-
public void testShowColumns()
328+
public void testShowColumns(@Optional("PARQUET") String storageFormat)
328329
{
329330
// Override base class because table descriptions for Accumulo connector include comments
330331
MaterializedResult actual = computeActual("SHOW COLUMNS FROM orders");

presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraDistributed.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.facebook.presto.testing.QueryRunner;
1818
import com.facebook.presto.tests.AbstractTestDistributedQueries;
1919
import org.testng.annotations.AfterClass;
20+
import org.testng.annotations.Optional;
2021

2122
import static com.facebook.presto.common.type.VarcharType.VARCHAR;
2223
import static com.facebook.presto.testing.MaterializedResult.resultBuilder;
@@ -114,7 +115,7 @@ public void testUpdate()
114115
}
115116

116117
@Override
117-
public void testShowColumns()
118+
public void testShowColumns(@Optional("PARQUET") String storageFormat)
118119
{
119120
MaterializedResult actual = computeActual("SHOW COLUMNS FROM orders");
120121

presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlDistributedQueries.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.airlift.tpch.TpchTable;
2424
import io.airlift.units.Duration;
2525
import org.testng.annotations.AfterClass;
26+
import org.testng.annotations.Optional;
2627
import org.testng.annotations.Test;
2728

2829
import java.io.IOException;
@@ -70,7 +71,7 @@ public final void destroy()
7071
}
7172

7273
@Override
73-
public void testShowColumns()
74+
public void testShowColumns(@Optional("PARQUET") String storageFormat)
7475
{
7576
MaterializedResult actual = computeActual("SHOW COLUMNS FROM orders");
7677

presto-oracle/src/test/java/com/facebook/presto/plugin/oracle/DisabledTestOracleDistributedQueries.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.facebook.presto.tests.AbstractTestDistributedQueries;
1919
import io.airlift.tpch.TpchTable;
2020
import org.testng.annotations.AfterClass;
21+
import org.testng.annotations.Optional;
2122
import org.testng.annotations.Test;
2223

2324
import static com.facebook.presto.common.type.VarcharType.VARCHAR;
@@ -164,7 +165,7 @@ public void testRenameColumn()
164165

165166
@Test
166167
@Override
167-
public void testShowColumns()
168+
public void testShowColumns(@Optional("PARQUET") String storageFormat)
168169
{
169170
MaterializedResult actual = computeActual("SHOW COLUMNS FROM orders");
170171

presto-singlestore/src/test/java/com/facebook/presto/plugin/singlestore/TestSingleStoreDistributedQueries.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.common.collect.ImmutableMap;
2020
import io.airlift.tpch.TpchTable;
2121
import org.testng.annotations.AfterClass;
22+
import org.testng.annotations.Optional;
2223
import org.testng.annotations.Test;
2324

2425
import static com.facebook.presto.common.type.VarcharType.VARCHAR;
@@ -60,7 +61,7 @@ public final void destroy()
6061
}
6162

6263
@Override
63-
public void testShowColumns()
64+
public void testShowColumns(@Optional("PARQUET") String storageFormat)
6465
{
6566
MaterializedResult actual = computeActual("SHOW COLUMNS FROM orders");
6667

0 commit comments

Comments
 (0)