Skip to content

Commit 7e861f0

Browse files
elharoelharo
authored
Resolve todo that led to pointless asserts (#1442)
* Resolve todo that led to pointless asserts * Remove unused method
1 parent 422f895 commit 7e861f0

File tree

7 files changed

+76
-84
lines changed

7 files changed

+76
-84
lines changed

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void testRewriteBasicPomWithEditMode() throws Exception {
6363
.execute(
6464
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
6565

66-
assertTrue(comparePomFiles(reactorProjects));
66+
comparePomFiles(reactorProjects);
6767
}
6868

6969
@Test
@@ -130,7 +130,7 @@ void testRewritePomPluginDependencies() throws Exception {
130130
.execute(
131131
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
132132

133-
assertTrue(comparePomFiles(reactorProjects));
133+
comparePomFiles(reactorProjects);
134134
}
135135

136136
@Test
@@ -161,7 +161,7 @@ void testRewritePomProfile() throws Exception {
161161
.execute(
162162
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
163163

164-
assertTrue(comparePomFiles(reactorProjects));
164+
comparePomFiles(reactorProjects);
165165
}
166166

167167
@Test

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -243,16 +243,13 @@ protected static Map<String, MavenProject> getProjectsAsMap(List<MavenProject> r
243243
return map;
244244
}
245245

246-
protected boolean comparePomFiles(List<MavenProject> reactorProjects) throws IOException {
247-
return comparePomFiles(reactorProjects, true);
246+
protected void comparePomFiles(List<MavenProject> reactorProjects) throws IOException {
247+
comparePomFiles(reactorProjects, true);
248248
}
249249

250-
protected boolean comparePomFiles(List<MavenProject> reactorProjects, boolean normalizeLineEndings)
250+
protected void comparePomFiles(List<MavenProject> reactorProjects, boolean normalizeLineEndings)
251251
throws IOException {
252252
comparePomFiles(reactorProjects, "", normalizeLineEndings);
253-
254-
// TODO: return void since this is redundant
255-
return true;
256253
}
257254

258255
protected void comparePomFiles(List<MavenProject> reactorProjects, String expectedFileSuffix) throws IOException {
@@ -279,10 +276,6 @@ protected void comparePomFiles(MavenProject project, String expectedFileSuffix,
279276
comparePomFiles(expectedFile, actualFile, normalizeLineEndings, false);
280277
}
281278

282-
protected void comparePomFiles(File expectedFile, File actualFile) throws IOException {
283-
comparePomFiles(expectedFile, actualFile, true, false);
284-
}
285-
286279
protected void comparePomFiles(
287280
File expectedFile, File actualFile, boolean normalizeLineEndings, boolean ignoreComments)
288281
throws IOException {

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testRewriteBasicPom() throws Exception {
7373
.execute(
7474
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
7575

76-
assertTrue(comparePomFiles(reactorProjects));
76+
comparePomFiles(reactorProjects);
7777
}
7878

7979
@Test
@@ -86,7 +86,7 @@ public void testRewriteBasicPomEntities() throws Exception {
8686
.execute(
8787
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
8888

89-
assertTrue(comparePomFiles(reactorProjects));
89+
comparePomFiles(reactorProjects);
9090
}
9191

9292
@Test
@@ -99,7 +99,7 @@ public void testRewriteBasicPomNamespace() throws Exception {
9999
.execute(
100100
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
101101

102-
assertTrue(comparePomFiles(reactorProjects));
102+
comparePomFiles(reactorProjects);
103103
}
104104

105105
@Test
@@ -112,7 +112,7 @@ public void testRewriteBasicPomWithEncoding() throws Exception {
112112
.execute(
113113
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
114114

115-
assertTrue(comparePomFiles(reactorProjects));
115+
comparePomFiles(reactorProjects);
116116
}
117117

118118
@Test
@@ -125,7 +125,7 @@ public void testRewritePomWithParent() throws Exception {
125125
.execute(
126126
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
127127

128-
assertTrue(comparePomFiles(reactorProjects));
128+
comparePomFiles(reactorProjects);
129129
}
130130

131131
@Test
@@ -167,7 +167,7 @@ public void testRewritePomWithReleasedParent() throws Exception {
167167
.execute(
168168
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
169169

170-
assertTrue(comparePomFiles(reactorProjects));
170+
comparePomFiles(reactorProjects);
171171
}
172172

173173
protected abstract void mapAlternateNextVersion(ReleaseDescriptorBuilder config, String projectId);
@@ -182,7 +182,7 @@ public void testRewritePomWithInheritedVersion() throws Exception {
182182
.execute(
183183
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
184184

185-
assertTrue(comparePomFiles(reactorProjects));
185+
comparePomFiles(reactorProjects);
186186
}
187187

188188
@Test
@@ -213,7 +213,7 @@ public void testRewritePomDependencies() throws Exception {
213213
.execute(
214214
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
215215

216-
assertTrue(comparePomFiles(reactorProjects));
216+
comparePomFiles(reactorProjects);
217217
}
218218

219219
@Test
@@ -245,7 +245,7 @@ public void testRewritePomDependenciesDifferentVersion() throws Exception {
245245
.execute(
246246
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
247247

248-
assertTrue(comparePomFiles(reactorProjects));
248+
comparePomFiles(reactorProjects);
249249
}
250250

251251
@Test
@@ -258,7 +258,7 @@ public void testRewriteManagedPomDependencies() throws Exception {
258258
.execute(
259259
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
260260

261-
assertTrue(comparePomFiles(reactorProjects));
261+
comparePomFiles(reactorProjects);
262262
}
263263

264264
@Test
@@ -289,7 +289,7 @@ public void testRewritePomPlugins() throws Exception {
289289
.execute(
290290
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
291291

292-
assertTrue(comparePomFiles(reactorProjects));
292+
comparePomFiles(reactorProjects);
293293
}
294294

295295
@Test
@@ -320,7 +320,7 @@ public void testRewritePomPluginsDifferentVersion() throws Exception {
320320
.execute(
321321
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
322322

323-
assertTrue(comparePomFiles(reactorProjects));
323+
comparePomFiles(reactorProjects);
324324
}
325325

326326
@Test
@@ -333,7 +333,7 @@ public void testRewriteManagedPomPlugins() throws Exception {
333333
.execute(
334334
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
335335

336-
assertTrue(comparePomFiles(reactorProjects));
336+
comparePomFiles(reactorProjects);
337337
}
338338

339339
@Test
@@ -365,7 +365,7 @@ public void testRewritePomReportPlugins() throws Exception {
365365
.execute(
366366
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
367367

368-
assertTrue(comparePomFiles(reactorProjects));
368+
comparePomFiles(reactorProjects);
369369
}
370370

371371
@Test
@@ -397,7 +397,7 @@ public void testRewritePomReportPluginsDifferentVersion() throws Exception {
397397
.execute(
398398
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
399399

400-
assertTrue(comparePomFiles(reactorProjects));
400+
comparePomFiles(reactorProjects);
401401
}
402402

403403
@Test
@@ -410,7 +410,7 @@ public void testRewritePomExtension() throws Exception {
410410
.execute(
411411
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
412412

413-
assertTrue(comparePomFiles(reactorProjects));
413+
comparePomFiles(reactorProjects);
414414
}
415415

416416
@Test
@@ -443,7 +443,7 @@ public void testRewritePomExtensionDifferentVersion() throws Exception {
443443
.execute(
444444
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
445445

446-
assertTrue(comparePomFiles(reactorProjects));
446+
comparePomFiles(reactorProjects);
447447
}
448448

449449
@Test
@@ -456,7 +456,7 @@ public void testRewritePomExtensionUndefinedVersion() throws Exception {
456456
.execute(
457457
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
458458

459-
assertTrue(comparePomFiles(reactorProjects));
459+
comparePomFiles(reactorProjects);
460460
}
461461

462462
@Test
@@ -584,7 +584,7 @@ public void testRewriteWhitespaceAroundValues() throws Exception {
584584
.execute(
585585
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
586586

587-
assertTrue(comparePomFiles(reactorProjects));
587+
comparePomFiles(reactorProjects);
588588
}
589589

590590
@Test
@@ -598,7 +598,7 @@ public void testRewriteCommentsAroundValues() throws Exception {
598598
.execute(
599599
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
600600

601-
assertTrue(comparePomFiles(reactorProjects));
601+
comparePomFiles(reactorProjects);
602602
}
603603

604604
@Test
@@ -612,7 +612,7 @@ public void testRewriteCDataAroundValues() throws Exception {
612612
.execute(
613613
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
614614

615-
assertTrue(comparePomFiles(reactorProjects));
615+
comparePomFiles(reactorProjects);
616616
}
617617

618618
@Test
@@ -684,7 +684,7 @@ public void testRewritePomDependenciesWithNamespace() throws Exception {
684684
.execute(
685685
ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
686686

687-
assertTrue(comparePomFiles(reactorProjects));
687+
comparePomFiles(reactorProjects);
688688
}
689689

690690
protected abstract List<MavenProject> prepareReactorProjects(String path) throws Exception;

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.junit.jupiter.api.Test;
4444

4545
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
46-
import static org.junit.jupiter.api.Assertions.assertTrue;
4746
import static org.mockito.ArgumentMatchers.argThat;
4847
import static org.mockito.ArgumentMatchers.isA;
4948
import static org.mockito.Mockito.mock;
@@ -139,7 +138,7 @@ void testFinalName() throws Exception {
139138

140139
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new DefaultReleaseEnvironment(), reactorProjects);
141140

142-
assertTrue(comparePomFiles(reactorProjects));
141+
comparePomFiles(reactorProjects);
143142
}
144143

145144
/*

0 commit comments

Comments
 (0)