From 4d1d79e30929ae97460a189499e26cb7ebada2d8 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 5 Jun 2020 16:49:55 +0200
Subject: [PATCH] Small cleanup of build.gradle in tests

---
 .../jastadd/relast/plugin/CompilerLocationExtension.java  | 2 +-
 ros2rag.tests/build.gradle                                | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/java/org/jastadd/relast/plugin/CompilerLocationExtension.java b/buildSrc/src/main/java/org/jastadd/relast/plugin/CompilerLocationExtension.java
index 7580e2d..d28d713 100644
--- a/buildSrc/src/main/java/org/jastadd/relast/plugin/CompilerLocationExtension.java
+++ b/buildSrc/src/main/java/org/jastadd/relast/plugin/CompilerLocationExtension.java
@@ -9,7 +9,7 @@ import org.gradle.api.provider.Property;
  * @author rschoene - Initial contribution
  */
 public class CompilerLocationExtension {
-  Property<String> compilerLocation;
+  public Property<String> compilerLocation;
 
   public CompilerLocationExtension(Project project) {
     compilerLocation = project.getObjects().property(String.class);
diff --git a/ros2rag.tests/build.gradle b/ros2rag.tests/build.gradle
index bedfddd..4c7b773 100644
--- a/ros2rag.tests/build.gradle
+++ b/ros2rag.tests/build.gradle
@@ -64,7 +64,6 @@ task preprocessExampleTest(type: JavaExec, group: 'verification') {
 
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
-    //noinspection GroovyAssignabilityCheck
     args '--outputDir=src/test/02-after-ros2rag/example',
             '--inputGrammar=src/test/01-input/example/Example.relast',
             '--inputRos2Rag=src/test/01-input/example/Example.ros2rag',
@@ -96,7 +95,6 @@ task preprocessDefaultOnlyReadTest(type: JavaExec, group: 'verification') {
 
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
-    //noinspection GroovyAssignabilityCheck
     args '--outputDir=src/test/02-after-ros2rag/defaultOnlyRead',
             '--inputGrammar=src/test/01-input/defaultOnlyRead/Example.relast',
             '--inputRos2Rag=src/test/01-input/defaultOnlyRead/Example.ros2rag',
@@ -127,7 +125,6 @@ task preprocessDefaultOnlyWriteTest(type: JavaExec, group: 'verification') {
 
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
-    //noinspection GroovyAssignabilityCheck
     args '--outputDir=src/test/02-after-ros2rag/defaultOnlyWrite',
             '--inputGrammar=src/test/01-input/defaultOnlyWrite/Example.relast',
             '--inputRos2Rag=src/test/01-input/defaultOnlyWrite/Example.ros2rag',
@@ -149,7 +146,7 @@ task compileDefaultOnlyWriteTest(type: RelastTest) {
 test.dependsOn compileDefaultOnlyWriteTest
 compileDefaultOnlyWriteTest.dependsOn preprocessDefaultOnlyWriteTest
 
-// --- Test: read-1-write-2 ---
+// --- Test: read1write2 ---
 task preprocessRead1Write2Test(type: JavaExec, group: 'verification') {
     doFirst {
         delete 'src/test/02-after-ros2rag/read1write2/Grammar.relast',
@@ -159,11 +156,10 @@ task preprocessRead1Write2Test(type: JavaExec, group: 'verification') {
 
     classpath = sourceSets.main.runtimeClasspath
     main = 'org.jastadd.ros2rag.compiler.Compiler'
-    //noinspection GroovyAssignabilityCheck
     args '--outputDir=src/test/02-after-ros2rag/read1write2',
             '--inputGrammar=src/test/01-input/read1write2/Example.relast',
             '--inputRos2Rag=src/test/01-input/read1write2/Example.ros2rag',
-            '--rootNode=A', '--verbose',
+            '--rootNode=A',
             '--logReads', '--logWrites'
 }
 
-- 
GitLab