Skip to content

Commit 77ef143

Browse files
committed
simplify tests
1 parent 561aab1 commit 77ef143

File tree

1 file changed

+5
-27
lines changed

1 file changed

+5
-27
lines changed

src/test/java/pl/project13/core/GitCommitIdPluginIntegrationTest.java

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,15 +1743,16 @@ public void verifyAllowedCharactersForEvaluateOnCommit() {
17431743
Assertions.assertFalse(p.matcher("&&cat /etc/passwd").matches());
17441744
}
17451745

1746-
@Test
1747-
public void shouldGiveCommitIdForEachFolderWhenPerModuleVersionsEnabled() throws Exception {
1746+
@ParameterizedTest
1747+
@MethodSource("useNativeGit")
1748+
public void shouldGiveCommitIdForEachFolderWhenPerModuleVersionsEnabled(boolean useNativeGit) throws Exception {
17481749
// given
17491750
File dotGitDirectory = createTmpDotGitDirectory(AvailableGitTestRepo.GIT_COMMIT_ID);
17501751

17511752
GitCommitIdPlugin.Callback cbSrc =
17521753
new GitCommitIdTestCallback()
17531754
.setDotGitDirectory(dotGitDirectory)
1754-
.setUseNativeGit(false)
1755+
.setUseNativeGit(useNativeGit)
17551756
.setPerModuleVersions(true)
17561757
.setModuleBaseDir(dotGitDirectory.getParentFile().toPath().resolve("src").toFile())
17571758
.build();
@@ -1760,43 +1761,20 @@ public void shouldGiveCommitIdForEachFolderWhenPerModuleVersionsEnabled() throws
17601761
GitCommitIdPlugin.Callback cbSrcTest =
17611762
new GitCommitIdTestCallback()
17621763
.setDotGitDirectory(dotGitDirectory)
1763-
.setUseNativeGit(false)
1764+
.setUseNativeGit(useNativeGit)
17641765
.setPerModuleVersions(true)
17651766
.setModuleBaseDir(dotGitDirectory.getParentFile().toPath().resolve("src/test").toFile())
17661767
.build();
17671768
Properties propertiesSrcTestFolder = new Properties();
17681769

1769-
GitCommitIdPlugin.Callback cbSrcNative =
1770-
new GitCommitIdTestCallback()
1771-
.setDotGitDirectory(dotGitDirectory)
1772-
.setUseNativeGit(true)
1773-
.setPerModuleVersions(true)
1774-
.setModuleBaseDir(dotGitDirectory.getParentFile().toPath().resolve("src").toFile())
1775-
.build();
1776-
Properties propertiesSrcFolderNative = new Properties();
1777-
1778-
GitCommitIdPlugin.Callback cbSrcTestNative =
1779-
new GitCommitIdTestCallback()
1780-
.setDotGitDirectory(dotGitDirectory)
1781-
.setUseNativeGit(true)
1782-
.setPerModuleVersions(true)
1783-
.setModuleBaseDir(dotGitDirectory.getParentFile().toPath().resolve("src/test").toFile())
1784-
.build();
1785-
Properties propertiesSrcTestFolderNative = new Properties();
1786-
17871770
// when
17881771
GitCommitIdPlugin.runPlugin(cbSrc, propertiesSrcFolder);
17891772
GitCommitIdPlugin.runPlugin(cbSrcTest, propertiesSrcTestFolder);
1790-
GitCommitIdPlugin.runPlugin(cbSrcNative, propertiesSrcFolderNative);
1791-
GitCommitIdPlugin.runPlugin(cbSrcTestNative, propertiesSrcTestFolderNative);
17921773

17931774
// then
17941775
assertThat(propertiesSrcFolder).containsKey("git.commit.id");
17951776
assertThat(propertiesSrcTestFolder).containsKey("git.commit.id");
17961777
assertThat(propertiesSrcFolder.getProperty("git.commit.id")).isNotEqualTo(propertiesSrcTestFolder.getProperty("git.commit.id"));
1797-
assertThat(propertiesSrcFolderNative).containsKey("git.commit.id");
1798-
assertThat(propertiesSrcTestFolderNative).containsKey("git.commit.id");
1799-
assertThat(propertiesSrcFolderNative.getProperty("git.commit.id")).isNotEqualTo(propertiesSrcTestFolderNative.getProperty("git.commit.id"));
18001778
}
18011779

18021780
private GitDescribeConfig createGitDescribeConfig(boolean forceLongFormat, int abbrev) {

0 commit comments

Comments
 (0)