Merge branch 'lenaRB:main' into main

lenaRB · Dec 12, 2023 · 59b40c3 · 59b40c3
2 parents 20f45d8 + 97aa98a
commit 59b40c3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/crml/compiler/CRMLC.java b/src/main/java/crml/compiler/CRMLC.java
@@ -1,7 +1,5 @@
 package crml.compiler;
 
-import static org.junit.jupiter.api.Assertions.fail;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -80,6 +78,13 @@ public static void main( String[] args ) throws Exception {
       return;  
     }
 
+    if(cmd.simulate != null)
+      cs.verifModelFolder = cmd.simulate;
+
+      if(cmd.verify != null)
+        cs.referenceResFolder = cmd.verify;
+
+
     File out_dir = new File(cmd.outputDir);
     out_dir.mkdir();
 
@@ -96,7 +101,7 @@ public static void main( String[] args ) throws Exception {
     	      if(test.endsWith(".crml")) {
     		    logger.trace("Translating: " + test);
     		      parse_file(path, test, out_dir.getPath(), cmd.stacktrace, cmd.printAST , cmd.generateExternal);
-              if(cmd.simulate){
+              if(cmd.simulate!=null){
                 String msg;
                 try {
                   msg = OMCUtil.compile(test, path, cs);
@@ -113,7 +118,7 @@ public static void main( String[] args ) throws Exception {
         } else if (file.isFile()){
         logger.trace("Translating: " + file);
 		     parse_file("", path, out_dir.getPath(), cmd.stacktrace, cmd.printAST ,cmd.generateExternal);
-         if(cmd.simulate){
+         if(cmd.simulate!=null){
                 String msg;
                 try {
                   msg = OMCUtil.compile(file.getPath(), "", cs);

diff --git a/src/main/java/crml/compiler/CommandLineArgs.java b/src/main/java/crml/compiler/CommandLineArgs.java
@@ -30,13 +30,11 @@ public class CommandLineArgs {
     @Parameter(names = "--help", help = true)
     public boolean help;
 
-    // TODO 
-    @Parameter(names = "--simulate", description = "simulate the files passed in parameters")
-    public boolean simulate;
+    @Parameter(names = "--simulate", description = "simulate the files passed in parameters, takes the path to the additional omc files")
+    public String simulate = null; 
 
-    // TODO
-     @Parameter(names = "--verify",  description = "verify the files passed in parameters")
-    public boolean verify;
+     @Parameter(names = "--verify",  description = "verify the files passed in parameters, takes the path to the reference files")
+    public String verify = null;
 
      @Parameter(names = "--testsuiteETL",  description = "run just the ETL tests")
     public boolean testsuiteETL;

diff --git a/src/main/java/crml/compiler/TestListener.java b/src/main/java/crml/compiler/TestListener.java
@@ -54,6 +54,9 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 
     private void processTestNode(ExtentTest testKlass, TestIdentifier test) {
         final ExtentTest node = testKlass.createNode(test.getDisplayName());
+        if(test.isContainer()){
+            return;
+        }
         if (SKIPPED.containsKey(test)) {
             node.skip(SKIPPED.get(test));
             System.out.printf("Marking test [%s] as skipped%n", test.getDisplayName());

diff --git a/src/test/java/ctests/Util.java b/src/test/java/ctests/Util.java
@@ -1,13 +1,7 @@
 package ctests;
 
 import static org.junit.jupiter.api.Assertions.fail;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.concurrent.TimeUnit;
 
 import crml.compiler.CompileSettings;
 import crml.compiler.ModelicaSimulationException;