This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 7e861f0a Resolve todo that led to pointless asserts (#1442)
7e861f0a is described below
commit 7e861f0af8db311bbb585d9e30d2921f12c21f7e
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Fri Nov 28 15:54:59 2025 -0600
Resolve todo that led to pointless asserts (#1442)
* Resolve todo that led to pointless asserts
* Remove unused method
---
...tractEditModeRewritingReleasePhaseTestCase.java | 6 +--
.../release/phase/AbstractReleaseTestCase.java | 13 ++-----
.../AbstractRewritingReleasePhaseTestCase.java | 44 +++++++++++-----------
.../phase/GenerateReleasePomsPhaseTest.java | 3 +-
.../phase/RewritePomsForBranchPhaseTest.java | 34 ++++++++---------
.../phase/RewritePomsForDevelopmentPhaseTest.java | 18 ++++-----
.../phase/RewritePomsForReleasePhaseTest.java | 42 ++++++++++-----------
7 files changed, 76 insertions(+), 84 deletions(-)
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
index ecaf3a1a..53a7e60d 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
@@ -63,7 +63,7 @@ abstract class AbstractEditModeRewritingReleasePhaseTestCase
extends AbstractRew
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -130,7 +130,7 @@ abstract class
AbstractEditModeRewritingReleasePhaseTestCase extends AbstractRew
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -161,7 +161,7 @@ abstract class
AbstractEditModeRewritingReleasePhaseTestCase extends AbstractRew
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index ed04e707..01d5451a 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -243,16 +243,13 @@ public abstract class AbstractReleaseTestCase implements
PlexusTestConfiguration
return map;
}
- protected boolean comparePomFiles(List<MavenProject> reactorProjects)
throws IOException {
- return comparePomFiles(reactorProjects, true);
+ protected void comparePomFiles(List<MavenProject> reactorProjects) throws
IOException {
+ comparePomFiles(reactorProjects, true);
}
- protected boolean comparePomFiles(List<MavenProject> reactorProjects,
boolean normalizeLineEndings)
+ protected void comparePomFiles(List<MavenProject> reactorProjects, boolean
normalizeLineEndings)
throws IOException {
comparePomFiles(reactorProjects, "", normalizeLineEndings);
-
- // TODO: return void since this is redundant
- return true;
}
protected void comparePomFiles(List<MavenProject> reactorProjects, String
expectedFileSuffix) throws IOException {
@@ -279,10 +276,6 @@ public abstract class AbstractReleaseTestCase implements
PlexusTestConfiguration
comparePomFiles(expectedFile, actualFile, normalizeLineEndings, false);
}
- protected void comparePomFiles(File expectedFile, File actualFile) throws
IOException {
- comparePomFiles(expectedFile, actualFile, true, false);
- }
-
protected void comparePomFiles(
File expectedFile, File actualFile, boolean normalizeLineEndings,
boolean ignoreComments)
throws IOException {
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
index 10a48903..efa316db 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
@@ -73,7 +73,7 @@ abstract class AbstractRewritingReleasePhaseTestCase extends
AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -86,7 +86,7 @@ abstract class AbstractRewritingReleasePhaseTestCase extends
AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -99,7 +99,7 @@ abstract class AbstractRewritingReleasePhaseTestCase extends
AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -112,7 +112,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -125,7 +125,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -167,7 +167,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
protected abstract void mapAlternateNextVersion(ReleaseDescriptorBuilder
config, String projectId);
@@ -182,7 +182,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -213,7 +213,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -245,7 +245,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -258,7 +258,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -289,7 +289,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -320,7 +320,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -333,7 +333,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -365,7 +365,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -397,7 +397,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -410,7 +410,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -443,7 +443,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -456,7 +456,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -584,7 +584,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -598,7 +598,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -612,7 +612,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -684,7 +684,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
.execute(
ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
protected abstract List<MavenProject> prepareReactorProjects(String path)
throws Exception;
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index 833dea86..b6519757 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -43,7 +43,6 @@ import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
@@ -139,7 +138,7 @@ class GenerateReleasePomsPhaseTest extends
AbstractRewritingReleasePhaseTestCase
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
/*
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
index 81b5b3b3..62f58301 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
@@ -159,7 +159,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Override
@@ -211,7 +211,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -224,7 +224,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -237,7 +237,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -250,7 +250,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -266,7 +266,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -277,7 +277,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -287,7 +287,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -319,7 +319,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -334,7 +334,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-311
@@ -350,7 +350,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-305
@@ -365,7 +365,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -380,7 +380,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -392,7 +392,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-383
@@ -409,7 +409,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(builderReleaseDescriptor, new
DefaultReleaseEnvironment(), reactorProjects);
// compare POMS without line ending normalization
- assertTrue(comparePomFiles(reactorProjects, false));
+ comparePomFiles(reactorProjects, false);
}
protected ReleaseDescriptorBuilder createDescriptorFromProjects(
@@ -428,7 +428,7 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -440,6 +440,6 @@ class RewritePomsForBranchPhaseTest extends
AbstractEditModeRewritingReleasePhas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
index ae7ee2a4..a86ba675 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
@@ -250,7 +250,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -269,7 +269,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -287,7 +287,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -312,7 +312,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -347,7 +347,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -395,7 +395,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -409,7 +409,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -427,7 +427,7 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -442,6 +442,6 @@ class RewritePomsForDevelopmentPhaseTest extends
AbstractEditModeRewritingReleas
builder.addDevelopmentVersion("groupId:subproject1", NEXT_VERSION);
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
index 482af75b..aa386c6b 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
@@ -159,7 +159,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Override
@@ -211,7 +211,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -224,7 +224,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -237,7 +237,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -250,7 +250,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -266,7 +266,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -277,7 +277,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -287,7 +287,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -321,7 +321,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -336,7 +336,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-1109
@@ -350,7 +350,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
builder.addReleaseVersion("groupId:subproject1", NEXT_VERSION);
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -363,7 +363,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
builder.addReleaseVersion("groupId:subproject1", NEXT_VERSION);
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-311
@@ -379,7 +379,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-305
@@ -394,7 +394,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -409,7 +409,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -421,7 +421,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-383
@@ -438,7 +438,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(builderReleaseDescriptor, new
DefaultReleaseEnvironment(), reactorProjects);
// compare POMS without line ending normalization
- assertTrue(comparePomFiles(reactorProjects, false));
+ comparePomFiles(reactorProjects, false);
}
protected ReleaseDescriptorBuilder createDescriptorFromProjects(
@@ -460,7 +460,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
// MRELEASE-454
@@ -472,7 +472,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -484,7 +484,7 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
@Test
@@ -499,6 +499,6 @@ class RewritePomsForReleasePhaseTest extends
AbstractEditModeRewritingReleasePha
phase.execute(ReleaseUtils.buildReleaseDescriptor(builder), new
DefaultReleaseEnvironment(), reactorProjects);
- assertTrue(comparePomFiles(reactorProjects));
+ comparePomFiles(reactorProjects);
}
}
