Skip to content

Migrate various tests to new assertions #14528

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 15 commits into from
Nov 1, 2022
Merged

Migrate various tests to new assertions #14528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
60516a6
Migrate TestRowOperators to new assertions
martint Oct 7, 2022
6d1a0e7
Migrate TestDateTimeFunctions to new assertions
martint Oct 8, 2022
ca66c47
Use switch expression
martint Oct 8, 2022
c44a4da
Migrate TestExpressionCompiler to new assertions
martint Oct 7, 2022
ed2092a
Remove support for parallel execution in TestExpressioCompiler
martint Oct 10, 2022
c498c92
Migrate test to JUnit 5
martint Oct 10, 2022
c2dc74a
Rename methods
martint Oct 10, 2022
dcbc2ce
Remove unused methods
martint Oct 8, 2022
cd94908
Add support for registering plugin in QueryAssert
martint Oct 10, 2022
32b577c
Migrate TestGeometryUnionGeoAggregation to new assertions
martint Oct 10, 2022
0d9bd37
Migrate test to JUnit 5
martint Oct 10, 2022
0bec60e
Migrate TestGeoFunctions to new assertions
martint Oct 10, 2022
c797bca
Migrate test to JUnit 5
martint Oct 10, 2022
3c12def
Migrate TestBingTileFunctions to new assertions
martint Oct 10, 2022
6955167
Remove desugaring transformations in tests
martint Sep 24, 2022
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
9 changes: 0 additions & 9 deletions core/trino-main/src/test/java/io/trino/operator/scalar/AbstractTestFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@
import static io.trino.metadata.OperatorNameUtil.mangleOperatorName;
import static io.trino.operator.scalar.timestamp.VarcharToTimestampCast.castToLongTimestamp;
import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
import static io.trino.spi.type.DecimalType.createDecimalType;
import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import static org.testng.Assert.fail;
Expand Down Expand Up @@ -151,13 +149,6 @@ protected void assertCachedInstanceHasBoundedRetainedSize(String projection)
functionAssertions.assertCachedInstanceHasBoundedRetainedSize(projection);
}

protected void assertNotSupported(String projection, String message)
{
assertTrinoExceptionThrownBy(() -> functionAssertions.executeProjectionWithFullEngine(projection))
.hasErrorCode(NOT_SUPPORTED)
.hasMessage(message);
}

protected void tryEvaluateWithAll(String projection, Type expectedType)
{
functionAssertions.tryEvaluateWithAll(projection, expectedType);
Expand Down
10 changes: 0 additions & 10 deletions core/trino-main/src/test/java/io/trino/operator/scalar/FunctionAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,6 @@ public final class FunctionAssertions
private final LocalQueryRunner runner;
private final TestingFunctionResolution testingFunctionResolution;

public FunctionAssertions()
{
this(TEST_SESSION);
}

public FunctionAssertions(Session session)
{
this(session, new FeaturesConfig());
Expand Down Expand Up @@ -635,11 +630,6 @@ private Object selectSingleValue(Operator operator, Type type)
return type.getObjectValue(session.toConnectorSession(), block, 0);
}

public void assertFilter(String filter, boolean expected, boolean withNoInputColumns)
{
assertFilter(filter, expected, withNoInputColumns, runner.getExpressionCompiler());
}

private void assertFilter(String filter, boolean expected, boolean withNoInputColumns, ExpressionCompiler compiler)
{
List<Boolean> results = executeFilterWithAll(filter, TEST_SESSION, withNoInputColumns, compiler);
Expand Down
1,783 changes: 838 additions & 945 deletions core/trino-main/src/test/java/io/trino/operator/scalar/TestDateTimeFunctions.java
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 1 addition & 8 deletions core/trino-main/src/test/java/io/trino/sql/ExpressionTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@
import io.trino.sql.analyzer.ExpressionAnalyzer;
import io.trino.sql.analyzer.Scope;
import io.trino.sql.parser.SqlParser;
import io.trino.sql.planner.DesugarArrayConstructorRewriter;
import io.trino.sql.planner.DesugarLikeRewriter;
import io.trino.sql.planner.TypeProvider;
import io.trino.sql.planner.assertions.ExpressionVerifier;
import io.trino.sql.planner.assertions.SymbolAliases;
import io.trino.sql.planner.iterative.rule.CanonicalizeExpressionRewriter;
import io.trino.sql.tree.Cast;
import io.trino.sql.tree.Expression;
import io.trino.sql.tree.ExpressionRewriter;
Expand Down Expand Up @@ -104,11 +101,7 @@ public static Expression planExpression(PlannerContext plannerContext, Session s

private static Expression planExpressionInExistingTx(PlannerContext plannerContext, TypeProvider typeProvider, Expression expression, Session transactionSession)
{
Expression rewritten = rewriteIdentifiersToSymbolReferences(expression);
rewritten = DesugarLikeRewriter.rewrite(rewritten, transactionSession, plannerContext.getMetadata(), createTestingTypeAnalyzer(plannerContext), typeProvider);
rewritten = DesugarArrayConstructorRewriter.rewrite(rewritten, transactionSession, plannerContext.getMetadata(), createTestingTypeAnalyzer(plannerContext), typeProvider);
rewritten = CanonicalizeExpressionRewriter.rewrite(rewritten, transactionSession, plannerContext, createTestingTypeAnalyzer(plannerContext), typeProvider);
return resolveFunctionCalls(plannerContext, transactionSession, typeProvider, rewritten);
return resolveFunctionCalls(plannerContext, transactionSession, typeProvider, rewriteIdentifiersToSymbolReferences(expression));
}

public static Expression resolveFunctionCalls(PlannerContext plannerContext, Session session, TypeProvider typeProvider, Expression expression)
Expand Down
Loading