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 e4fff0e Replace assert by simpler but equivalent calls. (#139)
e4fff0e is described below
commit e4fff0ef324003f9c1912ff59132820e0f3f4398
Author: Arturo Bernal <[email protected]>
AuthorDate: Thu Mar 3 02:01:22 2022 +0100
Replace assert by simpler but equivalent calls. (#139)
---
.../commons/configuration2/NonStringTestHolder.java | 2 +-
.../commons/configuration2/TestBaseConfiguration.java | 5 +++--
.../commons/configuration2/TestBaseNullConfiguration.java | 2 +-
.../commons/configuration2/TestCombinedConfiguration.java | 8 ++++----
.../configuration2/TestCompositeConfiguration.java | 8 ++++----
.../commons/configuration2/TestDatabaseConfiguration.java | 5 +++--
.../configuration2/TestDynamicCombinedConfiguration.java | 2 +-
.../apache/commons/configuration2/TestEqualBehavior.java | 3 ++-
.../commons/configuration2/TestINIConfiguration.java | 2 +-
.../configuration2/TestImmutableConfiguration.java | 2 +-
.../commons/configuration2/TestJNDIConfiguration.java | 6 +++---
.../commons/configuration2/TestJNDIEnvironmentValues.java | 2 +-
.../configuration2/TestNullCompositeConfiguration.java | 8 ++++----
.../configuration2/TestNullJNDIEnvironmentValues.java | 2 +-
.../configuration2/TestPatternSubtreeConfiguration.java | 8 ++++----
.../configuration2/TestPropertiesConfiguration.java | 4 ++--
.../configuration2/TestPropertiesConfigurationLayout.java | 7 ++++---
.../commons/configuration2/TestXMLConfiguration.java | 4 ++--
.../beanutils/TestConfigurationDynaBean.java | 10 +++++-----
.../combined/TestMultiFileConfigurationBuilder.java | 2 +-
...estReloadingCombinedConfigurationBuilderFileBased.java | 2 +-
.../event/AbstractEventListenerTestImpl.java | 3 ++-
.../apache/commons/configuration2/io/TestFileLocator.java | 6 +++---
.../commons/configuration2/io/TestFileLocatorUtils.java | 4 ++--
.../plist/TestPropertyListConfiguration.java | 3 ++-
.../configuration2/plist/TestPropertyListParser.java | 3 ++-
.../plist/TestXMLPropertyListConfiguration.java | 9 +++++----
.../configuration2/tree/TestDefaultConfigurationKey.java | 15 ++++++++-------
.../tree/TestDefaultExpressionEngineSymbols.java | 11 +++++------
29 files changed, 78 insertions(+), 70 deletions(-)
diff --git
a/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java
b/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java
index 45bc9cc..3d5b5a9 100644
--- a/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java
+++ b/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java
@@ -93,7 +93,7 @@ public class NonStringTestHolder {
}
public void testIsEmpty() throws Exception {
- Assert.assertTrue("Configuration should not be empty",
!configuration.isEmpty());
+ Assert.assertFalse("Configuration should not be empty",
configuration.isEmpty());
}
public void testListMissing() throws Exception {
diff --git
a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
index 12eb7c0..e5596f3 100644
--- a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.commons.configuration2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -418,7 +419,7 @@ public class TestBaseConfiguration {
config.addProperty("booleanValue", "${boolean}");
// primitive types
- assertEquals("boolean interpolation", true,
config.getBoolean("booleanValue"));
+ assertTrue("boolean interpolation", config.getBoolean("booleanValue"));
assertEquals("byte interpolation", 1, config.getByte("value"));
assertEquals("short interpolation", 1, config.getShort("value"));
assertEquals("int interpolation", 1, config.getInt("value"));
@@ -483,7 +484,7 @@ public class TestBaseConfiguration {
@Test
public void testGetProperty() {
/* should be empty and return null */
- assertEquals("This returns null", config.getProperty("foo"), null);
+ assertNull("This returns null", config.getProperty("foo"));
/* add a real value, and get it two different ways */
config.setProperty("number", "1");
diff --git
a/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
index 3ff097d..9a48f72 100644
---
a/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
@@ -240,7 +240,7 @@ public class TestBaseNullConfiguration {
@Test
public void testGetProperty() {
/* should be empty and return null */
- assertEquals("This returns null", config.getProperty("foo"), null);
+ assertNull("This returns null", config.getProperty("foo"));
/* add a real value, and get it two different ways */
config.setProperty("number", "1");
diff --git
a/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java
index 5c64d21..032d647 100644
---
a/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java
@@ -697,10 +697,10 @@ public class TestCombinedConfiguration {
config.addConfiguration(pc, "props");
final List<String> list = config.getConfigurationNameList();
assertNotNull("No list of configurations returned", list);
- assertTrue("Incorrect number of configurations", list.size() == 3);
+ assertEquals("Incorrect number of configurations", 3, list.size());
final String name = list.get(1);
assertNotNull("No name returned", name);
- assertTrue("Incorrect configuration name", TEST_NAME.equals(name));
+ assertEquals("Incorrect configuration name", TEST_NAME, name);
}
/**
@@ -733,9 +733,9 @@ public class TestCombinedConfiguration {
config.addConfiguration(pc, "props");
final List<Configuration> list = config.getConfigurations();
assertNotNull("No list of configurations returned", list);
- assertTrue("Incorrect number of configurations", list.size() == 3);
+ assertEquals("Incorrect number of configurations", 3, list.size());
final Configuration c = list.get(2);
- assertTrue("Incorrect configuration", c == pc);
+ assertSame("Incorrect configuration", c, pc);
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
index 256197c..84dacfd 100644
---
a/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
@@ -240,7 +240,7 @@ public class TestCompositeConfiguration {
cc.addConfiguration(conf1);
cc.addConfiguration(xmlConf);
cc.clearProperty("test.short");
- assertTrue("Make sure test.short is gone!",
!cc.containsKey("test.short"));
+ assertFalse("Make sure test.short is gone!",
cc.containsKey("test.short"));
}
@Test
@@ -294,8 +294,8 @@ public class TestCompositeConfiguration {
cc.addConfiguration(conf1);
cc.addConfiguration(xmlConf);
assertEquals("default", cc.getString("bogus", "default"));
- assertTrue(1.4 == cc.getDouble("bogus", 1.4));
- assertTrue(1.4 == cc.getDouble("bogus", 1.4));
+ assertEquals(1.4, cc.getDouble("bogus", 1.4), 0.0);
+ assertEquals(1.4, cc.getDouble("bogus", 1.4), 0.0);
}
/**
@@ -483,7 +483,7 @@ public class TestCompositeConfiguration {
assertTrue(nsee.getMessage().contains("bogus.property"));
}
- assertTrue("Should be false", !cc.getBoolean("test.missing.boolean",
false));
+ assertFalse("Should be false", cc.getBoolean("test.missing.boolean",
false));
assertTrue("Should be true",
cc.getBoolean("test.missing.boolean.true", true));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
index 7b17472..6b63e36 100644
---
a/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.commons.configuration2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import javax.sql.DataSource;
@@ -436,7 +437,7 @@ public class TestDatabaseConfiguration {
assertEquals("property1", "value1", config.getProperty("key1"));
assertEquals("property2", "value2", config.getProperty("key2"));
- assertEquals("unknown property", null, config.getProperty("key3"));
+ assertNull("unknown property", config.getProperty("key3"));
}
@Test
@@ -445,7 +446,7 @@ public class TestDatabaseConfiguration {
assertEquals("property1", "value1", config.getProperty("key1"));
assertEquals("property2", "value2", config.getProperty("key2"));
- assertEquals("unknown property", null, config.getProperty("key3"));
+ assertNull("unknown property", config.getProperty("key3"));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
index 843f943..2bd3f23 100644
---
a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
@@ -479,6 +479,6 @@ public class TestDynamicCombinedConfiguration {
private void verify(final String key, final DynamicCombinedConfiguration
config, final int rows) {
System.setProperty("Id", key);
- assertTrue(config.getInt("rowsPerPage") == rows);
+ assertEquals(config.getInt("rowsPerPage"), rows);
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java
b/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java
index c9b9bae..2a186e6 100644
--- a/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java
+++ b/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java
@@ -19,6 +19,7 @@ package org.apache.commons.configuration2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import java.util.Iterator;
@@ -202,7 +203,7 @@ public class TestEqualBehavior {
final String value = "new value";
assertTrue(simple.containsKey(key));
- assertFalse(simple.getString(key).equals(value));
+ assertNotEquals(value, simple.getString(key));
assertEquals(simple.containsKey(key), composite.containsKey(key));
simple.setProperty(key, value);
diff --git
a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 64b7226..f98633e 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -190,7 +190,7 @@ public class TestINIConfiguration {
assertEquals("var2", 451, instance.getInt("section1.var2"));
assertEquals("section2.var1", 123.45,
instance.getDouble("section2.var1"), .001);
assertEquals("section2.var2", "bar",
instance.getString("section2.var2"));
- assertEquals("section3.var1", true,
instance.getBoolean("section3.var1"));
+ assertTrue("section3.var1", instance.getBoolean("section3.var1"));
assertEquals("Wrong number of sections", 3,
instance.getSections().size());
assertTrue("Wrong sections",
instance.getSections().containsAll(Arrays.asList("section1", "section2",
"section3")));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
index 87f2fa4..6f07322 100644
---
a/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
@@ -168,7 +168,7 @@ public class TestImmutableConfiguration {
public void testUnmodifiableConfigurationOtherTypes() throws
ConfigurationException {
final ImmutableConfiguration conf =
ConfigurationUtils.unmodifiableConfiguration(createTestConfig());
assertEquals("Wrong byte", (byte) 10, conf.getByte("test.byte"));
- assertEquals("Wrong boolean", true, conf.getBoolean("test.boolean"));
+ assertTrue("Wrong boolean", conf.getBoolean("test.boolean"));
assertEquals("Wrong double", 10.25, conf.getDouble("test.double"),
.05);
assertEquals("Wrong float", 20.25f, conf.getFloat("test.float"), .05);
assertEquals("Wrong int", 10, conf.getInt("test.integer"));
diff --git
a/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java
index 330eca1..6d6e345 100644
--- a/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java
@@ -164,11 +164,11 @@ public class TestJNDIConfiguration {
@Test
public void testChangePrefix() {
assertEquals("'test.boolean' property", "true",
conf.getString("test.boolean"));
- assertEquals("'boolean' property", null, conf.getString("boolean"));
+ assertNull("'boolean' property", conf.getString("boolean"));
// change the prefix
conf.setPrefix("test");
- assertEquals("'test.boolean' property", null,
conf.getString("test.boolean"));
+ assertNull("'test.boolean' property", conf.getString("test.boolean"));
assertEquals("'boolean' property", "true", conf.getString("boolean"));
}
@@ -319,7 +319,7 @@ public class TestJNDIConfiguration {
// remove the property
conf.clearProperty("test.boolean");
- assertEquals("'test.boolean' property", null,
conf.getString("test.boolean"));
+ assertNull("'test.boolean' property", conf.getString("test.boolean"));
// change the context
conf.setContext(new InitialContext());
diff --git
a/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java
b/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java
index c3852fb..0fb9a68 100644
---
a/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java
+++
b/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java
@@ -50,7 +50,7 @@ public class TestJNDIEnvironmentValues {
@Test
public void testContainsKey() throws Exception {
assertTrue(conf.containsKey("test.key"));
- assertTrue(!conf.containsKey("test.imaginarykey"));
+ assertFalse(conf.containsKey("test.imaginarykey"));
}
@Test
diff --git
a/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
index 1b231d5..44e82d5 100644
---
a/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
@@ -147,7 +147,7 @@ public class TestNullCompositeConfiguration {
cc.addConfiguration(conf1);
cc.addConfiguration(xmlConf);
cc.clearProperty("test.short");
- assertTrue("Make sure test.short is gone!",
!cc.containsKey("test.short"));
+ assertFalse("Make sure test.short is gone!",
cc.containsKey("test.short"));
}
/**
@@ -158,8 +158,8 @@ public class TestNullCompositeConfiguration {
cc.addConfiguration(conf1);
cc.addConfiguration(xmlConf);
assertEquals("default", cc.getString("bogus", "default"));
- assertTrue(1.4 == cc.getDouble("bogus", 1.4));
- assertTrue(1.4 == cc.getDouble("bogus", 1.4));
+ assertEquals(1.4, cc.getDouble("bogus", 1.4), 0.0);
+ assertEquals(1.4, cc.getDouble("bogus", 1.4), 0.0);
}
/**
@@ -253,7 +253,7 @@ public class TestNullCompositeConfiguration {
assertNull("Bogus property is not null!",
cc.getString("bogus.property"));
- assertTrue("Should be false", !cc.getBoolean("test.missing.boolean",
false));
+ assertFalse("Should be false", cc.getBoolean("test.missing.boolean",
false));
assertTrue("Should be true",
cc.getBoolean("test.missing.boolean.true", true));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java
b/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java
index e5000cb..98fe84f 100644
---
a/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java
+++
b/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java
@@ -49,7 +49,7 @@ public class TestNullJNDIEnvironmentValues {
@Test
public void testContainsKey() throws Exception {
assertTrue(conf.containsKey("test.key"));
- assertTrue(!conf.containsKey("test.imaginarykey"));
+ assertFalse(conf.containsKey("test.imaginarykey"));
}
@Test
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
index a6e5c92..73f10d4 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
@@ -17,7 +17,7 @@
package org.apache.commons.configuration2;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.StringWriter;
@@ -53,13 +53,13 @@ public class TestPatternSubtreeConfiguration {
config.setExpressionEngine(new XPathExpressionEngine());
System.setProperty("Id", "1001");
- assertTrue(config.getInt("rowsPerPage") == 15);
+ assertEquals(15, config.getInt("rowsPerPage"));
System.setProperty("Id", "1002");
- assertTrue(config.getInt("rowsPerPage") == 25);
+ assertEquals(25, config.getInt("rowsPerPage"));
System.setProperty("Id", "1003");
- assertTrue(config.getInt("rowsPerPage") == 35);
+ assertEquals(35, config.getInt("rowsPerPage"));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 043005d..53a6a96 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -936,7 +936,7 @@ public class TestPropertiesConfiguration {
final StringWriter out = new StringWriter();
new FileHandler(conf).save(out);
final String content = out.toString();
- assertTrue("Header could not be found", content.indexOf("# My header"
+ EOL + EOL) == 0);
+ assertEquals("Header could not be found", 0, content.indexOf("# My
header" + EOL + EOL));
assertTrue("Property could not be found", content.indexOf("prop =
value" + EOL) > 0);
}
@@ -1102,7 +1102,7 @@ public class TestPropertiesConfiguration {
handler.load(ConfigurationAssert.getTestFile("config/testMultiInclude.properties"));
assertEquals("Wrong top-level property", "topValue",
conf.getString("top"));
assertEquals("Wrong included property (1)", 100,
conf.getInt("property.c"));
- assertEquals("Wrong included property (2)", true,
conf.getBoolean("include.loaded"));
+ assertTrue("Wrong included property (2)",
conf.getBoolean("include.loaded"));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
index 0c517cb..398eeba 100644
---
a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
+++
b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
@@ -18,6 +18,7 @@ package org.apache.commons.configuration2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -467,7 +468,7 @@ public class TestPropertiesConfigurationLayout {
layout.setComment(TEST_KEY, "A new comment");
assertEquals("Comment was changed", TEST_COMMENT,
l2.getCanonicalComment(TEST_KEY, false));
l2.setBlankLinesBefore(TEST_KEY, l2.getBlankLinesBefore(TEST_KEY) + 1);
- assertFalse("Blanc lines do not differ",
layout.getBlankLinesBefore(TEST_KEY) == l2.getBlankLinesBefore(TEST_KEY));
+ assertNotEquals("Blanc lines do not differ",
layout.getBlankLinesBefore(TEST_KEY), l2.getBlankLinesBefore(TEST_KEY));
}
/**
@@ -608,8 +609,8 @@ public class TestPropertiesConfigurationLayout {
fillLayout();
layout.setComment("NonExistingKey", "NonExistingComment");
final String output = getLayoutString();
- assertTrue("Non existing key was found",
!output.contains("NonExistingKey"));
- assertTrue("Non existing comment was found",
!output.contains("NonExistingComment"));
+ assertFalse("Non existing key was found",
output.contains("NonExistingKey"));
+ assertFalse("Non existing comment was found",
output.contains("NonExistingComment"));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index bfd0210..8f9ff4f 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -591,7 +591,7 @@ public class TestXMLConfiguration {
final FileBasedConfigurationBuilder<XMLConfiguration> builder = new
FileBasedConfigurationBuilder<>(XMLConfiguration.class);
builder.configure(new
FileBasedBuilderParametersImpl().setFileName(testProperties));
XMLConfiguration config = builder.getConfiguration();
- assertTrue("Property not found", config.getProperty("test.short") !=
null);
+ assertNotNull("Property not found", config.getProperty("test.short"));
final Thread testThreads[] = new Thread[THREAD_COUNT];
for (int i = 0; i < testThreads.length; ++i) {
@@ -601,7 +601,7 @@ public class TestXMLConfiguration {
for (int i = 0; i < LOOP_COUNT; i++) {
config = builder.getConfiguration();
- assertTrue("Property not found", config.getProperty("test.short")
!= null);
+ assertNotNull("Property not found",
config.getProperty("test.short"));
}
for (final Thread testThread : testThreads) {
diff --git
a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
index 18d66cb..2dd1714 100644
---
a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
+++
b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
@@ -437,7 +437,7 @@ public class TestConfigurationDynaBean {
@Test
public void testMappedContains() {
assertTrue("Can't see first key", bean.contains("mappedProperty",
"key1"));
- assertTrue("Can see unknown key", !bean.contains("mappedProperty",
"Unknown Key"));
+ assertFalse("Can see unknown key", bean.contains("mappedProperty",
"Unknown Key"));
}
/**
@@ -447,11 +447,11 @@ public class TestConfigurationDynaBean {
public void testMappedRemove() {
assertTrue("Can see first key", bean.contains("mappedProperty",
"key1"));
bean.remove("mappedProperty", "key1");
- assertTrue("Can not see first key", !bean.contains("mappedProperty",
"key1"));
+ assertFalse("Can not see first key", bean.contains("mappedProperty",
"key1"));
- assertTrue("Can not see unknown key", !bean.contains("mappedProperty",
"key4"));
+ assertFalse("Can not see unknown key", bean.contains("mappedProperty",
"key4"));
bean.remove("mappedProperty", "key4");
- assertTrue("Can not see unknown key", !bean.contains("mappedProperty",
"key4"));
+ assertFalse("Can not see unknown key", bean.contains("mappedProperty",
"key4"));
}
/**
@@ -564,7 +564,7 @@ public class TestConfigurationDynaBean {
final boolean oldValue = ((Boolean)
bean.get("booleanProperty")).booleanValue();
final boolean newValue = !oldValue;
bean.set("booleanProperty", Boolean.valueOf(newValue));
- assertTrue("Matched new value", newValue == ((Boolean)
bean.get("booleanProperty")).booleanValue());
+ assertEquals("Matched new value", newValue, ((Boolean)
bean.get("booleanProperty")).booleanValue());
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
index c1251e4..aed6490 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
@@ -345,7 +345,7 @@ public class TestMultiFileConfigurationBuilder extends
AbstractMultiFileConfigur
while (cause != null && !(cause instanceof SAXParseException)) {
cause = cause.getCause();
}
- assertTrue("SAXParseException was not thrown", cause != null);
+ assertNotNull("SAXParseException was not thrown", cause);
}
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
index 60c458f..959e955 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
@@ -236,7 +236,7 @@ public class
TestReloadingCombinedConfigurationBuilderFileBased {
testThreads[i].join();
totalFailures += failures[i];
}
- assertTrue(totalFailures + " failures Occurred", totalFailures == 0);
+ assertEquals(totalFailures + " failures Occurred", 0, totalFailures);
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java
b/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java
index 32b848d..8f59abc 100644
---
a/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java
+++
b/src/test/java/org/apache/commons/configuration2/event/AbstractEventListenerTestImpl.java
@@ -18,6 +18,7 @@ package org.apache.commons.configuration2.event;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import java.util.LinkedList;
@@ -92,7 +93,7 @@ public abstract class AbstractEventListenerTestImpl<T extends
Event> implements
public void skipToLast(final EventType<?> type) {
while (events.size() > 1) {
final T e = events.remove(0);
- assertTrue("Found end event in details", type != e.getEventType());
+ assertNotSame("Found end event in details", type,
e.getEventType());
}
}
}
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 c572be9..38690aa 100644
--- a/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java
+++ b/src/test/java/org/apache/commons/configuration2/io/TestFileLocator.java
@@ -18,7 +18,7 @@ package org.apache.commons.configuration2.io;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
@@ -137,7 +137,7 @@ public class TestFileLocator {
@Test
public void testFileLocatorEqualsNull() {
final FileLocator loc =
FileLocatorUtils.fileLocator().fileName(FILE_NAME).create();
- assertFalse("Wrong result", loc.equals(null));
+ assertNotEquals("Wrong result", null, loc);
}
/**
@@ -146,7 +146,7 @@ public class TestFileLocator {
@Test
public void testFileLocatorEqualsOtherClass() {
final FileLocator loc =
FileLocatorUtils.fileLocator().fileName(FILE_NAME).create();
- assertFalse("Wrong result", loc.equals(this));
+ assertNotEquals("Wrong result", loc, this);
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
b/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
index c11d685..ba94d4e 100644
---
a/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
+++
b/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
@@ -259,10 +259,10 @@ public class TestFileLocatorUtils {
@Test
public void testGetFileName() throws Exception {
- assertEquals("file name for a null URL", null,
FileLocatorUtils.getFileName(null));
+ assertNull("file name for a null URL",
FileLocatorUtils.getFileName(null));
URL url = new URL("http://xyz.net/foo/";);
- assertEquals("file for a directory URL " + url, null,
FileLocatorUtils.getFileName(url));
+ assertNull("file for a directory URL " + url,
FileLocatorUtils.getFileName(url));
url = new URL("http://xyz.net/foo/bar.xml";);
assertEquals("file name for a valid URL " + url, "bar.xml",
FileLocatorUtils.getFileName(url));
diff --git
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
index 43130ed..2bc1d55 100644
---
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.commons.configuration2.plist;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -308,7 +309,7 @@ public class TestPropertyListConfiguration {
@Test
public void testQuoteString() {
- assertEquals("null string", null, config.quoteString(null));
+ assertNull("null string", config.quoteString(null));
assertEquals("simple string", "abcd", config.quoteString("abcd"));
assertEquals("string with a space", "\"ab cd\"",
config.quoteString("ab cd"));
assertEquals("string with a quote", "\"foo\\\"bar\"",
config.quoteString("foo\"bar"));
diff --git
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java
index 9035648..ad20248 100644
---
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java
+++
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListParser.java
@@ -18,6 +18,7 @@
package org.apache.commons.configuration2.plist;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.io.Reader;
import java.util.Calendar;
@@ -63,7 +64,7 @@ public class TestPropertyListParser {
assertEquals("quoted string", "abc", parser.removeQuotes("\"abc\""));
assertEquals("empty quotes", "", parser.removeQuotes("\"\""));
assertEquals("empty string", "", parser.removeQuotes(""));
- assertEquals("null string", null, parser.removeQuotes(null));
+ assertNull("null string", parser.removeQuotes(null));
}
@Test
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 54f85c8..b98120e 100644
---
a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
@@ -21,6 +21,7 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -165,8 +166,8 @@ public class TestXMLPropertyListConfiguration {
@Test
public void testBoolean() throws Exception {
- assertEquals("'boolean1' property", true,
config.getBoolean("boolean1"));
- assertEquals("'boolean2' property", false,
config.getBoolean("boolean2"));
+ assertTrue("'boolean1' property", config.getBoolean("boolean1"));
+ assertFalse("'boolean2' property", config.getBoolean("boolean2"));
}
@Test
@@ -366,8 +367,8 @@ public class TestXMLPropertyListConfiguration {
final XMLPropertyListConfiguration checkConfig = new
XMLPropertyListConfiguration();
load(checkConfig, savedFile);
- assertEquals(null, config.getProperty("empty-dictionary"));
- assertEquals(null, checkConfig.getProperty("empty-dictionary"));
+ assertNull(config.getProperty("empty-dictionary"));
+ assertNull(checkConfig.getProperty("empty-dictionary"));
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.java
b/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.java
index 5ca59f4..4a5b304 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/TestDefaultConfigurationKey.java
@@ -18,6 +18,7 @@ package org.apache.commons.configuration2.tree;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -284,16 +285,16 @@ public class TestDefaultConfigurationKey {
@Test
public void testEquals() {
final DefaultConfigurationKey k1 = key(TESTKEY);
- assertTrue("Key not equal to itself", k1.equals(k1));
+ assertEquals("Key not equal to itself", k1, k1);
final DefaultConfigurationKey k2 = key(TESTKEY);
- assertTrue("Keys are not equal", k1.equals(k2));
- assertTrue("Not reflexiv", k2.equals(k1));
+ assertEquals("Keys are not equal", k1, k2);
+ assertEquals("Not reflexiv", k2, k1);
assertEquals("Hash codes not equal", k1.hashCode(), k2.hashCode());
k2.append("anotherPart");
- assertFalse("Keys considered equal", k1.equals(k2));
- assertFalse("Keys considered equal (2)", k2.equals(k1));
- assertFalse("Key equals null key", k1.equals(null));
- assertFalse("Equal with string", k1.equals(TESTKEY));
+ assertNotEquals("Keys considered equal", k1, k2);
+ assertNotEquals("Keys considered equal (2)", k2, k1);
+ assertNotEquals("Key equals null key", null, k1);
+ assertNotEquals("Equal with string", TESTKEY, k1);
}
/**
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 b2166dc..84c2572 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngineSymbols.java
@@ -18,9 +18,8 @@ package org.apache.commons.configuration2.tree;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -45,8 +44,8 @@ public class TestDefaultExpressionEngineSymbols {
* @param o2 object 2
*/
private static void expEqual(final Object o1, final Object o2) {
- assertTrue("Not equal", o1.equals(o2));
- assertTrue("Not symmetric", o2.equals(o1));
+ assertEquals("Not equal", o1, o2);
+ assertEquals("Not symmetric", o2, o1);
assertEquals("Different hash codes", o1.hashCode(), o2.hashCode());
}
@@ -57,9 +56,9 @@ public class TestDefaultExpressionEngineSymbols {
* @param o2 object 2
*/
private static void expNE(final Object o1, final Object o2) {
- assertFalse("Equal", o1.equals(o2));
+ assertNotEquals("Equal", o1, o2);
if (o2 != null) {
- assertFalse("Not symmetric", o2.equals(o1));
+ assertNotEquals("Not symmetric", o2, o1);
}
}
