groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [4/6] groovy git commit: split out LineColumn tests which differ between the old and new parsers (adjustment for master branch)
Date Sat, 13 May 2017 12:16:27 GMT
split out LineColumn tests which differ between the old and new parsers (adjustment for master
branch)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4925753d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4925753d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4925753d

Branch: refs/heads/GROOVY_2_6_X
Commit: 4925753d4e007d3faf9bb4adc832b267650d62f8
Parents: cf2ead1
Author: paulk <paulk@asert.com.au>
Authored: Fri May 12 20:43:04 2017 +1000
Committer: paulk <paulk@asert.com.au>
Committed: Sat May 13 21:59:11 2017 +1000

----------------------------------------------------------------------
 src/test/org/codehaus/groovy/ast/LineColumnCheckTest.groovy | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/4925753d/src/test/org/codehaus/groovy/ast/LineColumnCheckTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/ast/LineColumnCheckTest.groovy b/src/test/org/codehaus/groovy/ast/LineColumnCheckTest.groovy
index 43aef5a..bdf16a8 100644
--- a/src/test/org/codehaus/groovy/ast/LineColumnCheckTest.groovy
+++ b/src/test/org/codehaus/groovy/ast/LineColumnCheckTest.groovy
@@ -97,10 +97,12 @@ class LineColumnCheckTest extends ASTTest {
     @Parameterized.Parameters(name = 'Test {0}: Source: {1} Expected: {2}')
     static Iterable<Object[]> data() {
         List testdata = extractData("${TEST_FILE_PREFIX}.txt")
-        if (System.getProperty('groovy.antlr4') != 'false') {
-            testdata += extractData("${TEST_FILE_PREFIX}_antlr4.txt")
-        } else {
+        //flip if condition as per below and swap antlr2/4 ordering once antlr4 is the default
+        //if (System.getProperty('groovy.antlr4') != 'false') {
+        if (System.getProperty('groovy.antlr4') != 'true') {
             testdata += extractData("${TEST_FILE_PREFIX}_antlr2.txt")
+        } else {
+            testdata += extractData("${TEST_FILE_PREFIX}_antlr4.txt")
         }
         testdata
     }


Mime
View raw message