This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch red
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/red by this push:
new 7123ef0b simplify
7123ef0b is described below
commit 7123ef0be56e5f1ac75d81f8be5282e55de80d4b
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Wed Nov 26 18:31:26 2025 -0600
simplify
---
.../shared/release/config/ReleaseUtilsTest.java | 54 +++++++++++-----------
.../release/exec/CommandLineFactoryTest.java | 4 +-
.../release/phase/CreateBackupPomsPhaseTest.java | 3 +-
.../release/phase/RemoveReleasePomsPhaseTest.java | 5 +-
.../release/phase/RestoreBackupPomsPhaseTest.java | 3 +-
5 files changed, 36 insertions(+), 33 deletions(-)
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
index 59d2d92b..98e72381 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
@@ -30,7 +30,7 @@ import
org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -57,7 +57,7 @@ class ReleaseUtilsTest {
assertEquals(builder, builder, "test ==");
Object obj = this;
- assertFalse(builder.equals(obj), "test class instance");
+ assertNotEquals(builder, obj, "test class instance");
}
private static void doEqualsAssertions(
@@ -71,67 +71,67 @@ class ReleaseUtilsTest {
assertEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmSourceUrl(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmSourceUrl(origConfig.getScmSourceUrl());
configBuilder.setAdditionalArguments(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setAdditionalArguments(origConfig.getAdditionalArguments());
configBuilder.setAddSchema(!origConfig.isAddSchema());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setAddSchema(origConfig.isAddSchema());
configBuilder.setGenerateReleasePoms(!origConfig.isAddSchema());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setGenerateReleasePoms(origConfig.isGenerateReleasePoms());
configBuilder.setScmUseEditMode(!origConfig.isScmUseEditMode());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmUseEditMode(origConfig.isScmUseEditMode());
configBuilder.setInteractive(!origConfig.isInteractive());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setInteractive(origConfig.isInteractive());
configBuilder.setCommitByProject(!origConfig.isCommitByProject());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setCommitByProject(origConfig.isCommitByProject());
configBuilder.setCompletedPhase(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setCompletedPhase(origConfig.getCompletedPhase());
configBuilder.setScmPrivateKeyPassPhrase(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmPrivateKeyPassPhrase(origConfig.getScmPrivateKeyPassPhrase());
configBuilder.setScmPassword(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmPassword(origConfig.getScmPassword());
configBuilder.setScmUsername(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmUsername(origConfig.getScmUsername());
configBuilder.setScmPrivateKey(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmPrivateKey(origConfig.getScmPrivateKey());
configBuilder.setPomFileName(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setPomFileName(origConfig.getPomFileName());
configBuilder.setPreparationGoals(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setPreparationGoals(origConfig.getPreparationGoals());
configBuilder.setScmReleaseLabel(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmReleaseLabel(origConfig.getScmReleaseLabel());
configBuilder.setScmTagBase(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmTagBase(origConfig.getScmTagBase());
if (otherFile != null) {
@@ -141,7 +141,7 @@ class ReleaseUtilsTest {
"Failed to create the directory, along with all
necessary parent directories");
}
configBuilder.setWorkingDirectory(AbstractReleaseTestCase.getPath(otherFile));
- assertFalse(configBuilder.build().equals(origConfig), "Check
original comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
}
configBuilder.setWorkingDirectory(origConfig.getWorkingDirectory());
@@ -150,20 +150,20 @@ class ReleaseUtilsTest {
assertEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.addDevelopmentVersion("groupId:artifactId",
"1.0-SNAPSHOT");
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addReleaseVersion("groupId:artifactId", "1.0");
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", new Scm());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", new Scm());
origConfig.addOriginalScmInfo("foo", new Scm());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
@@ -181,25 +181,25 @@ class ReleaseUtilsTest {
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("-",
"dev", "url", "tag"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"-", "url", "tag"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "-", "tag"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "-"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
}
@Test
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
index 4b4f95e9..960fffd2 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
@@ -24,7 +24,7 @@ import org.codehaus.plexus.testing.PlexusTest;
import org.codehaus.plexus.util.cli.Commandline;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -46,6 +46,6 @@ class CommandLineFactoryTest {
String executable = cl.getExecutable();
assertTrue(executable.contains("exec"), "Check executable " +
executable);
assertNotNull(cl.getEnvironmentVariables(), "Check environment");
- assertFalse(cl.getEnvironmentVariables().length == 0, "Check
environment");
+ assertNotEquals(0, cl.getEnvironmentVariables().length, "Check
environment");
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
index 4b7e5ec9..0651baf3 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
@@ -32,6 +32,7 @@ import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
import static org.codehaus.plexus.testing.PlexusExtension.getTestPath;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -112,7 +113,7 @@ class CreateBackupPomsPhaseTest extends
AbstractBackupPomsPhaseTest {
String backupContents = ReleaseUtil.readXmlFile(backupFile);
- assertTrue(pomContents.equals(backupContents), "Check if pom
and backup files are identical");
+ assertEquals(pomContents, backupContents, "Check if pom and
backup files are identical");
} else {
assertFalse(backupFile.exists(), "Check if backup file is not
present");
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
index 8818fd70..7fbc3739 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
@@ -46,6 +46,7 @@ import org.junit.jupiter.api.Test;
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
@@ -161,7 +162,7 @@ class RemoveReleasePomsPhaseTest extends
AbstractReleaseTestCase {
try (BufferedReader reader = new BufferedReader(new
StringReader(result.getOutput()))) {
assertEquals("[INFO] Removing release POM for 'artifactId'...",
reader.readLine());
- assertEquals(null, reader.readLine(), "Expected EOF");
+ assertNull(reader.readLine(), "Expected EOF");
}
// never invoke scmProviderMock
@@ -190,7 +191,7 @@ class RemoveReleasePomsPhaseTest extends
AbstractReleaseTestCase {
"[INFO] Full run would be removing ["
+ reactorProjects.get(0).getFile().getParent() +
File.separator + "release-pom.xml]",
reader.readLine());
- assertEquals(null, reader.readLine(), "Expected EOF");
+ assertNull(reader.readLine(), "Expected EOF");
}
// never invoke scmProviderMock
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
index 396c3336..9d9958dc 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
@@ -35,6 +35,7 @@ import org.junit.jupiter.api.Test;
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
import static org.codehaus.plexus.testing.PlexusExtension.getTestPath;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -98,7 +99,7 @@ class RestoreBackupPomsPhaseTest extends
AbstractBackupPomsPhaseTest {
String expectedContents = ReleaseUtil.readXmlFile(expectedFile);
- assertTrue(pomContents.equals(expectedContents), "Check if pom and
backup files are identical");
+ assertEquals(pomContents, expectedContents, "Check if pom and
backup files are identical");
}
}
}
