Merge pull request #19 from acoburn/TAMAYA-218
TAMAYA-218: Simplify AssertJ tests
diff --git a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigAdapterTest.java b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigAdapterTest.java
index 54e536d..6884445 100644
--- a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigAdapterTest.java
+++ b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigAdapterTest.java
@@ -86,8 +86,7 @@
List<PropertySource> tamayaSources = new ArrayList<>();
tamayaSources.add(testPropertySource);
List<ConfigSource> configSources = JavaConfigAdapterFactory.toConfigSources(tamayaSources);
- assertThat(configSources).isNotNull();
- assertThat(tamayaSources.size()).isEqualTo(configSources.size());
+ assertThat(configSources).isNotNull().hasSize(tamayaSources.size());
compare(testPropertySource, configSources.get(0));
}
@@ -110,8 +109,7 @@
List<ConfigSource> configSources = new ArrayList<>();
configSources.add(configSource);
List<PropertySource> propertySources = JavaConfigAdapterFactory.toPropertySources(configSources);
- assertThat(propertySources).isNotNull();
- assertThat(propertySources.size()).isEqualTo(configSources.size());
+ assertThat(propertySources).isNotNull().hasSize(configSources.size());
compare(propertySources.get(0), configSource);
}
@@ -164,9 +162,8 @@
Map<String,PropertyValue> props = new HashMap<>();
props.put("a", PropertyValue.of("a","b", "toStringMap"));
Map<String, String> mpProps = JavaConfigAdapterFactory.toStringMap(props);
- assertThat(mpProps).isNotNull();
+ assertThat(mpProps).isNotNull().containsEntry("a", "b");
assertThat(props.keySet()).isEqualTo(mpProps.keySet());
- assertThat(mpProps.get("a")).isEqualTo("b");
}
@Test
diff --git a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigProviderTest.java b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigProviderTest.java
index b2c9243..b746c26 100644
--- a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigProviderTest.java
+++ b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigProviderTest.java
@@ -46,7 +46,7 @@
for(String s:ConfigProvider.getConfig().getPropertyNames()){
cfgCount++;
}
- assertThat(cfgCount <= count).isTrue();
+ assertThat(cfgCount).isLessThanOrEqualTo(count);
}
@Test
@@ -59,7 +59,7 @@
for(String name:names){
count++;
}
- assertThat(count > 0).isTrue();
+ assertThat(count).isGreaterThan(0);
}
}
diff --git a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigTest.java b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigTest.java
index 3e0d7ae..96af19f 100644
--- a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigTest.java
+++ b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigTest.java
@@ -52,8 +52,7 @@
Optional<String> val = config.getOptionalValue(key, String.class);
assertThat(val).isNotNull();
val = config.getOptionalValue(key + System.currentTimeMillis(), String.class);
- assertThat(val).isNotNull();
- assertThat(val.isPresent()).isFalse();
+ assertThat(val).isNotNull().isNotPresent();
}
}
diff --git a/hjson/src/test/java/org/apache/tamaya/hjson/CommonHJSONTestCaseCollection.java b/hjson/src/test/java/org/apache/tamaya/hjson/CommonHJSONTestCaseCollection.java
index d2a4238..94fe4f8 100644
--- a/hjson/src/test/java/org/apache/tamaya/hjson/CommonHJSONTestCaseCollection.java
+++ b/hjson/src/test/java/org/apache/tamaya/hjson/CommonHJSONTestCaseCollection.java
@@ -76,7 +76,7 @@
System.out.println("simple-nested-string-only-config-1.json -> " + properties.getProperties().values());
- assertThat(properties.getProperties().keySet().size() >= 5).isTrue();
+ assertThat(properties.getProperties().keySet().size()).isGreaterThanOrEqualTo(5);
PropertyValue keyB = properties.get("b");
PropertyValue keyDO = properties.get("d.o");
@@ -100,7 +100,7 @@
PropertySource properties = getPropertiesFrom(configURL);
- assertThat(properties.getProperties().keySet().size() >= 4).isTrue();
+ assertThat(properties.getProperties().keySet().size()).isGreaterThanOrEqualTo(4);
PropertyValue keyA = properties.get("a");
PropertyValue keyDO = properties.get("b.o");
@@ -163,7 +163,7 @@
PropertySource properties = getPropertiesFrom(configURL);
- assertThat(3).isEqualTo(properties.getProperties().size());
+ assertThat(properties.getProperties()).hasSize(3);
PropertyValue keyA = properties.get("a");
PropertyValue keyB = properties.get("b");
@@ -196,6 +196,6 @@
PropertySource properties = getPropertiesFrom(configURL);
- assertThat(properties.getProperties().keySet().size() >= 0).isTrue();
+ assertThat(properties.getProperties().keySet().size()).isGreaterThanOrEqualTo(0);
}
}
diff --git a/hjson/src/test/java/org/apache/tamaya/hjson/HJSONVisitorTest.java b/hjson/src/test/java/org/apache/tamaya/hjson/HJSONVisitorTest.java
index a662dc8..8d2d3c5 100644
--- a/hjson/src/test/java/org/apache/tamaya/hjson/HJSONVisitorTest.java
+++ b/hjson/src/test/java/org/apache/tamaya/hjson/HJSONVisitorTest.java
@@ -47,12 +47,12 @@
assertThat(data).isNotNull();
ObjectValue ov = data.toObjectValue();
- assertThat(ov.getValues().size()).isEqualTo(6);
- assertThat(data.toMap()).containsKeys("key.sub", "anotherKey", "notAnotherKey", "number", "null");
- assertThat(data.toMap()).containsEntry("key.sub", "createValue");
- assertThat(data.toMap()).containsEntry("null", null);
- assertThat(data.toMap()).containsEntry("anotherKey", "true");
- assertThat(data.toMap()).doesNotContainEntry("empty", null);
+ assertThat(ov.getValues()).hasSize(6);
+ assertThat(data.toMap()).containsKeys("key.sub", "anotherKey", "notAnotherKey", "number", "null")
+ .containsEntry("key.sub", "createValue")
+ .containsEntry("null", null)
+ .containsEntry("anotherKey", "true")
+ .doesNotContainEntry("empty", null);
}
@Test
@@ -64,7 +64,7 @@
HJSONDataBuilder visitor = new HJSONDataBuilder("Test:parsingWorksOnEmptyObject", startNode);
PropertyValue data = visitor.build();
assertThat(data).isNotNull();
- assertThat(data.isLeaf());
+ assertThat(data.isLeaf()).isFalse();
}
@Test
diff --git a/hjson/src/test/java/org/apache/tamaya/hjson/PathBasedHJSONPropertySourceProviderTest.java b/hjson/src/test/java/org/apache/tamaya/hjson/PathBasedHJSONPropertySourceProviderTest.java
index b5def8a..8008f8c 100644
--- a/hjson/src/test/java/org/apache/tamaya/hjson/PathBasedHJSONPropertySourceProviderTest.java
+++ b/hjson/src/test/java/org/apache/tamaya/hjson/PathBasedHJSONPropertySourceProviderTest.java
@@ -32,8 +32,7 @@
PathBasedHJSONPropertySourceProvider provider = new PathBasedHJSONPropertySourceProvider(
"configs/valid/*.hjson"
);
- assertThat(provider.getPropertySources()).isNotNull();
- assertThat(7).isEqualTo(provider.getPropertySources().size());
+ assertThat(provider.getPropertySources()).isNotNull().hasSize(7);
}
@Test
@@ -41,8 +40,7 @@
PathBasedHJSONPropertySourceProvider provider = new PathBasedHJSONPropertySourceProvider(
"configs/valid/cyril*.hjson"
);
- assertThat(provider.getPropertySources()).isNotNull();
- assertThat(1).isEqualTo(provider.getPropertySources().size());
+ assertThat(provider.getPropertySources()).isNotNull().hasSize(1);
}
@Test
@@ -50,8 +48,7 @@
PathBasedHJSONPropertySourceProvider provider = new PathBasedHJSONPropertySourceProvider(
"configs/valid/simple-*.hjson"
);
- assertThat(provider.getPropertySources()).isNotNull();
- assertThat(3).isEqualTo(provider.getPropertySources().size());
+ assertThat(provider.getPropertySources()).isNotNull().hasSize(3);
}
@Test
@@ -59,7 +56,6 @@
PathBasedHJSONPropertySourceProvider provider = new PathBasedHJSONPropertySourceProvider(
"configs/valid/foo*.hjson", "configs/valid/*.HJSON"
);
- assertThat(provider.getPropertySources()).isNotNull();
- assertThat(0).isEqualTo(provider.getPropertySources().size());
+ assertThat(provider.getPropertySources()).isNotNull().isEmpty();
}
}
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterTest.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterTest.java
index f3c7a04..43a78fa 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterTest.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterTest.java
@@ -88,11 +88,11 @@
ConversionContext context = new ConversionContext.Builder(TypeLiteral.of(DateTime.class)).build();
converter.convert("2007-08-31T16+00:00", context);
- assertThat(context.getSupportedFormats().size()).isEqualTo(DateTimeConverter.PARSER_FORMATS.length);
+ assertThat(context.getSupportedFormats()).hasSize(DateTimeConverter.PARSER_FORMATS.length);
for (String format : DateTimeConverter.PARSER_FORMATS) {
String expected = format + " (" + DateTimeConverter.class.getSimpleName() + ")";
- assertThat(context.getSupportedFormats().contains(expected)).isTrue();
+ assertThat(context.getSupportedFormats()).contains(expected);
}
}
}
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
index 1ec307d..47b2a77 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
@@ -53,8 +53,7 @@
for (Object[] pair : inputResultPairs) {
DateTimeZone zone = converter.convert((String) pair[0], context);
- assertThat(zone).isNotNull();
- assertThat(zone).isEqualTo((DateTimeZone)pair[1]);
+ assertThat(zone).isNotNull().isEqualTo((DateTimeZone)pair[1]);
}
}
@@ -85,9 +84,7 @@
DateTimeZone result = converter.convert("+01:00", context);
assertThat(result).isNotNull();
- assertThat(context.getSupportedFormats().size()).isEqualTo(2);
- assertThat(context.getSupportedFormats().contains(firstFormat)).isTrue();
- assertThat(context.getSupportedFormats().contains(secondFormat)).isTrue();
+ assertThat(context.getSupportedFormats()).hasSize(2).containsExactly(firstFormat, secondFormat);
}
}
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterTest.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterTest.java
index 9b1c8a7..7fe3e20 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterTest.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterTest.java
@@ -57,8 +57,7 @@
for (Object[] pair : inputResultPairs) {
Duration duration = converter.convert((String) pair[0], context);
- assertThat(duration).isNotNull();
- assertThat(duration).isEqualTo((Duration) pair[1]);
+ assertThat(duration).isNotNull().isEqualTo((Duration) pair[1]);
}
}
@@ -86,9 +85,7 @@
ConversionContext context = new ConversionContext.Builder(TypeLiteral.of(Duration.class)).build();
converter.convert("P0DT0H0M0S", context);
- assertThat(context.getSupportedFormats().size()).isEqualTo(3);
- assertThat(context.getSupportedFormats().contains("PdDThHmMsS (" + name + ")")).isTrue();
- assertThat(context.getSupportedFormats().contains("ddThh:mm:ss (" + name + ")")).isTrue();
- assertThat(context.getSupportedFormats().contains("PTa.bS (" + name + ")")).isTrue();
+ assertThat(context.getSupportedFormats()).hasSize(3)
+ .contains("PdDThHmMsS (" + name + ")", "ddThh:mm:ss (" + name + ")", "PTa.bS (" + name + ")");
}
}
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterTest.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterTest.java
index 058584e..5f958c2 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterTest.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterTest.java
@@ -61,8 +61,7 @@
for (Object[] pair : inputResultPairs) {
Period period = converter.convert((String) pair[0], context);
- assertThat(period).isNotNull();
- assertThat(period).isEqualTo((Period) pair[1]);
+ assertThat(period).isNotNull().isEqualTo((Period) pair[1]);
}
}
@@ -89,8 +88,7 @@
ConversionContext context = new ConversionContext.Builder(TypeLiteral.of(Period.class)).build();
converter.convert("P7Y0M0W0DT0H0M0S", context);
- assertThat(context.getSupportedFormats().size()).isEqualTo(2);
- assertThat(context.getSupportedFormats().contains("PyYmMwWdDThHmMsS (" + name + ")")).isTrue();
- assertThat(context.getSupportedFormats().contains("Pyyyy-mm-ddThh:mm:ss (" + name + ")")).isTrue();
+ assertThat(context.getSupportedFormats()).hasSize(2)
+ .contains("PyYmMwWdDThHmMsS (" + name + ")", "Pyyyy-mm-ddThh:mm:ss (" + name + ")");
}
}
diff --git a/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java b/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java
index 1ba33c3..0869b64 100644
--- a/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java
+++ b/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java
@@ -41,17 +41,14 @@
@Test
public void testGetJsonConfigurationInfo() {
String info = bean.getJsonConfigurationInfo();
- assertThat(info).isNotNull();
- assertThat(info.contains("java.version")).isTrue();
+ assertThat(info).isNotNull().contains("java.version");
System.out.println(bean.getJsonConfigurationInfo());
}
@Test
public void testGetXmlConfigurationInfo() {
String info = bean.getXmlConfigurationInfo();
- assertThat(info).isNotNull();
- assertThat(info.contains("java.version")).isTrue();
- assertThat(info.contains("<configuration>")).isTrue();
+ assertThat(info).isNotNull().contains("java.version", "<configuration>");
System.out.println(bean.getXmlConfigurationInfo());
}
@@ -75,20 +72,15 @@
@Test
public void testGetAreas() {
Set<String> sections = (bean.getSections());
- assertThat(sections).isNotNull();
- assertThat(sections.contains("java")).isTrue();
- assertThat(sections.contains("file")).isTrue();
+ assertThat(sections).isNotNull().contains("java", "file");
}
@Test
public void testGetTransitiveAreas() {
Set<String> sections = (bean.getTransitiveSections());
Set<String> sectionsNT = (bean.getSections());
- assertThat(sections).isNotNull();
- assertThat(sections.contains("java")).isTrue();
- assertThat(sections.contains("sun")).isTrue();
- assertThat(sections.contains("sun.os")).isTrue();
- assertThat(sectionsNT.size() < sections.size()).isTrue();
+ assertThat(sections).isNotNull().contains("java", "sun", "sun.os");
+ assertThat(sectionsNT.size()).isLessThan(sections.size());
}
@Test
diff --git a/usagetracker/src/test/java/org/apache/tamaya/model/ConfigUsageTest.java b/usagetracker/src/test/java/org/apache/tamaya/model/ConfigUsageTest.java
index 5b9bb35..b9adb19 100644
--- a/usagetracker/src/test/java/org/apache/tamaya/model/ConfigUsageTest.java
+++ b/usagetracker/src/test/java/org/apache/tamaya/model/ConfigUsageTest.java
@@ -36,8 +36,7 @@
TestConfigAccessor.readConfiguration();
Configuration config = Configuration.current();
String info = ConfigUsage.getInstance().getInfo();
- assertThat(info.contains("java.version")).isFalse();
- assertThat(info).isNotNull();
+ assertThat(info).isNotNull().doesNotContain("java.version");
config = TestConfigAccessor.readConfiguration();
config.getProperties();
TestConfigAccessor.readProperty(config, "java.locale");
@@ -46,8 +45,7 @@
config.get("java.version");
info = ConfigUsage.getInstance().getInfo();
System.out.println(info);
- assertThat(info.contains("java.version")).isTrue();
- assertThat(info).isNotNull();
+ assertThat(info).isNotNull().contains("java.version");
ConfigUsage.getInstance().enableUsageTracking(false);
}
@@ -58,8 +56,7 @@
TestConfigAccessor.readConfiguration();
Configuration config = Configuration.current();
String info = ConfigUsage.getInstance().getInfo();
- assertThat(info).isNotNull();
- assertThat(info.contains("java.version")).isFalse();
+ assertThat(info).isNotNull().doesNotContain("java.version");
config = TestConfigAccessor.readConfiguration();
config.getProperties();
TestConfigAccessor.readProperty(config, "java.locale");
@@ -67,8 +64,7 @@
TestConfigAccessor.readProperty(config, "java.version");
config.get("java.version");
info = ConfigUsage.getInstance().getInfo();
- assertThat(info.contains("java.version")).isFalse();
- assertThat(info).isNotNull();
+ assertThat(info).isNotNull().doesNotContain("java.version");
ConfigUsage.getInstance().enableUsageTracking(false);
}
}
