This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 67b7564d Make test more readable and maintainable, and less verbose
67b7564d is described below
commit 67b7564d039a951231d18bfa95dbb7e8d52392f8
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Oct 1 11:06:01 2024 -0400
Make test more readable and maintainable, and less verbose
- Use JUnit 5 APIs
- Be consistent throughout tests
---
pom.xml | 7 -------
.../configuration2/SynchronizerTestImpl.java | 11 ++++-------
.../configuration2/TestAbstractConfiguration.java | 21 ++++++++-------------
.../configuration2/TestINIConfiguration.java | 4 +---
.../configuration2/TestImmutableConfiguration.java | 4 +---
.../TestPropertiesConfiguration.java | 22 ++++++++++++----------
.../configuration2/TestXMLConfiguration.java | 18 ++++++++----------
.../configuration2/TestXMLListHandling.java | 7 +++----
.../beanutils/TestDefaultBeanFactory.java | 8 +++-----
.../interpol/TestConfigurationInterpolator.java | 4 +---
.../commons/configuration2/io/TestFileLocator.java | 15 +++++++--------
.../plist/TestXMLPropertyListConfiguration.java | 6 ++----
.../tree/TestDefaultExpressionEngineSymbols.java | 15 +++++++--------
.../configuration2/tree/TestNodeSelector.java | 7 +++----
.../configuration2/tree/TestQueryResult.java | 8 +++-----
.../TestConfigurationNodeIteratorChildren.java | 4 +---
16 files changed, 64 insertions(+), 97 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3d1d6743..096c8a57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,13 +289,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git
a/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java
b/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java
index 1d6fc512..0b8f4fcc 100644
--- a/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java
+++ b/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java
@@ -16,11 +16,8 @@
*/
package org.apache.commons.configuration2;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.configuration2.sync.Synchronizer;
@@ -115,7 +112,7 @@ public class SynchronizerTestImpl implements Synchronizer {
* @param expMethods the expected methods
*/
public void verifyContains(final Methods... expMethods) {
- assertThat(methods.toString(),
containsString(constructExpectedMethods(expMethods)));
+
assertTrue(methods.toString().contains(constructExpectedMethods(expMethods)));
}
/**
@@ -124,7 +121,7 @@ public class SynchronizerTestImpl implements Synchronizer {
* @param expMethods the expected methods
*/
public void verifyEnd(final Methods... expMethods) {
- assertThat(methods.toString(),
endsWith(constructExpectedMethods(expMethods)));
+
assertTrue(methods.toString().endsWith(constructExpectedMethods(expMethods)));
}
/**
@@ -133,6 +130,6 @@ public class SynchronizerTestImpl implements Synchronizer {
* @param expMethods the expected methods
*/
public void verifyStart(final Methods... expMethods) {
- assertThat(methods.toString(),
startsWith(constructExpectedMethods(expMethods)));
+
assertTrue(methods.toString().startsWith(constructExpectedMethods(expMethods)));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
index 0c3ee32e..98abb340 100644
---
a/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
@@ -17,9 +17,6 @@
package org.apache.commons.configuration2;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,8 +28,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.apache.commons.configuration2.ex.ConversionException;
import org.apache.commons.configuration2.io.ConfigurationLogger;
@@ -130,27 +129,23 @@ public abstract class TestAbstractConfiguration {
public void testGetBigIntegerConversion() {
final Configuration config = getConfiguration();
final ConversionException cex =
assertThrows(ConversionException.class, () -> config.getBigInteger("key1"));
- assertThat(cex.getMessage(), containsString("'key1'"));
- assertThat(cex.getMessage(),
containsString(BigInteger.class.getName()));
- assertThat(cex.getMessage(), containsString(config.getString("key1")));
+ assertTrue(cex.getMessage().contains("'key1'"));
+ assertTrue(cex.getMessage().contains(BigInteger.class.getName()));
+ assertTrue(cex.getMessage().contains(config.getString("key1")));
}
@Test
public void testGetKeys() {
final Configuration config = getConfiguration();
final Iterator<String> keys = config.getKeys();
-
- final String[] expectedKeys = {"key1", "key2", "list", "listesc"};
-
+ final Set<String> expectedKeys = new HashSet<>(Arrays.asList("key1",
"key2", "list", "listesc"));
assertNotNull(keys);
assertTrue(keys.hasNext());
-
- final List<String> actualKeys = new ArrayList<>();
+ final Set<String> actualKeys = new HashSet<>();
while (keys.hasNext()) {
actualKeys.add(keys.next());
}
-
- assertThat("keys", actualKeys, containsInAnyOrder(expectedKeys));
+ assertEquals(actualKeys, expectedKeys, "keys");
}
@Test
diff --git
a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 93ecd6e7..a7cec69a 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -18,8 +18,6 @@
package org.apache.commons.configuration2;
import static org.apache.commons.configuration2.TempDirUtils.newFile;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -846,7 +844,7 @@ public class TestINIConfiguration {
load(conf, data);
assertEquals("dotValue", conf.getString("section3.key..dot"));
final String output = saveToString(conf);
- assertThat(output, containsString("key.dot = dotValue"));
+ assertTrue(output.contains("key.dot = dotValue"));
}
@Test
diff --git
a/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
index fc527a26..8dc6da3e 100644
---
a/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.configuration2;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -75,7 +73,7 @@ public class TestImmutableConfiguration {
config.setThrowExceptionOnMissing(true);
final ImmutableConfiguration ic =
ConfigurationUtils.unmodifiableConfiguration(config);
final NoSuchElementException e =
assertThrows(NoSuchElementException.class, () -> ic.getString(property));
- assertThat(e.getMessage(), containsString(property));
+ assertTrue(e.getMessage().contains(property));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 99519cdf..42ade0b7 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -18,10 +18,6 @@
package org.apache.commons.configuration2;
import static org.apache.commons.configuration2.TempDirUtils.newFile;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -995,7 +991,7 @@ public class TestPropertiesConfiguration {
// ensure that the written properties file contains no Unicode escapes
for (final String line :
Files.readAllLines(TEST_SAVE_PROPERTIES_FILE.toPath())) {
- assertThat(line, not(containsString("\\u")));
+ assertFalse(line.contains("\\u"));
}
}
@@ -1005,8 +1001,14 @@ public class TestPropertiesConfiguration {
@Test
public void testKeepSeparators() throws ConfigurationException,
IOException {
saveTestConfig();
- final String[] separatorTests = {"test.separator.equal = foo",
"test.separator.colon : foo", "test.separator.tab\tfoo",
"test.separator.whitespace foo",
- "test.separator.no.space=foo"};
+ // @formatter:off
+ final Set<String> separatorTests = new HashSet<>(Arrays.asList(
+ "test.separator.equal = foo",
+ "test.separator.colon : foo",
+ "test.separator.tab\tfoo",
+ "test.separator.whitespace foo",
+ "test.separator.no.space=foo"));
+ // @formatter:on
final Set<String> foundLines = new HashSet<>();
try (BufferedReader in = new BufferedReader(new
FileReader(TEST_SAVE_PROPERTIES_FILE))) {
String s;
@@ -1018,7 +1020,7 @@ public class TestPropertiesConfiguration {
}
}
}
- assertThat(foundLines, containsInAnyOrder(separatorTests));
+ assertEquals(separatorTests, foundLines);
}
/**
@@ -1057,7 +1059,7 @@ public class TestPropertiesConfiguration {
new FileHandler(conf).save(out);
final String content = out.toString();
assertEquals(0, content.indexOf("# My header" + eol + eol));
- assertThat(content, containsString("prop = value" + eol));
+ assertTrue(content.contains("prop = value" + eol));
}
/**
@@ -1272,7 +1274,7 @@ public class TestPropertiesConfiguration {
conf = new PropertiesConfiguration();
try (Reader in = new
FileReader(ConfigurationAssert.getTestFile("test.properties"))) {
final ConfigurationException e =
assertThrows(ConfigurationException.class, () -> conf.read(in));
- assertThat(e.getMessage(), containsString("FileHandler"));
+ assertTrue(e.getMessage().contains("FileHandler"));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index de8c4a24..99910d37 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -18,8 +18,6 @@
package org.apache.commons.configuration2;
import static org.apache.commons.configuration2.TempDirUtils.newFile;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -1054,7 +1052,7 @@ public class TestXMLConfiguration {
final String content = "<configuration><test>1</test></configuration>";
final ByteArrayInputStream bis = new
ByteArrayInputStream(content.getBytes());
final ConfigurationException e =
assertThrows(ConfigurationException.class, () -> conf.read(bis));
- assertThat(e.getMessage(), containsString("FileHandler"));
+ assertTrue(e.getMessage().contains("FileHandler"));
}
@Test
@@ -1159,7 +1157,7 @@ public class TestXMLConfiguration {
final StringWriter writer = new StringWriter();
new FileHandler(conf).save(writer);
final String content = writer.toString();
- assertThat("Path not found: ", content,
containsString("<path>C:\\Temp</path>"));
+ assertTrue(content.contains("<path>C:\\Temp</path>"), "Path not found:
");
saveTestConfig();
final XMLConfiguration conf2 = new XMLConfiguration();
load(conf2, testSaveConf.getAbsolutePath());
@@ -1223,7 +1221,7 @@ public class TestXMLConfiguration {
assertEquals(SYSTEM_ID, conf.getSystemID());
final StringWriter out = new StringWriter();
new FileHandler(conf).save(out);
- assertThat(out.toString(), containsString(DOCTYPE));
+ assertTrue(out.toString().contains(DOCTYPE));
}
/**
@@ -1238,7 +1236,7 @@ public class TestXMLConfiguration {
conf.setSystemID(SYSTEM_ID);
final StringWriter out = new StringWriter();
new FileHandler(conf).save(out);
- assertThat(out.toString(), containsString(DOCTYPE + "testconfig" +
DOCTYPE_DECL));
+ assertTrue(out.toString().contains(DOCTYPE + "testconfig" +
DOCTYPE_DECL));
}
/**
@@ -1253,7 +1251,7 @@ public class TestXMLConfiguration {
final StringWriter out = new StringWriter();
handler.save(out);
- assertThat(out.toString(), containsString("encoding=\"" + ENCODING +
"\""));
+ assertTrue(out.toString().contains("encoding=\"" + ENCODING + "\""));
}
/**
@@ -1282,7 +1280,7 @@ public class TestXMLConfiguration {
final StringWriter out = new StringWriter();
handler.save(out);
- assertThat("Encoding was written to file", out.toString(),
containsString("encoding=\"UTF-"));
+ assertTrue(out.toString().contains("encoding=\"UTF-"), "Encoding was
written to file");
}
@Test
@@ -1293,7 +1291,7 @@ public class TestXMLConfiguration {
final StringWriter out = new StringWriter();
handler.save(out);
- assertThat("Encoding was not written to file", out.toString(),
containsString("testconfig xmlns:ex=\"http://example.com/\"";));
+ assertTrue(out.toString().contains("testconfig
xmlns:ex=\"http://example.com/\"";), "Encoding was not written to file");
}
@Test
@@ -1305,7 +1303,7 @@ public class TestXMLConfiguration {
final StringWriter out = new StringWriter();
handler.save(out);
- assertThat("Encoding was not written to file", out.toString(),
containsString("configuration xmlns:foo=\"http://example.com/\"";));
+ assertTrue(out.toString().contains("configuration
xmlns:foo=\"http://example.com/\"";), "Encoding was not written to file");
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
index 07492af4..507313e8 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java
@@ -16,10 +16,9 @@
*/
package org.apache.commons.configuration2;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.StringReader;
import java.io.StringWriter;
@@ -62,7 +61,7 @@ public class TestXMLListHandling {
private static void checkCommaSeparated(final String xml, final String
key, final String... values) {
final String strValues = StringUtils.join(values, ',');
final String element = element(key, strValues);
- assertThat(xml, containsString(element));
+ assertTrue(xml.contains(element));
}
/**
@@ -74,7 +73,7 @@ public class TestXMLListHandling {
*/
private static void checkSplit(final String xml, final String key, final
String... values) {
for (final String v : values) {
- assertThat(xml, containsString(element(key, v)));
+ assertTrue(xml.contains(element(key, v)));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
b/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
index 47091427..86ee295d 100644
---
a/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
+++
b/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.configuration2.beanutils;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -240,9 +238,9 @@ public class TestDefaultBeanFactory {
final ConfigurationRuntimeException crex =
assertThrows(ConfigurationRuntimeException.class,
() ->
DefaultBeanFactory.findMatchingConstructor(BeanCreationTestCtorBean.class,
decl));
final String msg = crex.getMessage();
- assertThat(msg,
containsString(BeanCreationTestCtorBean.class.getName()));
- assertThat(msg, containsString(TEST_STRING));
- assertThat(msg, containsString("(" + getClass().getName() + ')'));
+ assertTrue(msg.contains(BeanCreationTestCtorBean.class.getName()));
+ assertTrue(msg.contains(TEST_STRING));
+ assertTrue(msg.contains("(" + getClass().getName() + ')'));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
b/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
index 6d0ef809..178264f0 100644
---
a/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
+++
b/src/test/java/org/apache/commons/configuration2/interpol/TestConfigurationInterpolator.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.configuration2.interpol;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.matchesPattern;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -465,7 +463,7 @@ public class TestConfigurationInterpolator {
public void testInterpolationBeginningAndEndingRiskyVariableLookups() {
interpolator.registerLookups(ConfigurationInterpolator.getDefaultPrefixLookups());
final String result = (String)
interpolator.interpolate("${date:yyyy-MM}-${date:dd}");
- assertThat(result, matchesPattern("\\d{4}-\\d{2}-\\d{2}"));
+ assertTrue(result.matches("\\d{4}-\\d{2}-\\d{2}"));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java
b/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java
index e9b41bab..e05b7f8f 100644
--- a/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java
+++ b/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java
@@ -16,12 +16,11 @@
*/
package org.apache.commons.configuration2.io;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import java.net.URL;
@@ -172,11 +171,11 @@ public class TestFileLocator {
final FileLocator loc =
FileLocatorUtils.fileLocator().basePath(BASE_PATH).fileName(FILE_NAME).encoding(ENCODING).fileSystem(fileSystem)
.sourceURL(sourceURL).locationStrategy(locationStrategy).create();
final String s = loc.toString();
- assertThat(s, containsString("fileName=" + FILE_NAME));
- assertThat(s, containsString("basePath=" + BASE_PATH));
- assertThat(s, containsString("sourceURL=" + sourceURL));
- assertThat(s, containsString("encoding=" + ENCODING));
- assertThat(s, containsString("fileSystem=" + fileSystem));
- assertThat(s, containsString("locationStrategy=" + locationStrategy));
+ assertTrue(s.contains("fileName=" + FILE_NAME));
+ assertTrue(s.contains("basePath=" + BASE_PATH));
+ assertTrue(s.contains("sourceURL=" + sourceURL));
+ assertTrue(s.contains("encoding=" + ENCODING));
+ assertTrue(s.contains("fileSystem=" + fileSystem));
+ assertTrue(s.contains("locationStrategy=" + locationStrategy));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
index 2c63f14f..503f1467 100644
---
a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
@@ -18,8 +18,6 @@
package org.apache.commons.configuration2.plist;
import static org.apache.commons.configuration2.TempDirUtils.newFile;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -85,7 +83,7 @@ public class TestXMLPropertyListConfiguration {
values.append("<string>").append(v).append("</string>");
}
final String content = out.toString().replaceAll("[ \n\r]", "");
- assertThat(content,
containsString(String.format("<key>array</key><array>%s</array>", values)));
+
assertTrue(content.contains(String.format("<key>array</key><array>%s</array>",
values)));
}
/**
@@ -465,7 +463,7 @@ public class TestXMLPropertyListConfiguration {
try (Writer out = new FileWriter(newFile(tempFolder))) {
final ConfigurationException e =
assertThrows(ConfigurationException.class, () -> config.write(out));
- assertThat(e.getMessage(), containsString("FileHandler"));
+ assertTrue(e.getMessage().contains("FileHandler"));
}
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java
b/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java
index 6837f099..edcfd376 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java
@@ -16,10 +16,9 @@
*/
package org.apache.commons.configuration2.tree;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
@@ -127,11 +126,11 @@ public class TestDefaultExpressionEngineSymbols {
public void testToString() {
final DefaultExpressionEngineSymbols symbols = builder().create();
final String s = symbols.toString();
- assertThat(s, containsString("propertyDelimiter=" +
symbols.getPropertyDelimiter()));
- assertThat(s, containsString("escapedDelimiter=" +
symbols.getEscapedDelimiter()));
- assertThat(s, containsString("indexStart=" + symbols.getIndexStart()));
- assertThat(s, containsString("indexEnd=" + symbols.getIndexEnd()));
- assertThat(s, containsString("attributeStart=" +
symbols.getAttributeStart()));
- assertThat(s, containsString("attributeEnd=" +
symbols.getAttributeEnd()));
+ assertTrue(s.contains("propertyDelimiter=" +
symbols.getPropertyDelimiter()));
+ assertTrue(s.contains("escapedDelimiter=" +
symbols.getEscapedDelimiter()));
+ assertTrue(s.contains("indexStart=" + symbols.getIndexStart()));
+ assertTrue(s.contains("indexEnd=" + symbols.getIndexEnd()));
+ assertTrue(s.contains("attributeStart=" +
symbols.getAttributeStart()));
+ assertTrue(s.contains("attributeEnd=" + symbols.getAttributeEnd()));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
b/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
index fa530bc8..62480e35 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestNodeSelector.java
@@ -16,11 +16,10 @@
*/
package org.apache.commons.configuration2.tree;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
import java.util.Collections;
@@ -207,7 +206,7 @@ public class TestNodeSelector {
final String key2 = "anotherSelectionKey";
final NodeSelector selector = new NodeSelector(KEY).subSelector(key2);
final String s = selector.toString();
- assertThat(s, containsString(KEY));
- assertThat(s, containsString(key2));
+ assertTrue(s.contains(KEY));
+ assertTrue(s.contains(key2));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/TestQueryResult.java
b/src/test/java/org/apache/commons/configuration2/tree/TestQueryResult.java
index 8f4bdcd0..3bfac59d 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestQueryResult.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestQueryResult.java
@@ -17,8 +17,6 @@
package org.apache.commons.configuration2.tree;
import static
org.apache.commons.configuration2.ConfigurationAssert.checkEquals;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -133,8 +131,8 @@ public class TestQueryResult {
public void testToStringAttributeResult() {
final QueryResult<ImmutableNode> result =
QueryResult.createAttributeResult(attributeNode, ATTR);
final String s = result.toString();
- assertThat(s, containsString("attribute=" + ATTR));
- assertThat(s, containsString("parentNode=" + attributeNode));
+ assertTrue(s.contains("attribute=" + ATTR));
+ assertTrue(s.contains("parentNode=" + attributeNode));
}
/**
@@ -143,6 +141,6 @@ public class TestQueryResult {
@Test
public void testToStringNodeResult() {
final QueryResult<ImmutableNode> result =
QueryResult.createNodeResult(resultNode);
- assertThat(result.toString(), containsString("resultNode=" +
resultNode));
+ assertTrue(result.toString().contains("resultNode=" + resultNode));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java
index 5b09268b..04acf09c 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.configuration2.tree.xpath;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.endsWith;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -62,7 +60,7 @@ public class TestConfigurationNodeIteratorChildren extends
AbstractXPathTest {
final List<NodePointer> nodes = iterationElements(iterator);
for (int i = 0; i < expectedIndices.length; i++) {
final ImmutableNode child = (ImmutableNode)
nodes.get(i).getImmediateNode();
- assertThat(child.getValue().toString(),
endsWith(String.valueOf(expectedIndices[i])));
+
assertTrue(child.getValue().toString().endsWith(String.valueOf(expectedIndices[i])));
}
}
