Added unit tests

Author: pchugh17

dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtil.java

@@ -574,10 +574,10 @@ public static boolean isValidImageTag(String tag) {
         String tagVersionRegexStr = "([a-zA-Z0-9_]([-._a-zA-Z0-9])*)";
         Pattern validTag = Pattern.compile(tagVersionRegexStr);
         if (StringUtils.isNotBlank(tag)) {
-            if (!validTag.matcher(tag).matches()) {
+            if (!validTag.matcher(tag.trim()).matches()) {
                 log.warn("{} is not a valid value for image tag. So will be ignored!", tag);
                 return false;
-            } else if (tag.equals("latest")) {
+            } else if (tag.trim().equals("latest")) {
                 log.warn("Tag value is latest. So will be ignored");
                 return false;
             }

dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/process/ForkableRepoValidatorTest.java

@@ -209,6 +209,10 @@ public Object[][] hasNoChangesData() {
                 {"FROM imageName:tag", "imageName", "tag", true},
                 {"FROM imageName:anotherTag", "imageName", "tag", false},
                 {"FROM anotherImage:tag", "imageName", "tag", true},
+                {"image: imageName", "imageName", "tag", true},
+                {"image: imageName:tag", "imageName", "tag", true},
+                {"image: imageName:anotherTag", "imageName", "tag", false},
+                {"image: anotherImage:tag", "imageName", "tag", true},
         };
     }
 

dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtilTest.java

@@ -13,6 +13,7 @@
 import net.sourceforge.argparse4j.inf.*;
 import org.kohsuke.github.*;
 import org.mockito.*;
+import org.slf4j.Logger;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -29,6 +30,7 @@
 import java.util.HashMap;
 
 import static com.salesforce.dockerfileimageupdate.model.PullRequestInfo.DEFAULT_TITLE;
+import static com.salesforce.dockerfileimageupdate.utils.ResultsProcessor.REPOS_SKIPPED_MESSAGE;
 import static org.mockito.Mockito.*;
 import static org.testng.Assert.*;
 
@@ -557,7 +559,7 @@ public void testFindImagesAndFix_notModifiedPostData() throws Exception {
     }
 
     @DataProvider
-    public Object[][] inputlines() throws Exception {
+    public Object[][] inputLinesForDockerfile() throws Exception {
         return new Object[][]{
                 {"image1", "3", "FROM image1_blahblah", false},
                 {"image1", "3", "  FROM image1_blahblah", false},
@@ -585,7 +587,7 @@ public Object[][] inputlines() throws Exception {
         };
     }
 
-    @Test(dataProvider = "inputlines")
+    @Test(dataProvider = "inputLinesForDockerfile")
     public void testChangeIfDockerfileBaseImageLine(String img, String tag,
                                                     String line, boolean expected) throws Exception {
         gitHubUtil = mock(GitHubUtil.class);
@@ -594,6 +596,47 @@ public void testChangeIfDockerfileBaseImageLine(String img, String tag,
                 expected);
     }
 
+    @DataProvider
+    public Object[][] inputLinesForDockerCompose() {
+        return new Object[][]{
+                {"image1", "3", "image: image1_blahblah", false},
+                {"image1", "3", "  image: image1_blahblah", false},
+                {"image1", "3", "image: image1_blahblah  ", false},
+                {"image1", "3", "image: image1_blahblah\t", false},
+                {"image1", "3", "image: image1_blahblah:2", false},
+                {"image2", "4", "image: image2_blahblah:latest", false},
+                {"image4", "9", "image: image4:9", false},
+                {"image5", "246", "image: image5_", false},
+                {"image6", "26", "image: image7", false},
+                {"image8", "245", "image: image8:245", false},
+                {"image8", "245", "image: image8: 245", false},
+                {"imageName", "7", "image: imageName:_asasds", true},
+                {"imageName", "7", "  image: imageName:asAA_aa.as_ss", true},
+                {"imageName", "7", "  image: imageName:Asdf@#ggg", false},
+                {"imageName", "7", "  image: imageName:$ITEST_TAG", false},
+                {"imageName", "7", "  image: imageName:latest", false},
+                {"image3", "7", "image: image3  ",  false},
+                {"image3", "7", "\timage: image3\t", false},
+                {"image7", "98", "image: image7:4", true},
+                {"image7", "98", "image: image7:   4", true},
+                {"image124516418023_1085-1-1248571", "7357",
+                        "image: image124516418023_1085-1-1248571:18026809126359806124890356219518632048125", true},
+                {"image", "1234",
+                        "image: image:1234", false},
+                {"image", "1234",
+                        "image: image:1234", false},
+        };
+    }
+
+    @Test(dataProvider = "inputLinesForDockerCompose")
+    public void testChangeIfDockerfileBaseImageLineForCompose(String img, String tag,
+                                                    String line, boolean expected) {
+        gitHubUtil = mock(GitHubUtil.class);
+        dockerfileGitHubUtil = new DockerfileGitHubUtil(gitHubUtil);
+        assertEquals(dockerfileGitHubUtil.changeIfDockerfileBaseImageLine(img, tag, new StringBuilder(), line),
+                expected);
+    }
+
     @Test
     public void testChangeIfDockerfileBaseImageLine_modifyingStringBuilder() throws Exception {
         gitHubUtil = mock(GitHubUtil.class);
@@ -888,4 +931,25 @@ public void testCommentsWithNoDfiuParsedCorrectly(String line, String ignoreImag
         dockerfileGitHubUtil = new DockerfileGitHubUtil(gitHubUtil);
         assertEquals(dockerfileGitHubUtil.ignorePRCommentPresent(line, ignoreImageString), expectedResult);
     }
+
+    @DataProvider
+    public Object[][] tagList() {
+        return new Object[][] {
+                {"12345",               true},
+                {"assdfASFF11",         true},
+                {"_asadsd",             true},
+                {".weww",               false},
+                {"Aswd@#asdas",         false},
+                {"ASDF_SSS-CCC.Ssd",    true},
+                {"-asasd",              false},
+                {" ",                   false}
+        };
+    }
+
+    @Test(dataProvider = "tagList")
+    public void testValidImageTag(String tag, Boolean expectedResult) {
+        gitHubUtil = mock(GitHubUtil.class);
+        dockerfileGitHubUtil = new DockerfileGitHubUtil(gitHubUtil);
+        assertEquals(dockerfileGitHubUtil.isValidImageTag(tag), expectedResult);
+    }
 }