Skip to content

Commit a79b41e

Browse files
author
Ron DeFreitas
committed
add unit test to cover branch renaming
1 parent 2cb2c77 commit a79b41e

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

src/main/java/com/e_gineering/maven/gitflowhelper/OtherBranchVersionExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private boolean isProjectOfReplacedArtifactVersion(final MavenProject project, f
224224
* @param branchName to be normalized
225225
* @return A mangled version string with the branchname and -SNAPSHOT.
226226
*/
227-
private String getAsBranchSnapshotVersion(final String version, final String branchName) {
227+
public String getAsBranchSnapshotVersion(final String version, final String branchName) {
228228
String branchNameSanitized = otherBranchVersionDelimiter + branchName.replaceAll("[^0-9A-Za-z-.]", "-") + "-SNAPSHOT";
229229
if(version.endsWith(branchNameSanitized)) {
230230
return version;
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.e_gineering.maven.gitflowhelper;
2+
3+
import org.junit.Assert;
4+
import org.junit.Test;
5+
import org.junit.runner.RunWith;
6+
import org.junit.runners.BlockJUnit4ClassRunner;
7+
8+
@RunWith(BlockJUnit4ClassRunner.class)
9+
public class OtherBranchTest {
10+
11+
private final String baseVersion = "1.0.2";
12+
private final String baseSnapshotVersion = "1.0.2-SNAPSHOT";
13+
private final String branchName = "feature/other-branch-name";
14+
private final String expectedSnapshotResult = "1.0.2+feature-other-branch-name-SNAPSHOT";
15+
16+
private OtherBranchVersionExtension getExtension() {
17+
OtherBranchVersionExtension extension = new OtherBranchVersionExtension();
18+
extension.otherBranchVersionDelimiter = "+";
19+
return extension;
20+
}
21+
22+
@Test
23+
public void assertOtherBranchNameIsPrefixedBeforeSnapshot() {
24+
OtherBranchVersionExtension extension = getExtension();
25+
Assert.assertEquals(expectedSnapshotResult, extension.getAsBranchSnapshotVersion(baseSnapshotVersion,branchName));
26+
}
27+
28+
@Test
29+
public void assertOtherBranchNameIsOnlyPrefixedBeforeSnapshotOneTime() {
30+
OtherBranchVersionExtension extension = getExtension();
31+
Assert.assertEquals(expectedSnapshotResult, extension.getAsBranchSnapshotVersion(extension.getAsBranchSnapshotVersion(baseSnapshotVersion,branchName),branchName));
32+
}
33+
}

0 commit comments

Comments
 (0)