groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cchamp...@apache.org
Subject [14/20] groovy git commit: Fix test for Gradle 4.4 setup
Date Tue, 12 Dec 2017 22:07:57 GMT
Fix test for Gradle 4.4 setup


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

Branch: refs/heads/GROOVY_2_5_X
Commit: b8d14e320639d62cb5cf88dc62956d69b0f54baf
Parents: c71e0e7
Author: Cedric Champeau <cchampeau@apache.org>
Authored: Tue Dec 12 21:00:47 2017 +0100
Committer: Cedric Champeau <cchampeau@apache.org>
Committed: Tue Dec 12 22:13:51 2017 +0100

----------------------------------------------------------------------
 .../src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml     | 2 +-
 .../src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy | 2 +-
 .../src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java   | 2 +-
 .../src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/b8d14e32/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
index 5e2afba..05e33f4 100644
--- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
+++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
@@ -23,7 +23,7 @@
 <project name="Test Groovyc Task" default="test1">
 
     <property name="srcPath" value="."/>
-    <property name="destPath" value="${user.dir}/target/classes/test"/>
+    <property name="destPath" value="${user.dir}/target/classes/groovy/test"/>
 
     <property name="javaVersion" value="6"/>
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/b8d14e32/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
index a0694ab..32e73ac 100644
--- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
+++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
@@ -20,6 +20,6 @@ package org.codehaus.groovy.ant
 
 class GroovycTest1 {
   static void main ( String[] args ) {
-    ( new File ( 'target/classes/test/org/codehaus/groovy/ant/GroovycTest1_Result.txt' )
).write ( 'OK.' )
+    ( new File ( 'target/classes/groovy/test/org/codehaus/groovy/ant/GroovycTest1_Result.txt'
) ).write ( 'OK.' )
   }
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/b8d14e32/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
index d7ef1d5..57b2f2b 100644
--- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
+++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 
 class GroovycTest2 {
     static void main(String[] args) throws IOException {
-        File f = new File("target/classes/test/org/codehaus/groovy/ant/GroovycTest2_Result.txt");
+        File f = new File("target/classes/groovy/test/org/codehaus/groovy/ant/GroovycTest2_Result.txt");
         FileOutputStream fout = new FileOutputStream(f);
         try {
             fout.write("OK.".getBytes());

http://git-wip-us.apache.org/repos/asf/groovy/blob/b8d14e32/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
index 26b9790..70f7b9f 100644
--- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
+++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
  * @author Russel Winder
  */
 public class GroovycTest extends GroovyTestCase {
-    private final String classDirectory = "target/classes/test/org/codehaus/groovy/ant/";
+    private final String classDirectory = "target/classes/groovy/test/org/codehaus/groovy/ant/";
     private final File antFile = new File("src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml");
     private Project project;
     private static boolean warned = false;


Mime
View raw message