You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/05/12 10:43:24 UTC
[4/4] groovy git commit: split out LineColumn tests which differ
between the old and new parsers (adjustment for master branch)
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/92ec412c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/92ec412c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/92ec412c
Branch: refs/heads/master
Commit: 92ec412cb385c013f813b5d644755a4714e826f0
Parents: a0e8e52
Author: paulk <pa...@asert.com.au>
Authored: Fri May 12 20:43:04 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri May 12 20:43:04 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/92ec412c/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
}