[groovy] 02/02: GROOVY-10159: minor tweak for the test

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit e7bf14ff3a7896c30cafa7fe481c18b68080beba
Author: Daniel Sun <su...@apache.org>
AuthorDate: Fri Jul 2 06:36:19 2021 +0800

    GROOVY-10159: minor tweak for the test
---
 .../groovy/ast/tools/ExpressionUtilsTest.groovy    | 46 ++++++++++++----------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/test/org/apache/groovy/ast/tools/ExpressionUtilsTest.groovy b/src/test/org/apache/groovy/ast/tools/ExpressionUtilsTest.groovy
index 2f6b5f7..4d8238d 100644
--- a/src/test/org/apache/groovy/ast/tools/ExpressionUtilsTest.groovy
+++ b/src/test/org/apache/groovy/ast/tools/ExpressionUtilsTest.groovy
@@ -18,39 +18,44 @@
  */
 package org.apache.groovy.ast.tools
 
-import groovy.test.GroovyTestCase
-import groovy.test.NotYetImplemented
-import groovy.transform.AutoFinal
-import org.apache.groovy.parser.antlr4.TestUtils
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.expr.BinaryExpression
 import org.codehaus.groovy.ast.expr.ConstantExpression
-import org.codehaus.groovy.control.CompilationUnit
-import org.codehaus.groovy.control.Phases
 import org.codehaus.groovy.syntax.Token
 import org.codehaus.groovy.syntax.Types
-import org.junit.Assert
+import org.junit.Test
 
-import static org.apache.groovy.parser.antlr4.util.ASTComparatorCategory.LOCATION_IGNORE_LIST
+import static org.junit.Assert.assertEquals
 
 /**
  * Testing expressions of ExpressionUtils.
  */
-@AutoFinal
-final class ExpressionUtilsTest extends GroovyTestCase {
+final class ExpressionUtilsTest {
+    @Test
+    void 'test transformBinaryConstantExpression - null + string'() {
+        ConstantExpression left = new ConstantExpression(null)
+        ConstantExpression right = new ConstantExpression('abc')
+        Token token = new Token(Types.PLUS, '+', 1, 1)
+        BinaryExpression be = new BinaryExpression(left, token, right)
+        ClassNode targetType = ClassHelper.make(String)
+        ConstantExpression actual = ExpressionUtils.transformBinaryConstantExpression(be, targetType)
+        assertEquals('nullabc', actual.value)
+    }
 
-    void 'test transformBinaryConstantExpression - null'() {
-        try {
-            ExpressionUtils.transformBinaryConstantExpression(null, null)
-        } catch(NullPointerException npe) {
-            // Pass
-            return
-        }
-        Assert.fail('Should throw NullPointerException')
+    @Test
+    void 'test transformBinaryConstantExpression - string + null'() {
+        ConstantExpression left = new ConstantExpression('abc')
+        ConstantExpression right = new ConstantExpression(null)
+        Token token = new Token(Types.PLUS, '+', 1, 1)
+        BinaryExpression be = new BinaryExpression(left, token, right)
+        ClassNode targetType = ClassHelper.make(String)
+        ConstantExpression actual = ExpressionUtils.transformBinaryConstantExpression(be, targetType)
+        assertEquals('abcnull', actual.value)
     }
 
-    void 'test transformBinaryConstantExpression - string PLUS string'() {
+    @Test
+    void 'test transformBinaryConstantExpression - string + string'() {
         ConstantExpression left = new ConstantExpression('hello, ')
         ConstantExpression right = new ConstantExpression('world!')
         Token token = new Token(Types.PLUS, '+', 1, 1)
@@ -60,7 +65,8 @@ final class ExpressionUtilsTest extends GroovyTestCase {
         assertEquals('hello, world!', actual.value)
     }
 
-    void 'test transformBinaryConstantExpression - long PLUS long'() {
+    @Test
+    void 'test transformBinaryConstantExpression - long + long'() {
         ConstantExpression left = new ConstantExpression(11111111L)
         ConstantExpression right = new ConstantExpression(11111111L)
         Token token = new Token(Types.PLUS, '+', 1, 1)