Skip to content

Avoid abort in testing helper method or for-loop #22370

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
merged 1 commit into from
Jun 13, 2024
Merged

Avoid abort in testing helper method or for-loop #22370

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
5 changes: 3 additions & 2 deletions plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ public void testColumnName()
assertThatThrownBy(() -> testColumnName(columnName, requiresDelimiting(columnName)))
.isInstanceOf(RuntimeException.class)
.hasMessage("Column name must not contain '$' or '.' for INSERT: " + columnName);
abort("Insert would fail");
Copy link
Member

@findepi findepi Jun 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

retain "insert would fail" comment. this should be a TODO

// TODO: Insert would fail. The exception should be TrinoException.
continue;
}

testColumnName(columnName, requiresDelimiting(columnName));
Expand Down Expand Up @@ -1346,7 +1347,7 @@ public void testFiltersOnDereferenceColumnReadsLessData()
private void testFiltersOnDereferenceColumnReadsLessData(String expectedValue, String expectedType)
{
if (!isPushdownSupportedType(getQueryRunner().getPlannerContext().getTypeManager().fromSqlType(expectedType))) {
abort("Type doesn't support filter pushdown");
return;
}

Session sessionWithoutPushdown = Session.builder(getSession())
Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,12 @@ public void testAddAndDropColumnName()
if (columnName.equals("an'apostrophe")) {
assertThatThrownBy(() -> testAddAndDropColumnName(columnName, requiresDelimiting(columnName)))
.hasMessageContaining("Syntax error. Mismatched input");
abort("TODO");
Copy link
Member

@findepi findepi Jun 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

retain "TODO"

Copy link
Member Author

@ebyhr ebyhr Jun 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO comment already exists in this test. Additional TODO comments look redundant.

            // TODO: Investigate why these two case fail

continue;
}
if (columnName.equals("a\\backslash`")) {
assertThatThrownBy(() -> testAddAndDropColumnName(columnName, requiresDelimiting(columnName)))
.hasMessageContaining("Undefined column");
abort("TODO");
Copy link
Member

@findepi findepi Jun 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

retain "TODO"

continue;
}

testAddAndDropColumnName(columnName, requiresDelimiting(columnName));
Expand Down
6 changes: 2 additions & 4 deletions testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2735,8 +2735,7 @@ public void testSetColumnTypes()
}
catch (Exception e) {
verifyUnsupportedTypeException(e, setup.sourceColumnType);
abort("Unsupported column type: " + setup.sourceColumnType);
return;
continue;
}
try (table) {
Runnable setColumnType = () -> assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col SET DATA TYPE " + setup.newColumnType);
Expand Down Expand Up @@ -2945,8 +2944,7 @@ public void testSetFieldTypes()
}
catch (Exception e) {
verifyUnsupportedTypeException(e, setup.sourceColumnType);
abort("Unsupported column type: " + setup.sourceColumnType);
return;
continue;
}
try (table) {
Runnable setFieldType = () -> assertUpdate("ALTER TABLE " + table.getName() + " ALTER COLUMN col.field SET DATA TYPE " + setup.newColumnType);
Expand Down