From 31d6724e31e8cd69e47935060ffe5b7808134fee Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 8 Mar 2022 16:21:28 +0100
Subject: [PATCH] 0.2.13
- try to get configurations to work
- specify default values for boolean settings
---
.../testing/plugin/RagConnectTest.java | 8 ++++----
.../testing/plugin/RelastTest.java | 18 +++++++-----------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
index 4afbab7..5969de4 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
@@ -98,16 +98,16 @@ public abstract class RagConnectTest extends RelastTest {
}
args.add("--o=" + getRagconnect().getOutputDir());
args.add("--rootNode=" + getRagconnect().getRootNode());
- if (isTrue(getRagconnect().isLogReads())) {
+ if (valueOf(getRagconnect().isLogReads(), false)) {
args.add("--logReads");
}
- if (isTrue(getRagconnect().isLogWrites())) {
+ if (valueOf(getRagconnect().isLogWrites(), false)) {
args.add("--logWrites");
}
- if (isTrue(getRagconnect().isLogIncremental())) {
+ if (valueOf(getRagconnect().isLogIncremental(), false)) {
args.add("--logIncremental");
}
- if (isTrue(getRagconnect().isVerbose())) {
+ if (valueOf(getRagconnect().isVerbose(), false)) {
args.add("--verbose");
}
if (getRagconnect().getProtocols() != null && !getRagconnect().getProtocols().isEmpty()) {
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
index f49257e..e963068 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
@@ -76,12 +76,8 @@ public abstract class RelastTest extends DefaultTask {
runTest();
}
- protected boolean isTrue(Boolean b) {
- return b != null && b;
- }
-
- protected boolean isFalse(Boolean b) {
- return b != null && !b;
+ protected boolean valueOf(Boolean b, boolean defaultValue) {
+ return b != null ? b : defaultValue;
}
boolean isVerbose() {
@@ -131,13 +127,13 @@ public abstract class RelastTest extends DefaultTask {
args.add(file.getAbsolutePath());
}
args.add("--quiet");
- if (isFalse(getRelast().isNoWriteToFile())) {
+ if (!valueOf(getRelast().isNoWriteToFile(), false)) {
args.add("--file");
}
- if (isTrue(getRelast().isUseJastAddNames())) {
+ if (valueOf(getRelast().isUseJastAddNames(), true)) {
args.add("--useJastAddNames");
}
- if (isFalse(getRelast().isNoResolverHelper())) {
+ if (!valueOf(getRelast().isNoResolverHelper(), false)) {
args.add("--resolverHelper");
}
if (getJastadd().getJastAddList() != null) {
@@ -152,12 +148,12 @@ public abstract class RelastTest extends DefaultTask {
args.add("--grammarName=" + pathToAbsoluteProject(getRelast().getGrammarName()));
args.addAll(getRelast().getExtraOptionsOrDefault());
if (isVerbose()) {
- System.out.println("Start relast with args: " + args + " and main: " + javaExecSpec.getMainClass());
+ System.out.println("Start relast with args: " + args + " and main: " + javaExecSpec.getMainClass().getOrNull());
}
javaExecSpec.args(args);
}).assertNormalExitValue();
});
- if (isTrue(getJastadd().isSkipRun())) {
+ if (valueOf(getJastadd().isSkipRun(), false)) {
if (isVerbose()) {
System.out.println("Skipping run of JastAdd");
}
--
GitLab