added unit tests for build-arg CLI

Author: ddsharpe

.github/workflows/sonar-branch.yml

@@ -23,7 +23,7 @@ jobs:
           java-version: 11
       - name: Build and Test
         run: |
-          mvn -B clean test
+          mvn -B clean package
       - name: Sonar Scan
         run: |
           mvn -B sonar:sonar \

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java

@@ -417,7 +417,7 @@ public String buildId() {
     KubernetesTarget kubernetesTarget = KubernetesTarget.DEFAULT;
 
     @Option(
-        names = {"--buildArgs"},
+        names = {"--build-arg"},
         description = "Additional argument passed directly to the build engine."
     )
     Map<String,String> buildArgs;

imagetool/src/test/java/com/oracle/weblogic/imagetool/builder/BuilderTest.java

@@ -3,6 +3,9 @@
 
 package com.oracle.weblogic.imagetool.builder;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -37,6 +40,39 @@ void testBuildWithOptions() {
             cmd.toString());
     }
 
+    @Test
+    void testBuildArgsInMap() {
+        Map<String,String> argMap = new LinkedHashMap<>();
+        argMap.put("something", "else");
+        argMap.put("random", "data");
+
+        BuildCommand cmd = new BuildCommand(BUILD_ENGINE, BUILD_CONTEXT)
+            .tag("img:2")
+            .pull(true)
+            .forceRm(true)
+            .network("private-net")
+            .buildArg(argMap);
+        assertEquals(
+            expected("--tag img:2 --pull --force-rm --network private-net "
+                + "--build-arg something=else --build-arg random=data"),
+            cmd.toString());
+    }
+
+    @Test
+    void testBuildArgsInMap2() {
+        Map<String,String> argMap = null;
+
+        BuildCommand cmd = new BuildCommand(BUILD_ENGINE, BUILD_CONTEXT)
+            .tag("img:2")
+            .pull(true)
+            .forceRm(true)
+            .network("private-net")
+            .buildArg(argMap);
+        assertEquals(
+            expected("--tag img:2 --pull --force-rm --network private-net"),
+            cmd.toString());
+    }
+
     @Test
     void testBuildWithProxyPass() {
         BuildCommand cmd = new BuildCommand(BUILD_ENGINE, BUILD_CONTEXT);

imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptionsTest.java

@@ -227,4 +227,19 @@ void isChownNotSet() {
         new CommandLine(createImage).parseArgs("--tag", "x:1");
         assertFalse(createImage.isChownSet());
     }
+
+    @Test
+    void buildArgs() throws Exception {
+        CreateImage createImage = new CreateImage();
+        new CommandLine(createImage).parseArgs("--tag", "tag:1",
+            "--build-arg", "something=else", "--build-arg", "fast=break");
+
+        createImage.initializeOptions();
+        // access the private field to view the dockerfile options that will be used at runtime
+        Field options = CommonOptions.class.getDeclaredField("dockerfileOptions");
+        options.setAccessible(true);
+        DockerfileOptions dockerfile = (DockerfileOptions) options.get(createImage);
+        assertEquals(2, dockerfile.buildArgs().size());
+        assertEquals("something", dockerfile.buildArgs().get(0));
+    }
 }