Test for parsing CLI arguments in lfc

org.lflang.tests/src/org/lflang/tests/cli/CliToolTestFixture.java

@@ -31,6 +31,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
@@ -39,12 +40,16 @@
 import org.opentest4j.AssertionFailedError;
 
 import org.lflang.cli.Io;
+import org.lflang.cli.Lfc;
+
+import picocli.CommandLine;
 
 /**
  * Test utilities for a CLI tool, eg {@link org.lflang.cli.Lfc},
  * {@link org.lflang.cli.Lff}.
  *
  * @author Clément Fournier
+ * @author Atharva Patil
  */
 abstract class CliToolTestFixture {
 
@@ -158,4 +163,5 @@ interface ThrowingConsumer<T> {
             void accept(T t) throws Exception;
         }
     }
+
 }

org.lflang.tests/src/org/lflang/tests/cli/LfcCliTest.java

@@ -26,23 +26,30 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.lflang.tests.TestUtils.TempDirBuilder.dirBuilder;
 import static org.lflang.tests.TestUtils.TempDirChecker.dirChecker;
 import static org.lflang.tests.TestUtils.isDirectory;
 import static org.lflang.tests.TestUtils.isRegularFile;
 
+import com.google.inject.Injector;
+
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.nio.file.Path;
+import java.util.Properties;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import org.lflang.LocalStrings;
 import org.lflang.cli.Io;
 import org.lflang.cli.Lfc;
+import org.lflang.generator.LFGeneratorContext.BuildParm;
 
 /**
  * @author Clément Fournier
+ * @author Atharva Patil
  */
 public class LfcCliTest {
 
@@ -98,17 +105,71 @@ public void testGenInSrcDir(@TempDir Path tempDir) throws IOException {
                     .check("bin", isDirectory())
                     .check("src-gen/File/File.py", isRegularFile());
             });
+    }
 
+    @Test
+    public void testBuildParams(@TempDir Path tempDir)
+            throws IOException {
+        dirBuilder(tempDir).file("src/File.lf", LF_PYTHON_FILE);
+
+        String[] args = {
+            "src/File.lf",
+            "--output-path", "src",
+            "--build-type", "Release",
+            "--clean",
+            "--target-compiler", "gcc",
+            "--external-runtime-path", "src",
+            "--federated",
+            "--logging", "4",
+            "--lint",
+            "--no-compile",
+            "--quiet",
+            "--rti", "-1",
+            "--runtime-version", "rs",
+            "--scheduler", "2",
+            "--threading", "false",
+            "--workers", "1",
+        };
+        LfcOneShotTestFixture fixture = new LfcOneShotTestFixture();
+
+        fixture.run(tempDir, args)
+            .verify(result -> {
+                // Don't validate execution because args are dummy args.
+                Properties properties = fixture.lfc.cliArgsToBuildParams();
+                assertEquals(properties.getProperty(BuildParm.BUILD_TYPE.getKey()), "Release");
+                assertEquals(properties.getProperty(BuildParm.CLEAN.getKey()), "true");
+                assertEquals(properties.getProperty(BuildParm.EXTERNAL_RUNTIME_PATH.getKey()), "src");
+                assertEquals(properties.getProperty(BuildParm.LINT.getKey()), "true");
+                assertEquals(properties.getProperty(BuildParm.LOGGING.getKey()), "4");
+                assertEquals(properties.getProperty(BuildParm.TARGET_COMPILER.getKey()), "gcc");
+                assertEquals(properties.getProperty(BuildParm.QUIET.getKey()), "true");
+                assertEquals(properties.getProperty(BuildParm.RTI.getKey()), "-1");
+                assertEquals(properties.getProperty(BuildParm.RUNTIME_VERSION.getKey()), "rs");
+                assertEquals(properties.getProperty(BuildParm.THREADING.getKey()), "false");
+                assertEquals(properties.getProperty(BuildParm.WORKERS.getKey()), "1");
+            });
     }
 
 
     static class LfcTestFixture extends CliToolTestFixture {
 
-
         @Override
         protected void runCliProgram(Io io, String[] args) {
             Lfc.main(io, args);
         }
     }
 
+    static class LfcOneShotTestFixture extends CliToolTestFixture {
+
+        private Lfc lfc;
+
+        @Override
+        protected void runCliProgram(Io io, String[] args) {
+            // Injector used to obtain Main instance.
+            final Injector injector = Lfc.getInjector("lfc", io);
+            // Main instance.
+            this.lfc = injector.getInstance(Lfc.class);
+            lfc.doExecute(io, args);
+        }
+    }
 }

org.lflang/src/org/lflang/cli/CliBase.java

@@ -97,7 +97,11 @@ protected static void cliMain(
         // Main instance.
         final CliBase main = injector.getInstance(toolClass);
         // Parse arguments and execute main logic.
-        CommandLine cmd = new CommandLine(main)
+        main.doExecute(io, args);
+    }
+
+    public void doExecute(Io io, String[] args) {
+        CommandLine cmd = new CommandLine(this)
             .setOut(new PrintWriter(io.getOut()))
             .setErr(new PrintWriter(io.getErr()));
         int exitCode = cmd.execute(args);
@@ -111,7 +115,7 @@ protected static void cliMain(
      */ 
     public abstract void run();
 
-    protected static Injector getInjector(String toolName, Io io) {
+    public static Injector getInjector(String toolName, Io io) {
         final ReportingBackend reporter 
             = new ReportingBackend(io, toolName + ": ");
 
@@ -247,4 +251,5 @@ public Resource getResource(Path path) {
             return null;
         }
     }
+
 }

org.lflang/src/org/lflang/cli/Lfc.java

@@ -158,7 +158,7 @@ public void run() {
         List<Path> paths = getInputPaths();
         final Path outputRoot = getOutputRoot();
         // Hard code the props based on the options we want.
-        Properties properties = this.filterPassOnProps();
+        Properties properties = this.cliArgsToBuildParams();
 
         try {
             // Invoke the generator on all input file paths.
@@ -229,7 +229,7 @@ private Path getActualOutputPath(Path root, Path path) {
      *
      * @return Properties for the code generator.
      */
-    protected Properties filterPassOnProps() {
+    public Properties cliArgsToBuildParams() {
         Properties props = new Properties();
 
         if (buildType != null) {