[groovy] 02/02: reinstate disabled test

[pa...@apache.org]

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

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

commit d0f8a09ff7bd943870665da17f906a057debd228
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Apr 7 13:20:11 2020 +1000

    reinstate disabled test
---
 src/test/org/codehaus/groovy/ast/ModuleNodeTest.java         |  9 +++------
 .../org/codehaus/groovy/syntax/parser/TestParserSupport.java | 12 ++++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/test/org/codehaus/groovy/ast/ModuleNodeTest.java b/src/test/org/codehaus/groovy/ast/ModuleNodeTest.java
index d816156..e38a0c6 100644
--- a/src/test/org/codehaus/groovy/ast/ModuleNodeTest.java
+++ b/src/test/org/codehaus/groovy/ast/ModuleNodeTest.java
@@ -27,14 +27,11 @@ import java.util.List;
  */
 public class ModuleNodeTest extends TestParserSupport {
 
-    public void testStatementClass_FAILS() throws Exception {
-        if (notYetImplemented()) return;
-
+    public void testStatementClass() {
         ModuleNode module = parse("x = [1, 2, 3]; println(x)", "Cheese.groovy");
+        assertFalse("Should have statements", module.getStatementBlock().isEmpty());
 
-        assertTrue("Should have statements", !module.getStatementBlock().isEmpty());
-
-        List classes = module.getClasses();
+        List<ClassNode> classes = module.getClasses();
         assertEquals("Number of classes", 1, classes.size());
 
         ClassNode classNode = (ClassNode) classes.get(0);
diff --git a/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java b/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
index 0f3f6d3..c1fa1f7 100644
--- a/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
+++ b/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
@@ -20,19 +20,19 @@ package org.codehaus.groovy.syntax.parser;
 
 import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.ast.ModuleNode;
+import org.codehaus.groovy.control.CompilationUnit;
+import org.codehaus.groovy.control.Phases;
 import org.codehaus.groovy.control.SourceUnit;
 
-
 /**
  * An abstract base class useful for AST parser related test cases
  */
 public abstract class TestParserSupport extends GroovyTestCase {
-
-    public ModuleNode parse(String text, String description) throws Exception {
+    public ModuleNode parse(String text, String description) {
         SourceUnit unit = SourceUnit.create(description, text);
-        unit.parse();
-        unit.convert();
-
+        CompilationUnit compUnit = new CompilationUnit();
+        compUnit.addSource(unit);
+        compUnit.compile(Phases.CONVERSION);
         return unit.getAST();
     }
 }