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 2020/06/13 09:36:25 UTC
[groovy] branch master updated: GROOVY-9585 preparatory work plus
fix typo
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
The following commit(s) were added to refs/heads/master by this push:
new 9038ccb GROOVY-9585 preparatory work plus fix typo
9038ccb is described below
commit 9038ccb498fe725549a9b90e2fc3244e4564000f
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Jun 13 19:36:01 2020 +1000
GROOVY-9585 preparatory work plus fix typo
---
.../groovy/control/CompilerConfiguration.java | 2 ++
.../groovy/control/CompilerConfigurationTest.java | 21 +++++++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 468da4b..e65e6db 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -491,6 +491,8 @@ public class CompilerConfiguration {
if (jointCompilationOptions != null) {
jointCompilationOptions = new HashMap<>(jointCompilationOptions);
}
+ // TODO GROOVY-9585: add line below once gradle build issues fixed
+// compilationCustomizers.addAll(configuration.getCompilationCustomizers());
setJointCompilationOptions(jointCompilationOptions);
setPluginFactory(configuration.getPluginFactory());
setDisabledGlobalASTTransformations(configuration.getDisabledGlobalASTTransformations());
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index 90561b7..af3308f 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.control;
+import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.codehaus.groovy.control.messages.WarningMessage;
import org.junit.After;
import org.junit.Before;
@@ -110,10 +111,11 @@ public final class CompilerConfigurationTest {
init.setTargetBytecode(CompilerConfiguration.JDK5);
init.setRecompileGroovySource(true);
init.setClasspath("File1" + File.pathSeparator + "Somewhere");
- File tergetDirectory = new File("A wandering path");
- init.setTargetDirectory(tergetDirectory);
+ File targetDirectory = new File("A wandering path");
+ init.setTargetDirectory(targetDirectory);
init.setDefaultScriptExtension(".jpp");
init.setJointCompilationOptions(Collections.singletonMap("somekey", "somevalue"));
+ init.addCompilationCustomizers(new ImportCustomizer().addStarImports("groovy.transform"));
ParserPluginFactory pluginFactory = ParserPluginFactory.antlr4();
init.setPluginFactory(pluginFactory);
@@ -129,10 +131,11 @@ public final class CompilerConfigurationTest {
assertEquals(Boolean.TRUE, init.getRecompileGroovySource());
assertEquals("File1", init.getClasspath().get(0));
assertEquals("Somewhere", init.getClasspath().get(1));
- assertEquals(tergetDirectory, init.getTargetDirectory());
+ assertEquals(targetDirectory, init.getTargetDirectory());
assertEquals(".jpp", init.getDefaultScriptExtension());
assertEquals("somevalue", init.getJointCompilationOptions().get("somekey"));
assertEquals(pluginFactory, init.getPluginFactory());
+ assertEquals(1, init.getCompilationCustomizers().size());
//
@@ -149,10 +152,12 @@ public final class CompilerConfigurationTest {
assertEquals(Boolean.TRUE, config.getRecompileGroovySource());
assertEquals("File1", config.getClasspath().get(0));
assertEquals("Somewhere", config.getClasspath().get(1));
- assertEquals(tergetDirectory, config.getTargetDirectory());
+ assertEquals(targetDirectory, config.getTargetDirectory());
assertEquals(".jpp", config.getDefaultScriptExtension());
assertEquals("somevalue", config.getJointCompilationOptions().get("somekey"));
assertEquals(pluginFactory, config.getPluginFactory());
+ // TODO GROOVY-9585: re-enable below assertion once prod code is fixed
+// assertEquals(1, config.getCompilationCustomizers().size());
}
@Test
@@ -170,8 +175,8 @@ public final class CompilerConfigurationTest {
init.setTargetBytecode(CompilerConfiguration.JDK5);
init.setRecompileGroovySource(false);
init.setClasspath("");
- File tergetDirectory = new File("A wandering path");
- init.setTargetDirectory(tergetDirectory);
+ File targetDirectory = new File("A wandering path");
+ init.setTargetDirectory(targetDirectory);
assertEquals(WarningMessage.POSSIBLE_ERRORS, init.getWarningLevel());
assertEquals(Boolean.FALSE, init.getDebug());
@@ -184,7 +189,7 @@ public final class CompilerConfigurationTest {
assertEquals(CompilerConfiguration.JDK5, init.getTargetBytecode());
assertEquals(Boolean.FALSE, init.getRecompileGroovySource());
assertEquals(Collections.emptyList(), init.getClasspath());
- assertEquals(tergetDirectory, init.getTargetDirectory());
+ assertEquals(targetDirectory, init.getTargetDirectory());
//
@@ -200,6 +205,6 @@ public final class CompilerConfigurationTest {
assertEquals(CompilerConfiguration.JDK5, config.getTargetBytecode());
assertEquals(Boolean.FALSE, config.getRecompileGroovySource());
assertEquals(Collections.emptyList(), config.getClasspath());
- assertEquals(tergetDirectory, config.getTargetDirectory());
+ assertEquals(targetDirectory, config.getTargetDirectory());
}
}