#153 add tests and refactor

Author: Sgu74

src/com/cloudogu/ces/cesbuildlib/Makefile.groovy

@@ -29,9 +29,9 @@ class Makefile {
     }
 
     /**
-     * Creates the develop branch for Git Flow based on the base version.
+     * Determines the develop branch for Git Flow based on the base version.
      */
-    String getGitFlowDevelopBranch() {
+    String determineGitFlowDevelopBranch() {
         def develop = "develop"
         def baseVersion = getBaseVersion()
         if (baseVersion != null && baseVersion != "") {
@@ -41,9 +41,9 @@ class Makefile {
     }
 
     /**
-     * Creates the main branch for Git Flow based on the base version.
+     * Determines the main branch for Git Flow based on the base version.
      */
-    String getGitFlowMainBranch(defaultBranch="main") {
+    String determineGitFlowMainBranch(defaultBranch="main") {
         def baseVersion = getBaseVersion()
         if (baseVersion != null && baseVersion != "") {
             // The master branch is legacy so we don't create one here, even if it was passed as parameter.

test/com/cloudogu/ces/cesbuildlib/MakefileTest.groovy

@@ -1,6 +1,7 @@
 package com.cloudogu.ces.cesbuildlib
 
 import org.junit.Test
+import org.junit.jupiter.api.DisplayName
 
 import static org.assertj.core.api.Assertions.assertThat
 
@@ -39,7 +40,7 @@ class MakefileTest {
 
         Makefile makefile = new Makefile(scriptMock)
 
-        def result = makefile.getDevelopBranchName()
+        def result = makefile.determineGitFlowDevelopBranch()
 
         assertThat(scriptMock.allActualArgs[0]).isEqualTo('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString())
         assertThat(result).isEqualTo("4.2.2/develop")
@@ -52,7 +53,7 @@ class MakefileTest {
 
         Makefile makefile = new Makefile(scriptMock)
 
-        def result = makefile.getMainBranchName()
+        def result = makefile.determineGitFlowMainBranch()
 
         assertThat(scriptMock.allActualArgs[0]).isEqualTo('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString())
         assertThat(result).isEqualTo("4.2.2/main")
@@ -65,7 +66,7 @@ class MakefileTest {
 
         Makefile makefile = new Makefile(scriptMock)
 
-        def result = makefile.getDevelopBranchName()
+        def result = makefile.determineGitFlowDevelopBranch()
 
         assertThat(scriptMock.allActualArgs[0]).isEqualTo('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString())
         assertThat(result).isEqualTo("develop")
@@ -78,9 +79,37 @@ class MakefileTest {
 
         Makefile makefile = new Makefile(scriptMock)
 
-        def result = makefile.getMainBranchName()
+        def result = makefile.determineGitFlowMainBranch()
 
         assertThat(scriptMock.allActualArgs[0]).isEqualTo('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString())
         assertThat(result).isEqualTo("main")
     }
+
+    @Test
+    @DisplayName("should replace master with main if BASE_VERSION is used and the default branch is master")
+    void shouldReplaceMasterWithMain() {
+        def scriptMock = new ScriptMock()
+        scriptMock.expectedShRetValueForScript.put('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString(), "4.5".toString())
+
+        Makefile makefile = new Makefile(scriptMock)
+
+        def result = makefile.determineGitFlowMainBranch("master")
+
+        assertThat(scriptMock.allActualArgs[0]).isEqualTo('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString())
+        assertThat(result).isEqualTo("4.5/main")
+    }
+
+    @Test
+    @DisplayName("should use default branch if BASE_VERSION is not used")
+    void shouldUseDefaultBranch() {
+        def scriptMock = new ScriptMock()
+        scriptMock.expectedShRetValueForScript.put('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString(), "".toString())
+
+        Makefile makefile = new Makefile(scriptMock)
+
+        def result = makefile.determineGitFlowMainBranch("master")
+
+        assertThat(scriptMock.allActualArgs[0]).isEqualTo('grep -e "^BASE_VERSION=" Makefile | sed "s/BASE_VERSION=//g"'.toString())
+        assertThat(result).isEqualTo("master")
+    }
 }