Extract method for processing input string in test

trinodb · Jan 21, 2022 · 5344c78 · 5344c78
1 parent 3fab98f
commit 5344c78
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyExpressions.java b/...trino-main/src/test/java/io/trino/sql/planner/iterative/rule/TestSimplifyExpressions.java
@@ -244,13 +244,16 @@ public void testCastRealToBoundedVarchar()
 
     private static void assertSimplifies(String expression, String expected)
     {
-        ParsingOptions parsingOptions = new ParsingOptions();
-        Expression actualExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expression, parsingOptions));
-        Expression expectedExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected, parsingOptions));
-        Expression rewritten = rewrite(actualExpression, TEST_SESSION, new SymbolAllocator(booleanSymbolTypeMapFor(actualExpression)), PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT));
+        Expression expectedExpression = normalize(rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expected, new ParsingOptions())));
         assertEquals(
-                normalize(rewritten),
-                normalize(expectedExpression));
+                simplify(expression),
+                expectedExpression);
+    }
+
+    private static Expression simplify(String expression)
+    {
+        Expression actualExpression = rewriteIdentifiersToSymbolReferences(SQL_PARSER.createExpression(expression, new ParsingOptions()));
+        return normalize(rewrite(actualExpression, TEST_SESSION, new SymbolAllocator(booleanSymbolTypeMapFor(actualExpression)), PLANNER_CONTEXT, createTestingTypeAnalyzer(PLANNER_CONTEXT)));
     }
 
     private static Map<Symbol, Type> booleanSymbolTypeMapFor(Expression expression)