http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/ConfigurationContextBuilderTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/ConfigurationContextBuilderTest.java b/code/core/src/test/java/org/apache/tamaya/core/ConfigurationContextBuilderTest.java index ac353eb..70d8381 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/ConfigurationContextBuilderTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/ConfigurationContextBuilderTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import java.util.Arrays; import java.util.Comparator; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests for {@link ConfigurationContextBuilder} by atsticks on 06.09.16. @@ -41,7 +41,7 @@ public class ConfigurationContextBuilderTest { ConfigurationContext context = ConfigurationProvider.getConfiguration().getContext(); ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .setContext(context); - assertEquals(context, b.build()); + assertThat(b.build()).isEqualTo(context); } @Test @@ -50,19 +50,19 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = new DefaultConfigurationContextBuilder() .addPropertySources(testPropertySource, testPS2); ConfigurationContext ctx = b.build(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); // Ensure no sorting happens during add, so switch ordinals! testPS2 = new TestPropertySource("addPropertySources_Array", 1); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertySources(testPS2, testPropertySource); ctx = b.build(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); - assertEquals(ctx.getPropertySources().get(1).getName(), "TestPropertySource"); - assertEquals(ctx.getPropertySources().get(0).getName(), "addPropertySources_Array"); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); + assertThat("TestPropertySource").isEqualTo(ctx.getPropertySources().get(1).getName()); + assertThat("addPropertySources_Array").isEqualTo(ctx.getPropertySources().get(0).getName()); } @Test @@ -71,21 +71,21 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = new DefaultConfigurationContextBuilder() .addPropertySources(Arrays.asList(new PropertySource[]{testPropertySource, testPS2})); ConfigurationContext ctx = b.build(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); - assertEquals(ctx.getPropertySources().get(0).getName(), "TestPropertySource"); - assertEquals(ctx.getPropertySources().get(1).getName(), "addPropertySources_Collection"); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); + assertThat("TestPropertySource").isEqualTo(ctx.getPropertySources().get(0).getName()); + assertThat("addPropertySources_Collection").isEqualTo(ctx.getPropertySources().get(1).getName()); // Ensure no sorting happens during add, so switch ordinals! testPS2 = new TestPropertySource("addPropertySources_Collection", 1); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertySources(Arrays.asList(new PropertySource[]{testPS2, testPropertySource})); ctx = b.build(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); - assertEquals(ctx.getPropertySources().get(1).getName(), "TestPropertySource"); - assertEquals(ctx.getPropertySources().get(0).getName(), "addPropertySources_Collection"); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); + assertThat("TestPropertySource").isEqualTo(ctx.getPropertySources().get(1).getName()); + assertThat("addPropertySources_Collection").isEqualTo(ctx.getPropertySources().get(0).getName()); } @Test @@ -94,16 +94,16 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertySources(testPropertySource, testPS2); ConfigurationContext ctx = b.build(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertySources(testPropertySource, testPS2); b.removePropertySources(testPropertySource); ctx = b.build(); - assertFalse(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); - assertEquals(1, ctx.getPropertySources().size()); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isFalse(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); + assertThat(ctx.getPropertySources()).hasSize(1); } @Test @@ -112,16 +112,16 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertySources(testPropertySource, testPS2); ConfigurationContext ctx = b.build(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertySources(testPropertySource, testPS2); b.removePropertySources(testPropertySource); ctx = b.build(); - assertEquals(1, ctx.getPropertySources().size()); - assertFalse(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); + assertThat(ctx.getPropertySources()).hasSize(1); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isFalse(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); } @Test @@ -131,13 +131,13 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder(); b.addPropertyFilters(filter1, filter2); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters().contains(filter1)).isTrue(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); + assertThat(ctx.getPropertyFilters()).hasSize(2); b = ConfigurationProvider.getConfigurationContextBuilder(); b.addPropertyFilters(filter1, filter2); b.addPropertyFilters(filter1, filter2); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters()).hasSize(2); } @Test @@ -147,13 +147,13 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder(); b.addPropertyFilters(Arrays.asList(new PropertyFilter[]{filter1, filter2})); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters().contains(filter1)).isTrue(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); + assertThat(ctx.getPropertyFilters()).hasSize(2); b = ConfigurationProvider.getConfigurationContextBuilder(); b.addPropertyFilters(filter1, filter2); b.addPropertyFilters(filter1, filter2); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters()).hasSize(2); } @Test @@ -163,16 +163,16 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyFilters(filter1, filter2); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters().contains(filter1)).isTrue(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); + assertThat(ctx.getPropertyFilters()).hasSize(2); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyFilters(filter1, filter2); b.removePropertyFilters(filter1); ctx = b.build(); - assertEquals(1, ctx.getPropertyFilters().size()); - assertFalse(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); + assertThat(ctx.getPropertyFilters()).hasSize(1); + assertThat(ctx.getPropertyFilters().contains(filter1)).isFalse(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); } @Test @@ -182,16 +182,16 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyFilters(Arrays.asList(new PropertyFilter[]{filter1, filter2})); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters().contains(filter1)).isTrue(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); + assertThat(ctx.getPropertyFilters()).hasSize(2); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyFilters(Arrays.asList(new PropertyFilter[]{filter1, filter2})); b.removePropertyFilters(filter1); ctx = b.build(); - assertEquals(1, ctx.getPropertyFilters().size()); - assertFalse(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); + assertThat(ctx.getPropertyFilters()).hasSize(1); + assertThat(ctx.getPropertyFilters().contains(filter1)).isFalse(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); } @Test @@ -201,12 +201,12 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyConverters(TypeLiteral.of(String.class), converter); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertEquals(1, ctx.getPropertyConverters().size()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isTrue(); + assertThat(ctx.getPropertyConverters()).hasSize(1); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyConverters(TypeLiteral.of(String.class), converter); b.addPropertyConverters(TypeLiteral.of(String.class), converter); - assertEquals(1, ctx.getPropertyConverters().size()); + assertThat(ctx.getPropertyConverters()).hasSize(1); } @Test @@ -217,13 +217,13 @@ public class ConfigurationContextBuilderTest { .addPropertyConverters(TypeLiteral.of(String.class), Arrays.<PropertyConverter<Object>>asList(new PropertyConverter[]{converter})); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertEquals(ctx.getPropertyConverters().size(), 1); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isTrue(); + assertThat(1).isEqualTo(ctx.getPropertyConverters().size()); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyConverters(TypeLiteral.of(String.class), Arrays.<PropertyConverter<Object>>asList(new PropertyConverter[]{converter})); b.addPropertyConverters(TypeLiteral.of(String.class), converter); - assertEquals(ctx.getPropertyConverters().size(), 1); + assertThat(1).isEqualTo(ctx.getPropertyConverters().size()); } @Test @@ -233,14 +233,14 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyConverters(TypeLiteral.of(String.class), converter); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertEquals(1, ctx.getPropertyConverters(TypeLiteral.of(String.class)).size()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isTrue(); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class))).hasSize(1); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyConverters(TypeLiteral.of(String.class), converter); b.removePropertyConverters(TypeLiteral.of(String.class), converter); ctx = b.build(); - assertFalse(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).isEmpty()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isFalse(); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).isEmpty()).isTrue(); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -250,14 +250,14 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyConverters(TypeLiteral.of(String.class), Arrays.<PropertyConverter<Object>>asList(new PropertyConverter[]{converter})); ConfigurationContext ctx = b.build(); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertEquals(1, ctx.getPropertyConverters(TypeLiteral.of(String.class)).size()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isTrue(); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class))).hasSize(1); b = ConfigurationProvider.getConfigurationContextBuilder() .addPropertyConverters(TypeLiteral.of(String.class), Arrays.<PropertyConverter<Object>>asList(new PropertyConverter[]{converter})); b.removePropertyConverters(TypeLiteral.of(String.class), Arrays.<PropertyConverter<Object>>asList(new PropertyConverter[]{converter})); ctx = b.build(); - assertFalse(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).isEmpty()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isFalse(); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).isEmpty()).isTrue(); } @Test @@ -266,7 +266,7 @@ public class ConfigurationContextBuilderTest { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder() .setPropertyValueCombinationPolicy(combPol); ConfigurationContext ctx = b.build(); - assertEquals(ctx.getPropertyValueCombinationPolicy(), combPol); + assertThat(combPol).isEqualTo(ctx.getPropertyValueCombinationPolicy()); } @Test @@ -279,14 +279,14 @@ public class ConfigurationContextBuilderTest { b.addPropertySources(propertySources); b.increasePriority(propertySources[propertySources.length-1]); for(int i=0;i<propertySources.length;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } b.increasePriority(propertySources[propertySources.length-2]); for(int i=0;i<propertySources.length-2;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } - assertEquals(propertySources[propertySources.length-1], b.getPropertySources().get(propertySources.length-2)); - assertEquals(propertySources[propertySources.length-2], b.getPropertySources().get(propertySources.length-1)); + assertThat(b.getPropertySources().get(propertySources.length-2)).isEqualTo(propertySources[propertySources.length-1]); + assertThat(b.getPropertySources().get(propertySources.length-1)).isEqualTo(propertySources[propertySources.length-2]); } @Test @@ -299,14 +299,14 @@ public class ConfigurationContextBuilderTest { b.addPropertySources(propertySources); b.decreasePriority(propertySources[0]); for(int i=0;i<propertySources.length;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } b.decreasePriority(propertySources[1]); for(int i=2;i<propertySources.length;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } - assertEquals(propertySources[0], b.getPropertySources().get(1)); - assertEquals(propertySources[1], b.getPropertySources().get(0)); + assertThat(b.getPropertySources().get(1)).isEqualTo(propertySources[0]); + assertThat(b.getPropertySources().get(0)).isEqualTo(propertySources[1]); } @Test @@ -321,16 +321,16 @@ public class ConfigurationContextBuilderTest { // test b.lowestPriority(propertySources[0]); for(int i=0;i<propertySources.length;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } b.lowestPriority(propertySources[1]); for(int i=2;i<propertySources.length;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } - assertEquals(propertySources[0], b.getPropertySources().get(1)); - assertEquals(propertySources[1], b.getPropertySources().get(0)); + assertThat(b.getPropertySources().get(1)).isEqualTo(propertySources[0]); + assertThat(b.getPropertySources().get(0)).isEqualTo(propertySources[1]); b.lowestPriority(propertySources[5]); - assertEquals(propertySources[5], b.getPropertySources().get(0)); + assertThat(b.getPropertySources().get(0)).isEqualTo(propertySources[5]); } @Test @@ -345,16 +345,16 @@ public class ConfigurationContextBuilderTest { // test b.highestPriority(propertySources[propertySources.length-1]); for(int i=0;i<propertySources.length;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } b.highestPriority(propertySources[propertySources.length-2]); for(int i=0;i<propertySources.length-2;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } - assertEquals(propertySources[propertySources.length-2], b.getPropertySources().get(propertySources.length-1)); - assertEquals(propertySources[propertySources.length-1], b.getPropertySources().get(propertySources.length-2)); + assertThat(b.getPropertySources().get(propertySources.length-1)).isEqualTo(propertySources[propertySources.length-2]); + assertThat(b.getPropertySources().get(propertySources.length-2)).isEqualTo(propertySources[propertySources.length-1]); b.highestPriority(propertySources[5]); - assertEquals(propertySources[5], b.getPropertySources().get(propertySources.length-1)); + assertThat(b.getPropertySources().get(propertySources.length-1)).isEqualTo(propertySources[5]); } @Test @@ -371,7 +371,7 @@ public class ConfigurationContextBuilderTest { b.sortPropertySources(psComp); Arrays.sort(propertySources, psComp); for(int i=0;i<propertySources.length;i++){ - assertEquals(propertySources[i], b.getPropertySources().get(i)); + assertThat(b.getPropertySources().get(i)).isEqualTo(propertySources[i]); } } @@ -389,7 +389,7 @@ public class ConfigurationContextBuilderTest { b.sortPropertyFilter(pfComp); Arrays.sort(propertyFilters, pfComp); for(int i=0;i<propertyFilters.length;i++){ - assertEquals(propertyFilters[i], b.getPropertyFilters().get(i)); + assertThat(b.getPropertyFilters().get(i)).isEqualTo(propertyFilters[i]); } } @@ -397,26 +397,26 @@ public class ConfigurationContextBuilderTest { public void build() throws Exception { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder(); ConfigurationContext ctx = b.build(); - assertNotNull(ctx); - assertTrue(ctx.getPropertySources().isEmpty()); - assertTrue(ctx.getPropertyFilters().isEmpty()); + assertThat(ctx).isNotNull(); + assertThat(ctx.getPropertySources().isEmpty()).isTrue(); + assertThat(ctx.getPropertyFilters().isEmpty()).isTrue(); } @Test public void testRemoveAllFilters() throws Exception { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder(); b.addPropertyFilters((value, context) -> value.toBuilder().setValue(toString() + " - ").build()); - assertFalse(b.getPropertyFilters().isEmpty()); + assertThat(b.getPropertyFilters().isEmpty()).isFalse(); b.removePropertyFilters(b.getPropertyFilters()); - assertTrue(b.getPropertyFilters().isEmpty()); + assertThat(b.getPropertyFilters().isEmpty()).isTrue(); } @Test public void testRemoveAllSources() throws Exception { ConfigurationContextBuilder b = ConfigurationProvider.getConfigurationContextBuilder(); b.addPropertySources(new TestPropertySource()); - assertFalse(b.getPropertySources().isEmpty()); + assertThat(b.getPropertySources().isEmpty()).isFalse(); b.removePropertySources(b.getPropertySources()); - assertTrue(b.getPropertyFilters().isEmpty()); + assertThat(b.getPropertyFilters().isEmpty()).isTrue(); } } \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java b/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java index 0fad63c..b510e6b 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java @@ -22,9 +22,7 @@ import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.assertj.core.api.Assertions.assertThat; /** * This tests checks if the combination of 2 prioritized PropertySource return valid results of the final configuration. @@ -33,7 +31,7 @@ public class ConfigurationTest { @Test public void testAccess(){ - assertNotNull(current()); + assertThat(current()).isNotNull(); } private Configuration current() { @@ -42,16 +40,16 @@ public class ConfigurationTest { @Test public void testContent(){ - assertNotNull(current().get("name")); - assertNotNull(current().get("name2")); // from default - assertNotNull(current().get("name3")); // overridden default, mapped by filter to name property - assertNotNull(current().get("name4")); // final only + assertThat(current().get("name")).isNotNull(); + assertThat(current().get("name2")).isNotNull(); // from default + assertThat(current().get("name3")).isNotNull(); // overridden default, mapped by filter to name property + assertThat(current().get("name4")).isNotNull(); // final only - assertEquals("Robin", current().get("name")); - assertEquals("Sabine", current().get("name2")); // from default - assertEquals("Mapped to name: Robin", current().get("name3")); // overridden default, mapped by filter to name property - assertEquals("Sereina(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)", current().get("name4")); // final only - assertNull(current().get("name5")); // final only, but removed from filter + assertThat(current().get("name")).isEqualTo("Robin"); + assertThat(current().get("name2")).isEqualTo("Sabine"); // from default + assertThat(current().get("name3")).isEqualTo("Mapped to name: Robin"); // overridden default, mapped by filter to name property + assertThat(current().get("name4")).isEqualTo("Sereina(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)(filtered)"); // final only + assertThat(current().get("name5")).isNull(); // final only, but removed from filter } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/OSGIActivatorTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/OSGIActivatorTest.java b/code/core/src/test/java/org/apache/tamaya/core/OSGIActivatorTest.java index 1d59c68..5de16ab 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/OSGIActivatorTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/OSGIActivatorTest.java @@ -25,9 +25,7 @@ import org.apache.tamaya.core.internal.MockBundleContext; import org.apache.tamaya.spi.ServiceContext; import org.apache.tamaya.spi.ServiceContextManager; import org.junit.After; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotSame; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; import org.osgi.framework.Bundle; @@ -69,13 +67,13 @@ public class OSGIActivatorTest { //Start instance.start(mockBundleContext); - assertEquals(1, mockBundleContext.getBundleListenersCount()); - assertFalse(ConfigurationProvider.getConfiguration().getContext().getPropertyConverters().isEmpty()); - assertNotSame(prevConfiguration, ConfigurationProvider.getConfiguration()); + assertThat(mockBundleContext.getBundleListenersCount()).isEqualTo(1); + assertThat(ConfigurationProvider.getConfiguration().getContext().getPropertyConverters().isEmpty()).isFalse(); + assertThat(ConfigurationProvider.getConfiguration()).isNotSameAs(prevConfiguration); //Stop instance.stop(mockBundleContext); - assertEquals(0, mockBundleContext.getBundleListenersCount()); + assertThat(mockBundleContext.getBundleListenersCount()).isEqualTo(0); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationBuilderTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationBuilderTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationBuilderTest.java index 2e9fcd0..7151a41 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationBuilderTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationBuilderTest.java @@ -36,7 +36,7 @@ import java.util.Currency; import java.util.Map; import org.apache.tamaya.core.internal.converters.BigDecimalConverter; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests for {@link CoreConfigurationBuilder} by atsticks on 06.09.16. @@ -50,7 +50,7 @@ public class CoreConfigurationBuilderTest { ConfigurationContext context = ConfigurationProvider.getConfiguration().getContext(); ConfigurationBuilder b = new CoreConfigurationBuilder() .setContext(context); - assertEquals(context, b.build().getContext()); + assertThat(b.build().getContext()).isEqualTo(context); } @Test @@ -58,7 +58,7 @@ public class CoreConfigurationBuilderTest { Configuration cfg = ConfigurationProvider.getConfiguration(); ConfigurationBuilder b = new CoreConfigurationBuilder() .setConfiguration(cfg); - assertEquals(cfg, b.build()); + assertThat(b.build()).isEqualTo(cfg); } @@ -69,9 +69,9 @@ public class CoreConfigurationBuilderTest { .addPropertySources(testPropertySource, testPS2); Configuration cfg = b.build(); ConfigurationContext ctx = cfg.getContext(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); } @Test @@ -81,17 +81,17 @@ public class CoreConfigurationBuilderTest { .addPropertySources(testPropertySource, testPS2); Configuration cfg = b.build(); ConfigurationContext ctx = cfg.getContext(); - assertEquals(2, ctx.getPropertySources().size()); - assertTrue(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); + assertThat(ctx.getPropertySources()).hasSize(2); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isTrue(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); b = new CoreConfigurationBuilder() .addPropertySources(testPropertySource, testPS2); b.removePropertySources(testPropertySource); cfg = b.build(); ctx = cfg.getContext(); - assertEquals(1, ctx.getPropertySources().size()); - assertFalse(ctx.getPropertySources().contains(testPropertySource)); - assertTrue(ctx.getPropertySources().contains(testPS2)); + assertThat(ctx.getPropertySources()).hasSize(1); + assertThat(ctx.getPropertySources().contains(testPropertySource)).isFalse(); + assertThat(ctx.getPropertySources().contains(testPS2)).isTrue(); } @Test @@ -102,13 +102,13 @@ public class CoreConfigurationBuilderTest { b.addPropertyFilters(filter1, filter2); Configuration cfg = b.build(); ConfigurationContext ctx = cfg.getContext(); - assertTrue(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters().contains(filter1)).isTrue(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); + assertThat(ctx.getPropertyFilters()).hasSize(2); b = new CoreConfigurationBuilder(); b.addPropertyFilters(filter1, filter2); b.addPropertyFilters(filter1, filter2); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters()).hasSize(2); } @Test @@ -119,17 +119,17 @@ public class CoreConfigurationBuilderTest { .addPropertyFilters(filter1, filter2); Configuration cfg = b.build(); ConfigurationContext ctx = cfg.getContext(); - assertTrue(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); - assertEquals(2, ctx.getPropertyFilters().size()); + assertThat(ctx.getPropertyFilters().contains(filter1)).isTrue(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); + assertThat(ctx.getPropertyFilters()).hasSize(2); b = new CoreConfigurationBuilder() .addPropertyFilters(filter1, filter2); b.removePropertyFilters(filter1); cfg = b.build(); ctx = cfg.getContext(); - assertEquals(1, ctx.getPropertyFilters().size()); - assertFalse(ctx.getPropertyFilters().contains(filter1)); - assertTrue(ctx.getPropertyFilters().contains(filter2)); + assertThat(ctx.getPropertyFilters()).hasSize(1); + assertThat(ctx.getPropertyFilters().contains(filter1)).isFalse(); + assertThat(ctx.getPropertyFilters().contains(filter2)).isTrue(); } @Test @@ -140,12 +140,12 @@ public class CoreConfigurationBuilderTest { .addPropertyConverters(TypeLiteral.of(String.class), converter); Configuration cfg = b.build(); ConfigurationContext ctx = cfg.getContext(); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertEquals(1, ctx.getPropertyConverters().size()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isTrue(); + assertThat(ctx.getPropertyConverters()).hasSize(1); b = new CoreConfigurationBuilder() .addPropertyConverters(TypeLiteral.of(String.class), converter); b.addPropertyConverters(TypeLiteral.of(String.class), converter); - assertEquals(1, ctx.getPropertyConverters().size()); + assertThat(ctx.getPropertyConverters()).hasSize(1); } @Test @@ -156,15 +156,15 @@ public class CoreConfigurationBuilderTest { .addPropertyConverters(TypeLiteral.of(String.class), converter); Configuration cfg = b.build(); ConfigurationContext ctx = cfg.getContext(); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertEquals(1, ctx.getPropertyConverters(TypeLiteral.of(String.class)).size()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isTrue(); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class))).hasSize(1); b = new CoreConfigurationBuilder() .addPropertyConverters(TypeLiteral.of(String.class), converter); b.removePropertyConverters(TypeLiteral.of(String.class), converter); cfg = b.build(); ctx = cfg.getContext(); - assertFalse(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)); - assertTrue(ctx.getPropertyConverters(TypeLiteral.of(String.class)).isEmpty()); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).contains(converter)).isFalse(); + assertThat(ctx.getPropertyConverters(TypeLiteral.of(String.class)).isEmpty()).isTrue(); } @Test @@ -174,12 +174,12 @@ public class CoreConfigurationBuilderTest { .setPropertyValueCombinationPolicy(combPol); Configuration cfg = b.build(); ConfigurationContext ctx = cfg.getContext(); - assertEquals(ctx.getPropertyValueCombinationPolicy(), combPol); + assertThat(combPol).isEqualTo(ctx.getPropertyValueCombinationPolicy()); } @Test public void build() throws Exception { - assertNotNull(new CoreConfigurationBuilder().build()); + assertThat(new CoreConfigurationBuilder().build()).isNotNull(); } @Test @@ -193,23 +193,23 @@ public class CoreConfigurationBuilderTest { CoreConfigurationBuilder b = new CoreConfigurationBuilder(); b.addCorePropertyConverters(); Map<TypeLiteral<?>, Collection<PropertyConverter<?>>> converters = b.getPropertyConverter(); - assertTrue(converters.containsKey(TypeLiteral.<BigDecimal>of(BigDecimal.class))); - assertTrue(converters.containsKey(TypeLiteral.<BigInteger>of(BigInteger.class))); - assertTrue(converters.containsKey(TypeLiteral.<Boolean>of(Boolean.class))); - assertTrue(converters.containsKey(TypeLiteral.<Byte>of(Byte.class))); - assertTrue(converters.containsKey(TypeLiteral.<Character>of(Character.class))); - assertTrue(converters.containsKey(TypeLiteral.<Class<?>>of(Class.class))); - assertTrue(converters.containsKey(TypeLiteral.<Currency>of(Currency.class))); - assertTrue(converters.containsKey(TypeLiteral.<Double>of(Double.class))); - assertTrue(converters.containsKey(TypeLiteral.<File>of(File.class))); - assertTrue(converters.containsKey(TypeLiteral.<Float>of(Float.class))); - assertTrue(converters.containsKey(TypeLiteral.<Integer>of(Integer.class))); - assertTrue(converters.containsKey(TypeLiteral.<Long>of(Long.class))); - assertTrue(converters.containsKey(TypeLiteral.<Number>of(Number.class))); - assertTrue(converters.containsKey(TypeLiteral.<Path>of(Path.class))); - assertTrue(converters.containsKey(TypeLiteral.<Short>of(Short.class))); - assertTrue(converters.containsKey(TypeLiteral.<URI>of(URI.class))); - assertTrue(converters.containsKey(TypeLiteral.<URL>of(URL.class))); + assertThat(converters.containsKey(TypeLiteral.<BigDecimal>of(BigDecimal.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<BigInteger>of(BigInteger.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Boolean>of(Boolean.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Byte>of(Byte.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Character>of(Character.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Class<?>>of(Class.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Currency>of(Currency.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Double>of(Double.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<File>of(File.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Float>of(Float.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Integer>of(Integer.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Long>of(Long.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Number>of(Number.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Path>of(Path.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<Short>of(Short.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<URI>of(URI.class))).isTrue(); + assertThat(converters.containsKey(TypeLiteral.<URL>of(URL.class))).isTrue(); } private static class TestPropertySource implements PropertySource{ http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationProviderTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationProviderTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationProviderTest.java index e4dab56..5673f90 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationProviderTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationProviderTest.java @@ -21,7 +21,7 @@ package org.apache.tamaya.core.internal; import org.apache.tamaya.Configuration; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Created by atsticks on 11.09.16. @@ -35,32 +35,30 @@ public class CoreConfigurationProviderTest { @Test public void getConfiguration() throws Exception { - assertNotNull(new CoreConfigurationProvider().getConfiguration()); + assertThat(new CoreConfigurationProvider().getConfiguration()).isNotNull(); } @Test public void createConfiguration() throws Exception { Configuration cfg = new CoreConfigurationBuilder().build(); - assertNotNull(new CoreConfigurationProvider().createConfiguration(cfg.getContext())); - assertEquals(cfg, - new CoreConfigurationProvider().createConfiguration(cfg.getContext())); + assertThat(new CoreConfigurationProvider().createConfiguration(cfg.getContext())).isNotNull(); + assertThat(cfg).isEqualTo(new CoreConfigurationProvider().createConfiguration(cfg.getContext())); } @Test public void getConfigurationContext() throws Exception { - assertNotNull(new CoreConfigurationProvider().getConfigurationContext()); - assertEquals(new CoreConfigurationProvider().getConfigurationContext(), - new CoreConfigurationProvider().getConfiguration().getContext()); + assertThat(new CoreConfigurationProvider().getConfigurationContext()).isNotNull(); + assertThat(new CoreConfigurationProvider().getConfigurationContext()).isEqualTo(new CoreConfigurationProvider().getConfiguration().getContext()); } @Test public void getConfigurationContextBuilder() throws Exception { - assertNotNull(new CoreConfigurationProvider().getConfigurationContextBuilder()); + assertThat(new CoreConfigurationProvider().getConfigurationContextBuilder()).isNotNull(); } @Test public void getConfigurationBuilder() throws Exception { - assertNotNull(new CoreConfigurationProvider().getConfigurationBuilder()); + assertThat(new CoreConfigurationProvider().getConfigurationBuilder()).isNotNull(); } @SuppressWarnings("deprecation") @@ -80,13 +78,13 @@ public class CoreConfigurationProviderTest { @SuppressWarnings("deprecation") @Test public void isConfigurationContextSettable() throws Exception { - assertTrue(new CoreConfigurationProvider().isConfigurationContextSettable()); + assertThat(new CoreConfigurationProvider().isConfigurationContextSettable()).isTrue(); } @SuppressWarnings("deprecation") @Test public void isConfigurationSettable() throws Exception { - assertTrue(new CoreConfigurationProvider().isConfigurationSettable()); + assertThat(new CoreConfigurationProvider().isConfigurationSettable()).isTrue(); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationTest.java index 6b8d1dc..2b30228 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/CoreConfigurationTest.java @@ -25,7 +25,7 @@ import org.apache.tamaya.core.testdata.TestPropertyDefaultSource; import org.apache.tamaya.spi.*; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Simple tests for {@link CoreConfiguration} by atsticks on 16.08.16. @@ -36,9 +36,9 @@ public class CoreConfigurationTest { public void addPropertySources() throws Exception { Configuration cfg = new CoreConfigurationBuilder().build(); TestPropertyDefaultSource def = new TestPropertyDefaultSource(); - assertFalse(cfg.getContext().getPropertySources().contains(def)); + assertThat(cfg.getContext().getPropertySources().contains(def)).isFalse(); cfg.getContext().addPropertySources(def); - assertTrue(cfg.getContext().getPropertySources().contains(def)); + assertThat(cfg.getContext().getPropertySources().contains(def)).isTrue(); } @Test @@ -49,11 +49,11 @@ public class CoreConfigurationTest { @Test public void getPropertySources() throws Exception { Configuration cfg = new CoreConfigurationBuilder().build(); - assertNotNull(cfg.getContext().getPropertySources()); - assertEquals(cfg.getContext().getPropertySources().size(), 0); + assertThat(cfg.getContext().getPropertySources()).isNotNull(); + assertThat(0).isEqualTo(cfg.getContext().getPropertySources().size()); cfg = new CoreConfigurationBuilder().addDefaultPropertySources().build(); - assertNotNull(cfg.getContext().getPropertySources()); - assertEquals(7, cfg.getContext().getPropertySources().size()); + assertThat(cfg.getContext().getPropertySources()).isNotNull(); + assertThat(cfg.getContext().getPropertySources()).hasSize(7); } @Test @@ -61,11 +61,11 @@ public class CoreConfigurationTest { TestPropertyDefaultSource ps = new TestPropertyDefaultSource(); Configuration cfg = new CoreConfigurationBuilder() .addPropertySources(ps).build(); - assertNotNull(cfg.getContext().getPropertySources()); - assertEquals(cfg.getContext().getPropertySources().size(), 1); - assertNotNull((cfg.getContext()).getPropertySource(ps.getName())); - assertEquals(ps.getName(), cfg.getContext().getPropertySource(ps.getName()).getName()); - assertNull(cfg.getContext().getPropertySource("huhu")); + assertThat(cfg.getContext().getPropertySources()).isNotNull(); + assertThat(1).isEqualTo(cfg.getContext().getPropertySources().size()); + assertThat((cfg.getContext()).getPropertySource(ps.getName())).isNotNull(); + assertThat(cfg.getContext().getPropertySource(ps.getName()).getName()).isEqualTo(ps.getName()); + assertThat(cfg.getContext().getPropertySource("huhu")).isNull(); } @@ -76,10 +76,10 @@ public class CoreConfigurationTest { .addPropertySources(ps).build(); Configuration cfg2 = new CoreConfigurationBuilder() .addPropertySources(ps).build(); - assertEquals(cfg1.hashCode(), cfg2.hashCode()); + assertThat(cfg2.hashCode()).isEqualTo(cfg1.hashCode()); cfg2 = new CoreConfigurationBuilder() .build(); - assertNotEquals(cfg1.hashCode(), cfg2.hashCode()); + assertThat(cfg1.hashCode()).isNotEqualTo(cfg2.hashCode()); } @@ -92,9 +92,9 @@ public class CoreConfigurationTest { return ""; } }; - assertFalse(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).contains(testConverter)); + assertThat(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).contains(testConverter)).isFalse(); cfg.getContext().addPropertyConverter(TypeLiteral.of(String.class), testConverter); - assertTrue(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).contains(testConverter)); + assertThat(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).contains(testConverter)).isTrue(); } @Test @@ -107,9 +107,9 @@ public class CoreConfigurationTest { } }; cfg.getContext().addPropertyConverter(TypeLiteral.of(String.class), testConverter); - assertNotNull(cfg.getContext().getPropertyConverters()); - assertTrue(cfg.getContext().getPropertyConverters().containsKey(TypeLiteral.of(String.class))); - assertTrue(cfg.getContext().getPropertyConverters().get(TypeLiteral.of(String.class)).contains(testConverter)); + assertThat(cfg.getContext().getPropertyConverters()).isNotNull(); + assertThat(cfg.getContext().getPropertyConverters().containsKey(TypeLiteral.of(String.class))).isTrue(); + assertThat(cfg.getContext().getPropertyConverters().get(TypeLiteral.of(String.class)).contains(testConverter)).isTrue(); testConverter = new PropertyConverter() { @Override public Object convert(String value, ConversionContext context) { @@ -117,8 +117,8 @@ public class CoreConfigurationTest { } }; cfg.getContext().addPropertyConverter(TypeLiteral.of(Integer.class), testConverter); - assertTrue(cfg.getContext().getPropertyConverters().containsKey(TypeLiteral.of(Integer.class))); - assertTrue(cfg.getContext().getPropertyConverters().get(TypeLiteral.of(Integer.class)).contains(testConverter)); + assertThat(cfg.getContext().getPropertyConverters().containsKey(TypeLiteral.of(Integer.class))).isTrue(); + assertThat(cfg.getContext().getPropertyConverters().get(TypeLiteral.of(Integer.class)).contains(testConverter)).isTrue(); } @Test @@ -130,12 +130,12 @@ public class CoreConfigurationTest { return ""; } }; - assertNotNull(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class))); - assertEquals(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).size(),0); + assertThat(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class))).isNotNull(); + assertThat(0).isEqualTo(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).size()); cfg.getContext().addPropertyConverter(TypeLiteral.of(String.class), testConverter); - assertNotNull(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class))); - assertEquals(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).size(),1); - assertTrue(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).contains(testConverter)); + assertThat(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class))).isNotNull(); + assertThat(1).isEqualTo(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).size()); + assertThat(cfg.getContext().getPropertyConverters(TypeLiteral.of(String.class)).contains(testConverter)).isTrue(); } @@ -149,29 +149,29 @@ public class CoreConfigurationTest { return value; } }; - assertNotNull(cfg.getContext().getPropertyFilters()); - assertFalse(cfg.getContext().getPropertyFilters().contains(testFilter)); + assertThat(cfg.getContext().getPropertyFilters()).isNotNull(); + assertThat(cfg.getContext().getPropertyFilters().contains(testFilter)).isFalse(); cfg = cfg.toBuilder().addPropertyFilters(testFilter).build(); - assertTrue(cfg.getContext().getPropertyFilters().contains(testFilter)); + assertThat(cfg.getContext().getPropertyFilters().contains(testFilter)).isTrue(); } @Test public void getPropertyValueCombinationPolicy() throws Exception { Configuration cfg = new CoreConfigurationBuilder().build(); - assertNotNull(cfg.getContext().getPropertyValueCombinationPolicy()); - assertEquals(cfg.getContext().getPropertyValueCombinationPolicy(), - PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_POLICY); + assertThat(cfg.getContext().getPropertyValueCombinationPolicy()).isNotNull(); + assertThat(cfg.getContext().getPropertyValueCombinationPolicy()) + .isEqualTo(PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_POLICY); } @Test public void toBuilder() throws Exception { - assertNotNull(new CoreConfigurationBuilder().build().toBuilder()); + assertThat(new CoreConfigurationBuilder().build().toBuilder()).isNotNull(); } @Test public void testRoundTrip() throws Exception { Configuration cfg = new CoreConfigurationBuilder().build(); - assertEquals(cfg.toBuilder().build(), cfg); + assertThat(cfg).isEqualTo(cfg.toBuilder().build()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultJavaConfigurationTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultJavaConfigurationTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultJavaConfigurationTest.java index a1d638f..54310ae 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultJavaConfigurationTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultJavaConfigurationTest.java @@ -18,13 +18,10 @@ */ package org.apache.tamaya.core.internal; -import org.apache.tamaya.spi.PropertySource; -import org.apache.tamaya.spisupport.propertysource.JavaConfigurationPropertySource; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; import org.junit.Test; import static org.apache.tamaya.ConfigurationProvider.getConfiguration; +import static org.assertj.core.api.Assertions.*; public class DefaultJavaConfigurationTest { @@ -37,14 +34,14 @@ public class DefaultJavaConfigurationTest { String key = "confkey" + i; String value = "javaconf-value" + i; // check if we had our key in configuration.current - MatcherAssert.assertThat(getConfiguration().getProperties().containsKey(key), Matchers.is(true)); - MatcherAssert.assertThat(value, Matchers.equalTo(getConfiguration().get(key))); + assertThat(getConfiguration().getProperties().containsKey(key)).isTrue(); + assertThat(value).isEqualTo(getConfiguration().get(key)); } - MatcherAssert.assertThat(getConfiguration().getProperties().containsKey("aaeehh"), Matchers.is(true)); - MatcherAssert.assertThat(getConfiguration().getProperties().get("aaeehh"), Matchers.equalTo(A_UMLAUT)); + assertThat(getConfiguration().getProperties().containsKey("aaeehh")).isTrue(); + assertThat(getConfiguration().getProperties().get("aaeehh")).isEqualTo(A_UMLAUT); - MatcherAssert.assertThat(getConfiguration().getProperties().containsKey(O_UMLAUT), Matchers.is(true)); - MatcherAssert.assertThat(getConfiguration().getProperties().get(O_UMLAUT), Matchers.equalTo("o")); + assertThat(getConfiguration().getProperties().containsKey(O_UMLAUT)).isTrue(); + assertThat(getConfiguration().getProperties().get(O_UMLAUT)).isEqualTo("o"); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceComparatorTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceComparatorTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceComparatorTest.java index f956d1a..ed59db1 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceComparatorTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceComparatorTest.java @@ -20,7 +20,7 @@ package org.apache.tamaya.core.internal; import javax.annotation.Priority; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; @@ -39,14 +39,13 @@ public class OSGIServiceComparatorTest { ServiceReference nullPriority = new MockServiceReference(); ServiceReference high = new MockHighPriorityServiceReference(); OSGIServiceComparator instance = new OSGIServiceComparator(); - - assertEquals(1, instance.compare(low, high)); - assertEquals(-1, instance.compare(high, low)); - assertEquals(0, instance.compare(low, low)); - - assertEquals(1, instance.compare(nullPriority, high)); - assertEquals(-1, instance.compare(high, nullPriority)); - assertEquals(0, instance.compare(nullPriority, low)); + assertThat(1).isEqualTo(instance.compare(low, high)); + assertThat(-1).isEqualTo(instance.compare(high, low)); + assertThat(0).isEqualTo(instance.compare(low, low)); + + assertThat(1).isEqualTo(instance.compare(nullPriority, high)); + assertThat(-1).isEqualTo(instance.compare(high, nullPriority)); + assertThat(0).isEqualTo(instance.compare(nullPriority, low)); } /** @@ -55,13 +54,13 @@ public class OSGIServiceComparatorTest { @Test public void testGetPriority_Object() { ServiceReference low = new MockLowPriorityServiceReference(); - assertEquals(1, OSGIServiceComparator.getPriority(low)); + assertThat(OSGIServiceComparator.getPriority(low)).isEqualTo(1); ServiceReference nullPriority = new MockServiceReference(); - assertEquals(1, OSGIServiceComparator.getPriority(nullPriority)); + assertThat(OSGIServiceComparator.getPriority(nullPriority)).isEqualTo(1); ServiceReference high = new MockHighPriorityServiceReference(); - assertEquals(10, OSGIServiceComparator.getPriority(high)); + assertThat(OSGIServiceComparator.getPriority(high)).isEqualTo(10); } /** @@ -69,9 +68,9 @@ public class OSGIServiceComparatorTest { */ @Test public void testGetPriority_Class() { - assertEquals(10, OSGIServiceComparator.getPriority(MockHighPriorityServiceReference.class)); - assertEquals(1, OSGIServiceComparator.getPriority(MockLowPriorityServiceReference.class)); - assertEquals(1, OSGIServiceComparator.getPriority(MockServiceReference.class)); + assertThat(OSGIServiceComparator.getPriority(MockHighPriorityServiceReference.class)).isEqualTo(10); + assertThat(OSGIServiceComparator.getPriority(MockLowPriorityServiceReference.class)).isEqualTo(1); + assertThat(OSGIServiceComparator.getPriority(MockServiceReference.class)).isEqualTo(1); } private class MockServiceReference implements ServiceReference { http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceContextTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceContextTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceContextTest.java index 2507672..f3c92bb 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceContextTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceContextTest.java @@ -27,7 +27,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.mockito.Mockito; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -44,7 +44,7 @@ public class OSGIServiceContextTest { @Test public void testIsInitialized() { OSGIServiceContext instance = new OSGIServiceContext(Mockito.mock(OSGIServiceLoader.class)); - assertTrue(instance.isInitialized()); + assertThat(instance.isInitialized()).isTrue(); } /** @@ -53,7 +53,7 @@ public class OSGIServiceContextTest { @Test public void testOrdinal() { OSGIServiceContext instance = new OSGIServiceContext(Mockito.mock(OSGIServiceLoader.class)); - assertEquals(10, instance.ordinal()); + assertThat(instance.ordinal()).isEqualTo(10); } /** @@ -66,9 +66,9 @@ public class OSGIServiceContextTest { OSGIServiceContext instance = new OSGIServiceContext(loader); Integer value = instance.create(Integer.class); - assertNull(value); + assertThat(value).isNull(); value = instance.getService(Integer.class); - assertNull(value); + assertThat(value).isNull(); } /** @@ -81,8 +81,8 @@ public class OSGIServiceContextTest { OSGIServiceContext instance = new OSGIServiceContext(loader); List services = instance.getServices(Integer.class); - assertNotNull(services); - assertTrue(services.isEmpty()); + assertThat(services).isNotNull(); + assertThat(services.isEmpty()).isTrue(); } /** @@ -101,10 +101,10 @@ public class OSGIServiceContextTest { OSGIServiceContext instance = new OSGIServiceContext(loader); Enumeration<URL> resources = instance.getResources("dummy" , ClassLoader.getSystemClassLoader()); - assertNotNull(resources); + assertThat(resources).isNotNull(); URL resource = (URL)resources.nextElement(); - assertTrue(resource.toString().contains("mockbundle.service")); - assertFalse(resources.hasMoreElements()); + assertThat(resource.toString().contains("mockbundle.service")).isTrue(); + assertThat(resources.hasMoreElements()).isFalse(); } /** @@ -122,8 +122,8 @@ public class OSGIServiceContextTest { OSGIServiceContext instance = new OSGIServiceContext(loader); URL resource = instance.getResource("mockbundle.service", ClassLoader.getSystemClassLoader()); - assertNotNull(resource); - assertTrue(resource.toString().contains("mockbundle.service")); + assertThat(resource).isNotNull(); + assertThat(resource.toString().contains("mockbundle.service")).isTrue(); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceLoaderTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceLoaderTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceLoaderTest.java index 4da6b34..c6b5de0 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceLoaderTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/OSGIServiceLoaderTest.java @@ -20,7 +20,7 @@ package org.apache.tamaya.core.internal; import java.util.Set; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; @@ -39,7 +39,7 @@ public class OSGIServiceLoaderTest { BundleContext mockBundleContext = new MockBundleContext(); OSGIServiceLoader instance = new OSGIServiceLoader(mockBundleContext); BundleContext result = instance.getBundleContext(); - assertEquals(mockBundleContext, result); + assertThat(result).isEqualTo(mockBundleContext); } /** @@ -57,7 +57,7 @@ public class OSGIServiceLoaderTest { mockBundleContext.installBundle(startedBundle); OSGIServiceLoader instance = new OSGIServiceLoader(mockBundleContext); Set<Bundle> result = instance.getResourceBundles(); - assertFalse(result.isEmpty()); + assertThat(result.isEmpty()).isFalse(); } /** @@ -90,24 +90,24 @@ public class OSGIServiceLoaderTest { mockBundleContext.setServiceCount(0); OSGIServiceLoader instance = new OSGIServiceLoader(mockBundleContext); resultBundles = instance.getResourceBundles(); - assertEquals(1, resultBundles.size()); - assertEquals(2, mockBundleContext.getServiceCount()); + assertThat(resultBundles).hasSize(1); + assertThat(mockBundleContext.getServiceCount()).isEqualTo(2); //After start mockBundleContext.setServiceCount(0); BundleEvent startedEvent = new BundleEvent(BundleEvent.STARTED, flipBundle); instance.bundleChanged(startedEvent); resultBundles = instance.getResourceBundles(); - assertEquals(2, resultBundles.size()); - assertEquals(2, mockBundleContext.getServiceCount()); + assertThat(resultBundles).hasSize(2); + assertThat(mockBundleContext.getServiceCount()).isEqualTo(2); //After stop mockBundleContext.setServiceCount(0); BundleEvent stoppedEvent = new BundleEvent(BundleEvent.STOPPED, flipBundle); instance.bundleChanged(stoppedEvent); resultBundles = instance.getResourceBundles(); - assertEquals(1, resultBundles.size()); - assertEquals(0, mockBundleContext.getServiceCount()); + assertThat(resultBundles).hasSize(1); + assertThat(mockBundleContext.getServiceCount()).isEqualTo(0); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java index 5cae3da..06c7685 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigDecimalConverterTest.java @@ -26,8 +26,6 @@ import org.junit.Test; import java.math.BigDecimal; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -47,7 +45,7 @@ public class BigDecimalConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigDecimal valueRead = config.get("tests.converter.bd.decimal", BigDecimal.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigDecimal(101), valueRead); + assertThat(valueRead).isEqualTo(new BigDecimal(101)); } /** @@ -61,16 +59,16 @@ public class BigDecimalConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigDecimal valueRead = config.get("tests.converter.bd.hex.lowerX", BigDecimal.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigDecimal("47"), valueRead); + assertThat(valueRead).isEqualTo(new BigDecimal("47")); valueRead = config.get("tests.converter.bd.hex.upperX", BigDecimal.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigDecimal("63"), valueRead); + assertThat(valueRead).isEqualTo(new BigDecimal("63")); valueRead = config.get("tests.converter.bd.hex.negLowerX", BigDecimal.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigDecimal("-47"), valueRead); + assertThat(valueRead).isEqualTo(new BigDecimal("-47")); valueRead = config.get("tests.converter.bd.hex.negUpperX", BigDecimal.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigDecimal("-63"), valueRead); + assertThat(valueRead).isEqualTo(new BigDecimal("-63")); } /** @@ -83,7 +81,7 @@ public class BigDecimalConverterTest { public void testConvert_NotPresent() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); BigDecimal valueRead = config.get("tests.converter.bd.foo", BigDecimal.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } /** @@ -97,8 +95,8 @@ public class BigDecimalConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigDecimal valueRead = config.get("tests.converter.bd.big", BigDecimal.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigDecimal("101666666666666662333337263723628763821638923628193612983618293628763"), - valueRead); + assertThat(new BigDecimal("101666666666666662333337263723628763821638923628193612983618293628763")) + .isEqualTo(valueRead); } /** @@ -112,8 +110,9 @@ public class BigDecimalConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigDecimal valueRead = config.get("tests.converter.bd.bigFloat", BigDecimal.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigDecimal("1016666666666666623333372637236287638216389293628763.1016666666666666623333372" - + "63723628763821638923628193612983618293628763"), valueRead); + assertThat(new BigDecimal("1016666666666666623333372637236287638216389293628763.1016666666666666623333372" + + "63723628763821638923628193612983618293628763")) + .isEqualTo(valueRead); } @Test http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigIntegerConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigIntegerConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigIntegerConverterTest.java index 108159c..b283a0c 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigIntegerConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BigIntegerConverterTest.java @@ -24,9 +24,8 @@ import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; -import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Ignore; import static org.mockito.Mockito.mock; @@ -47,7 +46,7 @@ public class BigIntegerConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigInteger valueRead = config.get("tests.converter.bd.decimal", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(BigInteger.valueOf(101), valueRead); + assertThat(valueRead).isEqualTo(BigInteger.valueOf(101)); } /** @@ -61,16 +60,16 @@ public class BigIntegerConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigInteger valueRead = config.get("tests.converter.bd.hex.lowerX", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigInteger("47"), valueRead); + assertThat(valueRead).isEqualTo(new BigInteger("47")); valueRead = config.get("tests.converter.bd.hex.upperX", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigInteger("63"), valueRead); + assertThat(valueRead).isEqualTo(new BigInteger("63")); valueRead = config.get("tests.converter.bd.hex.negLowerX", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigInteger("-47"), valueRead); + assertThat(valueRead).isEqualTo(new BigInteger("-47")); valueRead = config.get("tests.converter.bd.hex.negUpperX", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigInteger("-63"), valueRead); + assertThat(valueRead).isEqualTo(new BigInteger("-63")); } @@ -86,10 +85,10 @@ public class BigIntegerConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigInteger valueRead = config.get("tests.converter.bd.hex.subTenX", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigInteger("16777215"), valueRead); + assertThat(valueRead).isEqualTo(new BigInteger("16777215")); valueRead = config.get("tests.converter.bd.hex.negSubTenX", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigInteger("-263"), valueRead); + assertThat(valueRead).isEqualTo(new BigInteger("-263")); } @Test(expected = ConfigException.class) @@ -114,7 +113,7 @@ public class BigIntegerConverterTest { public void testConvert_NotPresent() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); BigInteger valueRead = config.get("tests.converter.bd.foo", BigInteger.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } /** @@ -128,8 +127,8 @@ public class BigIntegerConverterTest { Configuration config = ConfigurationProvider.getConfiguration(); BigInteger valueRead = config.get("tests.converter.bd.big", BigInteger.class); assertThat(valueRead).isNotNull(); - assertEquals(new BigInteger("101666666666666662333337263723628763821638923628193612983618293628763"), - valueRead); + assertThat(new BigInteger("101666666666666662333337263723628763821638923628193612983618293628763")) + .isEqualTo(valueRead); } @Test @@ -149,13 +148,13 @@ public class BigIntegerConverterTest { BigInteger value = converter.convert("", context); assertThat(value).isNull(); - assertTrue(context.getSupportedFormats().contains("<bigint> -> new BigInteger(bigint) (BigIntegerConverter)")); + assertThat(context.getSupportedFormats().contains("<bigint> -> new BigInteger(bigint) (BigIntegerConverter)")).isTrue(); } @Test public void testHashCode() { BigIntegerConverter instance = new BigIntegerConverter(); - assertEquals(BigIntegerConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(BigIntegerConverter.class.hashCode()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/119c4982/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java index 7accdcd..2bf8d57 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java @@ -19,16 +19,12 @@ package org.apache.tamaya.core.internal.converters; import org.apache.tamaya.ConfigException; -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.assertj.core.api.Assertions.assertThat; import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; -import static org.junit.Assert.assertTrue; import org.junit.Test; /** @@ -46,35 +42,35 @@ public class BooleanConverterTest { public void testConvert_BooleanTrue() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Boolean valueRead = config.get("tests.converter.boolean.y1", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.y2", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.yes1", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.yes2", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.yes3", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.true1", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.true2", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.true3", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.t1", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); valueRead = config.get("tests.converter.boolean.t2", Boolean.class); - assertNotNull(valueRead); - assertEquals(valueRead, Boolean.TRUE); + assertThat(valueRead).isNotNull(); + assertThat(Boolean.TRUE).isEqualTo(valueRead); } /** @@ -87,39 +83,39 @@ public class BooleanConverterTest { public void testConvert_BooleanFalse() throws Exception { Configuration config = ConfigurationProvider.getConfiguration(); Boolean valueRead = config.get("tests.converter.boolean.y1", Boolean.class); - assertNotNull(valueRead); + assertThat(valueRead).isNotNull(); valueRead = config.get("tests.converter.boolean.n1", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.n2", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.no1", Boolean.class); - assertFalse(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isFalse(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.no2", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.no3", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.false1", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.false2", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.false3", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.f1", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.f2", Boolean.class); - assertNotNull(valueRead); - assertFalse(valueRead); + assertThat(valueRead).isNotNull(); + assertThat(valueRead).isFalse(); valueRead = config.get("tests.converter.boolean.foo", Boolean.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } /** @@ -132,7 +128,7 @@ public class BooleanConverterTest { public void testConvert_BooleanInvalid() throws ConfigException { Configuration config = ConfigurationProvider.getConfiguration(); Boolean valueRead = config.get("tests.converter.boolean.invalid", Boolean.class); - assertNull(valueRead); + assertThat(valueRead).isNull(); } @Test @@ -141,14 +137,14 @@ public class BooleanConverterTest { BooleanConverter converter = new BooleanConverter(); converter.convert("", context); - assertTrue(context.getSupportedFormats().contains("true (ignore case) (BooleanConverter)")); - assertTrue(context.getSupportedFormats().contains("false (ignore case) (BooleanConverter)")); + assertThat(context.getSupportedFormats().contains("true (ignore case) (BooleanConverter)")).isTrue(); + assertThat(context.getSupportedFormats().contains("false (ignore case) (BooleanConverter)")).isTrue(); } @Test public void testHashCode() { BooleanConverter instance = new BooleanConverter(); - assertEquals(BooleanConverter.class.hashCode(), instance.hashCode()); + assertThat(instance.hashCode()).isEqualTo(BooleanConverter.class.hashCode()); } }
