Merge branch 'java_migration' of https://gitlab.lrz.de/vadere/vadere into java_migration

Tools/ContinuousIntegration/collect_line_and_branch_coverage.py

@@ -11,6 +11,10 @@ import xml.etree.ElementTree as ET
 import os
 import re
 
+# Use Unix path separators because this script is usually run in a Bash-context.
+# And Bash fails with Windows path separators which are introduced by os.path.join(...)
+path_separator = "/"
+
 def get_modules_from_pom_file(filename="pom.xml"):
     """Return a list of submodules which where found in passed "pom.xml"."""
 
@@ -33,14 +37,15 @@ def extract_line_and_branch_coverage(module_names):
 
     module_to_coverage = dict()
 
-    default_coverage_file = os.path.join("target", "coverage-reports", "index.html")
+    default_coverage_file = path_separator.join(["target", "coverage-reports", "index.html"])
 
     for module in module_names:
-        coverage_path = os.path.join(module, default_coverage_file)
+        coverage_path = path_separator.join([module, default_coverage_file])
 
         with open(coverage_path, "r") as file:
             coverage_report = file.read()
             
+            # TODO: Regex seems be be broken on Windows CI worker. Find out why!
             regex_pattern = re.compile(r"Total.*?([0-9]{1,3})\s?%.*?([0-9]{1,3})\s?%")
             match = regex_pattern.search(coverage_report)
 

VadereGui/pom.xml

@@ -163,7 +163,7 @@
   <dependency>
   		<groupId>org.mockito</groupId>
   		<artifactId>mockito-all</artifactId>
-  		<version>1.9.0</version>
+  		<version>1.9.5</version>
   		<scope>test</scope>
   </dependency>
   <dependency>

pom.xml

@@ -186,7 +186,7 @@
       <dependency>
           <groupId>org.mockito</groupId>
           <artifactId>mockito-core</artifactId>
-          <version>2.13.0</version>
+          <version>2.24.5</version>
           <scope>test</scope>
       </dependency>