Skip to content

Remove unnecessary and brittle tests #16765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martint merged 1 commit into from
Mar 28, 2023
Merged

Remove unnecessary and brittle tests #16765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions core/trino-main/src/test/java/io/trino/sql/query/QueryAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,16 +470,6 @@ public QueryAssert containsAll(MaterializedResult expected)
});
}

@CanIgnoreReturnValue
public QueryAssert hasColumnNames(String... expectedColumnNames)
{
return satisfies(actual -> {
assertThat(actual.getColumnNames())
.as("Column names for query [%s]", query)
.containsExactly(expectedColumnNames);
});
}

@CanIgnoreReturnValue
public QueryAssert hasOutputTypes(List<Type> expectedTypes)
{
Expand Down
6 changes: 0 additions & 6 deletions plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1680,14 +1680,8 @@ public void testNativeQuerySelectFromTestTable()
public void testNativeQueryColumnAlias()
{
// The output column type may differ per connector. Skipping the check because it's unrelated to the test purpose.
assertThat(query(format("SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
.skippingTypesCheck()
.hasColumnNames("region_name")
.matches("VALUES 'AFRICA'");

assertThat(query(format("SELECT region_name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
.skippingTypesCheck()
.hasColumnNames("region_name")
.matches("VALUES 'AFRICA'");
}

Expand Down
6 changes: 0 additions & 6 deletions plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,7 @@ public void testTableWithOnlyUnsupportedColumns()
@Override
public void testNativeQueryColumnAlias()
{
// override because H2 uppercase column names by default
assertThat(query(format("SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
.hasColumnNames("REGION_NAME")
.matches("VALUES CAST('AFRICA' AS VARCHAR(25))");

assertThat(query(format("SELECT region_name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
.hasColumnNames("region_name")
.matches("VALUES CAST('AFRICA' AS VARCHAR(25))");
}

Expand Down
5 changes: 0 additions & 5 deletions plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,12 +750,7 @@ public void testNativeQuerySelectFromNation()
@Test
public void testNativeQueryColumnAlias()
{
assertThat(query("SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region WHERE regionkey = 0'))"))
.hasColumnNames("region_name")
.matches("VALUES CAST('AFRICA' AS VARCHAR)");

assertThat(query("SELECT region_name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region WHERE regionkey = 0'))"))
.hasColumnNames("region_name")
.matches("VALUES CAST('AFRICA' AS VARCHAR)");
}

Expand Down
5 changes: 0 additions & 5 deletions ...n/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,12 +1393,7 @@ public void testNativeQuerySelectFromNation()
@Test
public void testNativeQueryColumnAlias()
{
assertThat(query("SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region WHERE regionkey = 0 ALLOW FILTERING'))"))
.hasColumnNames("region_name")
.matches("VALUES CAST('AFRICA' AS VARCHAR)");

assertThat(query("SELECT region_name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM tpch.region WHERE regionkey = 0 ALLOW FILTERING'))"))
.hasColumnNames("region_name")
.matches("VALUES CAST('AFRICA' AS VARCHAR)");
}

Expand Down
6 changes: 0 additions & 6 deletions plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,7 @@ public void testNativeQuerySimple()
@Override
public void testNativeQueryColumnAlias()
{
// override because Oracle uppercase column names by default
assertThat(query(format("SELECT * FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
.hasColumnNames("REGION_NAME")
.matches("VALUES CAST('AFRICA' AS VARCHAR(25))");

assertThat(query(format("SELECT region_name FROM TABLE(system.query(query => 'SELECT name AS region_name FROM %s.region WHERE regionkey = 0'))", getSession().getSchema().orElseThrow())))
.hasColumnNames("region_name")
.matches("VALUES CAST('AFRICA' AS VARCHAR(25))");
}

Expand Down