Skip to content

Commit c61f753

Browse files
qoomonqoomon
committed
tests: fix tests
1 parent fc1d45f commit c61f753

File tree

4 files changed

+84
-35
lines changed

4 files changed

+84
-35
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
build:
66
runs-on: ubuntu-latest
77
env:
8-
# MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
8+
MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
99
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
1010
steps:
1111
- uses: actions/checkout@v4

‎.mvn/wrapper/maven-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

‎pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
<dependency>
5858
<groupId>org.apache.maven</groupId>
5959
<artifactId>maven-core</artifactId>
60-
<version>3.9.9</version>
60+
<!-- BREAKING CHANGE in https://maven.apache.org/docs/3.9.8/release-notes.html -->
61+
<version>3.9.7</version>
6162
<scope>provided</scope>
6263
</dependency>
6364

‎src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java

+80-32
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ void noGitVersioning() throws Exception {
5555

5656
// When
5757
Verifier verifier = getVerifier(projectDir);
58-
verifier.displayStreamBuffers();
59-
verifier.executeGoal("verify");
58+
verifier.addCliArgument("verify");
59+
verifier.execute();
6060

6161
// Then
62+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
6263
verifier.verifyErrorFreeLog();
6364
String expectedVersion = "0.0.0";
6465
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -82,12 +83,13 @@ void disableVersioning_cliOption() throws Exception {
8283
writeExtensionConfigFile(projectDir, new Configuration());
8384

8485
// When
85-
Verifier verifier = new Verifier(projectDir.toFile().getAbsolutePath()) {{
86-
addCliOption("-Dversioning.disable");
87-
}};
88-
verifier.executeGoal("verify");
86+
Verifier verifier = getVerifier(projectDir);
87+
verifier.addCliArgument("-Dversioning.disable");
88+
verifier.addCliArguments("verify");
89+
verifier.execute();
8990

9091
// Then
92+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
9193
verifier.verifyErrorFreeLog();
9294
verifier.verifyTextInLog("skip - versioning is disabled by command option");
9395
String expectedVersion = pomModel.getVersion();
@@ -109,9 +111,11 @@ void revVersioning_noCommit() throws Exception {
109111

110112
// When
111113
Verifier verifier = getVerifier(projectDir);
112-
verifier.executeGoal("verify");
114+
verifier.addCliArgument("verify");
115+
verifier.execute();
113116

114117
// Then
118+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
115119
verifier.verifyErrorFreeLog();
116120
String expectedVersion = "0000000000000000000000000000000000000000";
117121
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -136,9 +140,11 @@ void revVersioning() throws Exception {
136140

137141
// When
138142
Verifier verifier = getVerifier(projectDir);
139-
verifier.executeGoal("verify");
143+
verifier.addCliArgument("verify");
144+
verifier.execute();
140145

141146
// Then
147+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
142148
verifier.verifyErrorFreeLog();
143149
String expectedVersion = givenCommit.getName();
144150
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -163,9 +169,11 @@ void branchVersioning() throws Exception {
163169

164170
// When
165171
Verifier verifier = getVerifier(projectDir);
166-
verifier.executeGoal("verify");
172+
verifier.addCliArgument("verify");
173+
verifier.execute();
167174

168175
// Then
176+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
169177
verifier.verifyErrorFreeLog();
170178
String expectedVersion = "feature-test-gitVersioning";
171179
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -193,9 +201,11 @@ void tagVersioning_atBranch() throws Exception {
193201

194202
// When
195203
Verifier verifier = getVerifier(projectDir);
196-
verifier.executeGoal("verify");
204+
verifier.addCliArgument("verify");
205+
verifier.execute();
197206

198207
// Then
208+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
199209
verifier.verifyErrorFreeLog();
200210
String expectedVersion = "v1.0.0-gitVersioning";
201211
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -224,9 +234,11 @@ void tagVersioning_detachedHead() throws Exception {
224234

225235
// When
226236
Verifier verifier = getVerifier(projectDir);
227-
verifier.executeGoal("verify");
237+
verifier.addCliArgument("verify");
238+
verifier.execute();
228239

229240
// Then
241+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
230242
verifier.verifyErrorFreeLog();
231243
String expectedVersion = "v1.0.0-gitVersioning";
232244
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -255,9 +267,11 @@ void tagVersioning_lightweightTag_atBranch() throws Exception {
255267

256268
// When
257269
Verifier verifier = getVerifier(projectDir);
258-
verifier.executeGoal("verify");
270+
verifier.addCliArgument("verify");
271+
verifier.execute();
259272

260273
// Then
274+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
261275
verifier.verifyErrorFreeLog();
262276
String expectedVersion = "v1.0.0-gitVersioning";
263277
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -285,9 +299,11 @@ void tagVersioning_considerTagsOnlyIfHeadIsDetached() throws Exception {
285299

286300
// When
287301
Verifier verifier = getVerifier(projectDir);
288-
verifier.executeGoal("verify");
302+
verifier.addCliArgument("verify");
303+
verifier.execute();
289304

290305
// Then
306+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
291307
verifier.verifyErrorFreeLog();
292308
String expectedVersion = "master-gitVersioning";
293309
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -315,9 +331,11 @@ void tagVersioning_environmentVariable() throws Exception {
315331
Verifier verifier = new Verifier(projectDir.toFile().getAbsolutePath()) {{
316332
setEnvironmentVariable("VERSIONING_GIT_BRANCH", "v1.0.0");
317333
}};
318-
verifier.executeGoal("verify");
334+
verifier.addCliArgument("verify");
335+
verifier.execute();
319336

320337
// Then
338+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
321339
verifier.verifyErrorFreeLog();
322340
String expectedVersion = "v1.0.0-gitVersioning";
323341
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -380,9 +398,11 @@ void revVersioning_multiModuleProject() throws Exception {
380398

381399
// When
382400
Verifier verifier = getVerifier(projectDir);
383-
verifier.executeGoal("verify");
401+
verifier.addCliArgument("verify");
402+
verifier.execute();
384403

385404
// Then
405+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
386406
verifier.verifyErrorFreeLog();
387407
String expectedVersion = "master-SNAPSHOT";
388408
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -439,9 +459,11 @@ void revVersioning_multiModuleProject_ambiguous_artifactId() throws Exception {
439459

440460
// When
441461
Verifier verifier = getVerifier(projectDir);
442-
verifier.executeGoal("verify");
462+
verifier.addCliArgument("verify");
463+
verifier.execute();
443464

444465
// Then
466+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
445467
verifier.verifyErrorFreeLog();
446468
String expectedVersion = "master-SNAPSHOT";
447469
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -483,9 +505,11 @@ void branchVersioning_multiModuleProject_noParent() throws Exception {
483505

484506
// When
485507
Verifier verifier = getVerifier(logicProjectDir);
486-
verifier.executeGoal("verify");
508+
verifier.addCliArgument("verify");
509+
verifier.execute();
487510

488511
// Then
512+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
489513
verifier.verifyErrorFreeLog();
490514
String expectedVersion = "feature-test-gitVersioning";
491515
verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -539,9 +563,11 @@ void branchVersioning_multiModuleProject_withExternalParent() throws Exception {
539563

540564
// When
541565
Verifier verifier = getVerifier(projectDir);
542-
verifier.executeGoal("verify");
566+
verifier.addCliArgument("verify");
567+
verifier.execute();
543568

544569
// Then
570+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
545571
verifier.verifyErrorFreeLog();
546572
String expectedVersion = "feature-test-gitVersioning";
547573
verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -593,9 +619,11 @@ void branchVersioning_multiModuleProject_withAggregationAndParent() throws Excep
593619

594620
// When
595621
Verifier verifier = getVerifier(logicProjectDir);
596-
verifier.executeGoal("verify");
622+
verifier.addCliArgument("verify");
623+
verifier.execute();
597624

598625
// Then
626+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
599627
verifier.verifyErrorFreeLog();
600628
String expectedVersion = "feature-test-gitVersioning";
601629
verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -651,9 +679,11 @@ void dependencyUpdates_multiModuleProject() throws Exception {
651679

652680
// When
653681
Verifier verifier = getVerifier(projectDir);
654-
verifier.executeGoal("verify");
682+
verifier.addCliArgument("verify");
683+
verifier.execute();
655684

656685
// Then
686+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
657687
verifier.verifyErrorFreeLog();
658688
String expectedVersion = "test-gitVersioning";
659689
verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -683,9 +713,11 @@ void branchVersioning_WithBuildTime() throws Exception {
683713

684714
// When
685715
Verifier verifier = getVerifier(projectDir);
686-
verifier.executeGoal("verify");
716+
verifier.addCliArgument("verify");
717+
verifier.execute();
687718

688719
// Then
720+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
689721
verifier.verifyErrorFreeLog();
690722
String expectedVersion = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + "-gitVersioning";
691723
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -708,9 +740,11 @@ void apply_emptyRepoGivesExpectedPlusDistanceResult() throws Exception {
708740

709741
// When
710742
Verifier verifier = getVerifier(projectDir);
711-
verifier.executeGoal("verify");
743+
verifier.addCliArgument("verify");
744+
verifier.execute();
712745

713746
// Then
747+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
714748
verifier.verifyErrorFreeLog();
715749
String expectedVersion = "0";
716750
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -719,7 +753,7 @@ void apply_emptyRepoGivesExpectedPlusDistanceResult() throws Exception {
719753
assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
720754
}
721755

722-
}
756+
}
723757

724758
@Test
725759
void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exception {
@@ -735,9 +769,11 @@ void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exce
735769

736770
// When
737771
Verifier verifier = getVerifier(projectDir);
738-
verifier.executeGoal("verify");
772+
verifier.addCliArgument("verify");
773+
verifier.execute();
739774

740775
// Then
776+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
741777
verifier.verifyErrorFreeLog();
742778
String expectedVersion = "1";
743779
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -746,7 +782,7 @@ void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exce
746782
assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
747783
}
748784

749-
}
785+
}
750786

751787
@Test
752788
void apply_NoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Exception {
@@ -765,9 +801,11 @@ void apply_NoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Excepti
765801

766802
// When
767803
Verifier verifier = getVerifier(projectDir);
768-
verifier.executeGoal("verify");
804+
verifier.addCliArgument("verify");
805+
verifier.execute();
769806

770807
// Then
808+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
771809
verifier.verifyErrorFreeLog();
772810
String expectedVersion = "677";
773811
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -776,7 +814,7 @@ void apply_NoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Excepti
776814
assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
777815
}
778816

779-
}
817+
}
780818

781819
@Test
782820
void apply_TwoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Exception {
@@ -797,9 +835,11 @@ void apply_TwoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Except
797835

798836
// When
799837
Verifier verifier = getVerifier(projectDir);
800-
verifier.executeGoal("verify");
838+
verifier.addCliArgument("verify");
839+
verifier.execute();
801840

802841
// Then
842+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
803843
verifier.verifyErrorFreeLog();
804844
String expectedVersion = "679";
805845
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -824,9 +864,11 @@ void apply_DescribeDistanceSnapshotRelease() throws Exception {
824864

825865
// When
826866
Verifier verifier = getVerifier(projectDir);
827-
verifier.executeGoal("verify");
867+
verifier.addCliArgument("verify");
868+
verifier.execute();
828869

829870
// Then
871+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
830872
String expectedVersion = "2.0.4";
831873
Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
832874
assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
@@ -852,9 +894,11 @@ void apply_DescribeDistanceSnapshot() throws Exception {
852894

853895
// When
854896
Verifier verifier = getVerifier(projectDir);
855-
verifier.executeGoal("verify");
897+
verifier.addCliArgument("verify");
898+
verifier.execute();
856899

857900
// Then
901+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
858902
String expectedVersion = "2.0.4-SNAPSHOT";
859903
Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
860904
assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
@@ -900,9 +944,11 @@ private void apply_TagOnMerged(final boolean firstParent) throws Exception {
900944

901945
// When
902946
Verifier verifier = getVerifier(projectDir);
903-
verifier.executeGoal("verify");
947+
verifier.addCliArgument("verify");
948+
verifier.execute();
904949

905950
// Then
951+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
906952
verifier.verifyErrorFreeLog();
907953
String expectedVersion = firstParent ? tagOnMaster : tagOnBranch;
908954
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -929,9 +975,11 @@ void apply_UseDescribeTagVersionLabel() throws Exception {
929975

930976
// When
931977
Verifier verifier = getVerifier(projectDir);
932-
verifier.executeGoal("verify");
978+
verifier.addCliArgument("verify");
979+
verifier.execute();
933980

934981
// Then
982+
System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
935983
verifier.verifyErrorFreeLog();
936984
String expectedVersion = "label";
937985
verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);

0 commit comments

Comments
 (0)