Resolve build errors on linux

.github/workflows/maven.yml

@@ -3,16 +3,12 @@
 
 name: Java CI with Maven
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: push
 
 jobs:
   build:
 
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2

pom.xml

@@ -7,7 +7,7 @@
     <groupId>org.tzi.use</groupId>
     <artifactId>use</artifactId>
     <packaging>pom</packaging>
-    <version>7.0.1</version>
+    <version>7.1.0</version>
     <modules>
         <module>use-core</module>
         <module>use-gui</module>

use-assembly/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>use</artifactId>
         <groupId>org.tzi.use</groupId>
-        <version>7.0.1</version>
+        <version>7.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

use-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>use</artifactId>
         <groupId>org.tzi.use</groupId>
-        <version>7.0.1</version>
+        <version>7.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

use-core/src/main/java/org/tzi/use/config/Options.java

@@ -46,7 +46,7 @@
 public class Options {
 
     // the release version
-    public static final String RELEASE_VERSION = "7.0.1";
+    public static final String RELEASE_VERSION = "7.1.0";
 
     // the copyright
     public static final String COPYRIGHT = "Copyright (C) 1999-2021 University of Bremen";

use-gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>use</artifactId>
         <groupId>org.tzi.use</groupId>
-        <version>7.0.1</version>
+        <version>7.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

use-gui/src/it/java/org/tzi/use/main/ShellIT.java

@@ -5,7 +5,6 @@
 import com.github.difflib.patch.Patch;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
-import org.tzi.use.config.Options;
 
 import java.io.*;
 import java.net.URISyntaxException;
@@ -135,8 +134,15 @@ private void assertShellExpressions(Path testFile, Path useFile) {
      */
     private void validateOutput(Path testFile, List<String> expectedOutput, List<String> actualOutput) {
         Patch<String> patch = DiffUtils.diff(expectedOutput, actualOutput);
+        boolean nonWhitespaceChange = false;
 
-        if (!patch.getDeltas().isEmpty()) {
+        // Check if non whitespace diffs are present
+        nonWhitespaceChange = patch.getDeltas().stream().anyMatch(
+                (delta) -> delta.getSource().getLines().stream().anyMatch(line -> !line.isBlank()) ||
+                           delta.getTarget().getLines().stream().anyMatch(line -> !line.isBlank())
+        );
+
+        if (nonWhitespaceChange) {
             StringBuilder diffMsg = new StringBuilder("USE output does not match expected output!").append(System.lineSeparator());
 
             diffMsg.append("Testfile: ").append(testFile).append(System.lineSeparator());
@@ -146,7 +152,14 @@ private void validateOutput(Path testFile, List<String> expectedOutput, List<Str
 
             //simple output the computed patch to console
             for (AbstractDelta<String> delta : patch.getDeltas()) {
-                diffMsg.append(delta.toString()).append(System.lineSeparator());
+                diffMsg.append("Diff [")
+                        .append(delta.getType())
+                        .append("] Source: '")
+                        .append(delta.getSource().toString())
+                        .append("' Target: '" )
+                        .append(delta.getTarget().toString())
+                        .append("'")
+                        .append(System.lineSeparator());
             }
 
             writeToFile(expectedOutput, testFile.getParent().resolve(testFile.getFileName().toString() + ".expected" ));
@@ -210,7 +223,7 @@ private List<String> createCommandFile(Path inFile, Path cmdFile) {
 
                     try {
                         cmdWriter.write(inputLine);
-                        cmdWriter.write(Options.LINE_SEPARATOR);
+                        cmdWriter.write(System.lineSeparator());
 
                         expectedOutput.add((prompt + inputLine).trim());
                     } catch (IOException e1) {
@@ -319,7 +332,9 @@ private List<String> runUSE(Path useFile, Path cmdFile) {
 
             if (proc.isAlive()) {
                 line = line == null ? "" : line.trim();
-                actualOutput.add(line);
+                if (!line.equals("")) {
+                    actualOutput.add(line);
+                }
             }
         }