This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch assert
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit 34dea72b75cea1999c3577579851edaabb28a2d1
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Tue Apr 29 09:26:42 2025 -0400
Use precise assertion methods
---
.../utils/introspection/ReflectionValueExtractorTest.java | 12 ++++++------
.../org/apache/maven/shared/utils/io/SelectorUtilsTest.java | 13 +++++--------
.../apache/maven/shared/utils/xml/XmlWriterUtilTest.java | 11 ++++++-----
.../org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java | 6 +++---
4 files changed, 20 insertions(+), 22 deletions(-)
diff --git
a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
index 423f57f..b340370 100644
---
a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
+++
b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
@@ -98,11 +98,11 @@ public class ReflectionValueExtractorTest extends TestCase {
assertNotNull(dependency);
- assertTrue("dep1".equals(dependency.getArtifactId()));
+ assertEquals("dep1", dependency.getArtifactId());
String artifactId = (String)
ReflectionValueExtractor.evaluate("project.dependencies[1].artifactId",
project);
- assertTrue("dep2".equals(artifactId));
+ assertEquals("dep2", artifactId);
// Array
@@ -110,11 +110,11 @@ public class ReflectionValueExtractorTest extends
TestCase {
assertNotNull(dependency);
- assertTrue("dep1".equals(dependency.getArtifactId()));
+ assertEquals("dep1", dependency.getArtifactId());
artifactId = (String)
ReflectionValueExtractor.evaluate("project.dependenciesAsArray[1].artifactId",
project);
- assertTrue("dep2".equals(artifactId));
+ assertEquals("dep2", artifactId);
// Map
@@ -122,11 +122,11 @@ public class ReflectionValueExtractorTest extends
TestCase {
assertNotNull(dependency);
- assertTrue("dep1".equals(dependency.getArtifactId()));
+ assertEquals("dep1", dependency.getArtifactId());
artifactId = (String)
ReflectionValueExtractor.evaluate("project.dependenciesAsMap(dep2).artifactId",
project);
- assertTrue("dep2".equals(artifactId));
+ assertEquals("dep2", artifactId);
//
----------------------------------------------------------------------
// Build
diff --git
a/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java
b/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java
index 3b24636..52f4da1 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java
@@ -42,12 +42,9 @@ public class SelectorUtilsTest {
@Test
public void testRegexPrefix() throws Exception {
- assertEquals(
- true,
- SelectorUtils.matchPatternStart(
- SelectorUtils.REGEX_HANDLER_PREFIX + File.separator +
"aaa"
- + SelectorUtils.PATTERN_HANDLER_SUFFIX,
- ""));
+ assertTrue(SelectorUtils.matchPatternStart(
+ SelectorUtils.REGEX_HANDLER_PREFIX + File.separator + "aaa" +
SelectorUtils.PATTERN_HANDLER_SUFFIX,
+ ""));
}
@Test
@@ -64,11 +61,11 @@ public class SelectorUtilsTest {
}
private void assertAntDoesNotMatch(String pattern, String target) {
- assertEquals(false,
SelectorUtils.matchPatternStart(wrapWithAntHandler(pattern), target));
+
assertFalse(SelectorUtils.matchPatternStart(wrapWithAntHandler(pattern),
target));
}
private void assertAntMatch(String pattern, String target) {
- assertEquals(true,
SelectorUtils.matchPatternStart(wrapWithAntHandler(pattern), target));
+
assertTrue(SelectorUtils.matchPatternStart(wrapWithAntHandler(pattern),
target));
}
private String wrapWithAntHandler(String val) {
diff --git
a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
index 5566ef9..eb50b07 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
@@ -119,13 +119,13 @@ public class XmlWriterUtilTest extends TestCase {
public void testWriteCommentLineBreakXMLWriterInt() throws Exception {
XmlWriterUtil.writeCommentLineBreak(xmlWriter, 20);
writer.close();
- assertEquals(output.toString(), "<!-- ========== -->" + "\r\n");
+ assertEquals("<!-- ========== -->" + "\r\n", output.toString());
}
public void testWriteCommentLineBreak() throws IOException {
XmlWriterUtil.writeCommentLineBreak(xmlWriter, 10);
writer.close();
- assertEquals(output.toString(), output.toString(), "<!-- -->" +
"\r\n");
+ assertEquals("<!-- -->" + "\r\n", output.toString());
}
/**
@@ -233,8 +233,9 @@ public class XmlWriterUtilTest extends TestCase {
sb.append("<!-- world
-->")
.append("\r\n");
assertEquals(output.toString(), sb.toString());
- assertTrue(output.toString().length()
- == 2 * (XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 +
"\r\n".length()) + 2 * repeat.length());
+ assertEquals(
+ output.toString().length(),
+ 2 * (XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length())
+ 2 * repeat.length());
}
/**
@@ -251,7 +252,7 @@ public class XmlWriterUtilTest extends TestCase {
sb.append(indent);
sb.append("<!-- hello
-->").append("\r\n");
assertEquals(output.toString(), sb.toString());
- assertTrue(output.toString().length() == 50 - 1 + "\r\n".length() + 2
* 4);
+ assertEquals(output.toString().length(), 50 - 1 + "\r\n".length() + 2
* 4);
}
public void testWriteCommentXMLWriterStringIntIntInt_2() throws
IOException {
diff --git
a/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
b/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
index fb8315d..f240738 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
@@ -150,9 +150,9 @@ public class Xpp3DomTest {
assertEquals(dom, dom);
//noinspection ObjectEqualsNull
- assertFalse(dom.equals(null));
- assertFalse(dom.equals(new Xpp3Dom((String) null)));
- assertFalse(dom.equals(other));
+ assertNotEquals(null, dom);
+ assertNotEquals(dom, new Xpp3Dom((String) null));
+ assertNotEquals(dom, other);
}
@Test
