This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 46694d7 TAMAYA-216: Simplify assertj tests
new bbaed0c Merge pull request #28 from acoburn/TAMAYA-216
46694d7 is described below
commit 46694d7ad9abb7fa67708c0fe9bd37e6d8a65775
Author: Aaron Coburn <[email protected]>
AuthorDate: Thu Jan 24 11:26:29 2019 -0500
TAMAYA-216: Simplify assertj tests
This makes more idiomatic use of assertJ in the test code.
---
.../collections/CollectionAdvancedTests.java | 22 +--
.../tamaya/collections/CollectionsBaseTests.java | 160 ++++++++-------------
.../collections/CollectionsTypedReadOnlyTests.java | 80 ++++-------
.../tamaya/collections/CollectionsTypedTests.java | 132 +++++------------
.../org/apache/tamaya/consul/ConsulWriteTest.java | 3 +-
.../tamaya/events/ConfigurationChangeTest.java | 9 +-
.../tamaya/events/FrozenPropertySourceTest.java | 6 +-
.../tamaya/filter/ProgrammableFilterTest.java | 18 +--
.../functions/ConfigurationFunctionsTest.java | 3 +-
.../functions/PropertySourceFunctionsTest.java | 3 +-
.../hazelcast/AbstractHzPropertySourceTest.java | 6 +-
.../hazelcast/HazelcastPropertySourceTest.java | 18 +--
.../apache/tamaya/jndi/JNDIPropertySourceTest.java | 15 +-
.../microprofile/MicroprofileConfigTest.java | 3 +-
.../tamaya/resolver/ConfigResolutionTest.java | 9 +-
.../AbstractPathPropertySourceProviderTest.java | 2 +-
16 files changed, 153 insertions(+), 336 deletions(-)
diff --git
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
index ca7c18d..01016d5 100644
---
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
+++
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
@@ -45,12 +45,7 @@ public class CollectionAdvancedTests {
public void testCustomSeparator(){
Configuration config = Configuration.current();
List<String> items = config.get("sep-list", new
TypeLiteral<List<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(3);
- assertThat("a,b,c").isEqualTo(items.get(0));
- assertThat("d,e,f").isEqualTo(items.get(1));
- assertThat("g,h,i").isEqualTo(items.get(2));
+
assertThat(items).isNotNull().isNotEmpty().hasSize(3).containsExactly("a,b,c",
"d,e,f", "g,h,i");
}
/**
@@ -64,9 +59,7 @@ public class CollectionAdvancedTests {
public void testTypedContent(){
Configuration config = Configuration.current();
List<Currency> items = config.get("currency-list", new
TypeLiteral<List<Currency>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(3);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(3);
assertThat("CHF").isEqualTo(items.get(0).getCurrencyCode());
assertThat("USD").isEqualTo(items.get(1).getCurrencyCode());
assertThat("USS").isEqualTo(items.get(2).getCurrencyCode());
@@ -84,12 +77,7 @@ public class CollectionAdvancedTests {
public void testCustomParser(){
Configuration config = Configuration.current();
List<String> items = config.get("parser-list", new
TypeLiteral<List<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(3);
- assertThat("(A)").isEqualTo(items.get(0));
- assertThat("(B)").isEqualTo(items.get(1));
- assertThat("(C)").isEqualTo(items.get(2));
+
assertThat(items).isNotNull().isNotEmpty().hasSize(3).containsExactly("(A)",
"(B)", "(C)");
}
/**
@@ -104,9 +92,7 @@ public class CollectionAdvancedTests {
public void testCustomMapParser(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("redefined-map", Map.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(3);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(3);
assertThat("none").isEqualTo(items.get("0"));
assertThat("single").isEqualTo(items.get("1"));
assertThat("any").isEqualTo(items.get("2"));
diff --git
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
index e88fca7..780b391 100644
---
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
+++
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
@@ -38,187 +38,139 @@ public class CollectionsBaseTests {
public void testList_String(){
Configuration config = Configuration.current();
List<String> items = config.get("base.items", new
TypeLiteral<List<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (List<String>) config.get("base.items", List.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
@Test
public void testArrayList_String(){
Configuration config = Configuration.current();
ArrayList<String> items = config.get("base.items", new
TypeLiteral<ArrayList<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (ArrayList<String>) config.get("base.items", ArrayList.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
@Test
public void testLinkedList_String(){
Configuration config = Configuration.current();
LinkedList<String> items = config.get("base.items", new
TypeLiteral<LinkedList<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (LinkedList<String>) config.get("base.items",
LinkedList.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
@Test
public void testSet_String(){
Configuration config = Configuration.current();
Set<String> items = config.get("base.items", new
TypeLiteral<Set<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (Set<String>) config.get("base.items", Set.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
@Test
public void testSortedSet_String(){
Configuration config = Configuration.current();
Set<String> items = config.get("base.items", new
TypeLiteral<SortedSet<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (SortedSet<String>) config.get("base.items", SortedSet.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
@Test
public void testHashSet_String(){
Configuration config = Configuration.current();
Set<String> items = config.get("base.items", new
TypeLiteral<HashSet<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (HashSet<String>) config.get("base.items", HashSet.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
@Test
public void testTreeSet_String(){
Configuration config = Configuration.current();
TreeSet<String> items = config.get("base.items", new
TypeLiteral<TreeSet<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (TreeSet<String>) config.get("base.items", TreeSet.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
@Test
public void testMap_String(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("base.map", new
TypeLiteral<Map<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items = (Map<String,String>) config.get("base.map", Map.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
}
@Test
public void testHashMap_String(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("base.map", new
TypeLiteral<HashMap<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items = (HashMap<String,String>) config.get("base.map", HashMap.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
}
@Test
public void testSortedMap_String(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("base.map", new
TypeLiteral<SortedMap<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items = (Map<String,String>) config.get("base.map", SortedMap.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
}
@Test
public void testTreeMap_String(){
Configuration config = Configuration.current();
TreeMap<String,String> items = config.get("base.map", new
TypeLiteral<TreeMap<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items = config.get("base.map", TreeMap.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
}
@Test
public void testCollection_String(){
Configuration config = Configuration.current();
Collection<String> items = config.get("base.items", new
TypeLiteral<Collection<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items = (Collection<String>) config.get("base.items",
Collection.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
}
}
diff --git
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
index c339d9f..c330658 100644
---
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
+++
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
@@ -40,9 +40,7 @@ public class CollectionsTypedReadOnlyTests {
public void testArrayListList_1(){
Configuration config = Configuration.current();
List<String> items = config.get("typed.arraylist", new
TypeLiteral<List<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@@ -50,9 +48,7 @@ public class CollectionsTypedReadOnlyTests {
public void testArrayListList_2(){
Configuration config = Configuration.current();
List<String> items = (List<String>) config.get("typed.arraylist",
List.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@@ -60,9 +56,7 @@ public class CollectionsTypedReadOnlyTests {
public void testLinkedListList_1(){
Configuration config = Configuration.current();
List<String> items = config.get("typed.linkedlist", new
TypeLiteral<List<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@@ -70,9 +64,7 @@ public class CollectionsTypedReadOnlyTests {
public void testLinkedListList_2(){
Configuration config = Configuration.current();
List<String> items = (List<String>) config.get("typed.linkedlist",
List.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@@ -81,18 +73,14 @@ public class CollectionsTypedReadOnlyTests {
public void testHashSet_1(){
Configuration config = Configuration.current();
Set<String> items = config.get("typed.hashset", new
TypeLiteral<Set<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@Test
public void testHashSet_2(){
Configuration config = Configuration.current();
Set<String> items = (Set<String>) config.get("typed.hashset",
Set.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@@ -100,18 +88,14 @@ public class CollectionsTypedReadOnlyTests {
public void testTreeSet_1(){
Configuration config = Configuration.current();
Set<String> items = config.get("typed.treeset", new
TypeLiteral<Set<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@Test
public void testTreeSet_2(){
Configuration config = Configuration.current();
Set<String> items = items = (Set<String>) config.get("typed.treeset",
Set.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
+ assertThat(items).isNotNull().isNotEmpty().hasSize(10);
items.add("test");
}
@@ -119,26 +103,22 @@ public class CollectionsTypedReadOnlyTests {
public void testHashMap_1(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("typed.hashmap", new
TypeLiteral<Map<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items.put("g","hjhhj");
}
@Test(expected=UnsupportedOperationException.class)
public void testHashMap_2(){
Configuration config = Configuration.current();
Map<String,String> items = (Map<String,String>)
config.get("typed.hashmap", Map.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items.put("g","hjhhj");
}
@@ -147,26 +127,22 @@ public class CollectionsTypedReadOnlyTests {
public void testTreeMap_1(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("typed.treemap", new
TypeLiteral<Map<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items.put("g","hjhhj");
}
@Test
public void testTreeMap_2(){
Configuration config = Configuration.current();
Map<String,String> items = (Map<String,String>)
config.get("typed.treemap", Map.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
+ assertThat(items).isNotNull().isNotEmpty().hasSize(4)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items.put("g","hjhhj");
}
diff --git
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
index d6c21f1..4ec507b 100644
---
a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
+++
b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
@@ -38,30 +38,18 @@ public class CollectionsTypedTests {
public void testArrayListList_String(){
Configuration config = Configuration.current();
List<String> items = config.get("typed2.arraylist", new
TypeLiteral<List<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(ArrayList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(ArrayList.class);
items = (List<String>) config.get("typed2.arraylist", List.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(ArrayList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(ArrayList.class);
}
@Test
public void testLinkedListList_String(){
Configuration config = Configuration.current();
List<String> items = config.get("typed2.linkedlist", new
TypeLiteral<List<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(LinkedList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(LinkedList.class);
items = (List<String>) config.get("typed2.linkedlist", List.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(LinkedList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(LinkedList.class);
}
@@ -69,136 +57,88 @@ public class CollectionsTypedTests {
public void testHashSet_String(){
Configuration config = Configuration.current();
Set<String> items = config.get("typed2.hashset", new
TypeLiteral<Set<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(HashSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(HashSet.class);
items = (Set<String>) config.get("typed2.hashset", Set.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(HashSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(HashSet.class);
}
@Test
public void testTreeSet_String(){
Configuration config = Configuration.current();
Set<String> items = config.get("typed2.treeset", new
TypeLiteral<Set<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(TreeSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(TreeSet.class);
items = (Set<String>) config.get("typed2.treeset", Set.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(TreeSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(TreeSet.class);
}
@Test
public void testHashMap_String(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("typed2.hashmap", new
TypeLiteral<Map<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
- assertThat(items).isInstanceOf(HashMap.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(4).isInstanceOf(HashMap.class)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items = (Map<String,String>) config.get("typed2.hashmap", Map.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
- assertThat(items).isInstanceOf(HashMap.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(4).isInstanceOf(HashMap.class)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
}
@Test
public void testTreeMap_String(){
Configuration config = Configuration.current();
Map<String,String> items = config.get("typed2.treemap", new
TypeLiteral<Map<String,String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
- assertThat(items).isInstanceOf(TreeMap.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(4).isInstanceOf(TreeMap.class)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
items = (Map<String,String>) config.get("typed2.treemap", Map.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(4);
- assertThat("a").isEqualTo(items.get("1"));
- assertThat("b").isEqualTo(items.get("2"));
- assertThat("c").isEqualTo(items.get("3"));
- assertThat(" ").isEqualTo(items.get("4"));
- assertThat(items).isInstanceOf(TreeMap.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(4).isInstanceOf(TreeMap.class)
+ .containsEntry("1", "a")
+ .containsEntry("2", "b")
+ .containsEntry("3", "c")
+ .containsEntry("4", " ");
}
@Test
public void testCollection_HashSet(){
Configuration config = Configuration.current();
Collection<String> items = config.get("typed2.hashset", new
TypeLiteral<Collection<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(HashSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(HashSet.class);
items = (Collection<String>) config.get("typed2.hashset",
Collection.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(HashSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(HashSet.class);
}
@Test
public void testCollection_TreeSet(){
Configuration config = Configuration.current();
Collection<String> items = config.get("typed2.treeset", new
TypeLiteral<Collection<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(TreeSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(TreeSet.class);
items = (Collection<String>) config.get("typed2.treeset",
Collection.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(TreeSet.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(TreeSet.class);
}
@Test
public void testCollection_ArrayList(){
Configuration config = Configuration.current();
Collection<String> items = config.get("typed2.arraylist", new
TypeLiteral<Collection<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(ArrayList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(ArrayList.class);
items = (Collection<String>) config.get("typed2.arraylist",
Collection.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(ArrayList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(ArrayList.class);
}
@Test
public void testCollection_LinkedList(){
Configuration config = Configuration.current();
Collection<String> items = config.get("typed2.linkedlist", new
TypeLiteral<Collection<String>>(){});
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(LinkedList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(LinkedList.class);
items = (Collection<String>) config.get("typed2.linkedlist",
Collection.class);
- assertThat(items).isNotNull();
- assertThat(items.isEmpty()).isFalse();
- assertThat(items).hasSize(10);
- assertThat(items).isInstanceOf(LinkedList.class);
+
assertThat(items).isNotNull().isNotEmpty().hasSize(10).isInstanceOf(LinkedList.class);
}
}
diff --git
a/modules/consul/src/test/java/org/apache/tamaya/consul/ConsulWriteTest.java
b/modules/consul/src/test/java/org/apache/tamaya/consul/ConsulWriteTest.java
index 93eccf5..f7700b0 100644
--- a/modules/consul/src/test/java/org/apache/tamaya/consul/ConsulWriteTest.java
+++ b/modules/consul/src/test/java/org/apache/tamaya/consul/ConsulWriteTest.java
@@ -77,7 +77,6 @@ public class ConsulWriteTest {
@Test
public void testGetProperties() throws Exception {
if(!execute)return;
- Map<String,PropertyValue> result = propertySource.getProperties();
- assertThat(result.isEmpty()).isTrue();
+ assertThat(propertySource.getProperties()).isEmpty();
}
}
diff --git
a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
index 53b2a92..c452bd4 100644
---
a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
+++
b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
@@ -152,12 +152,7 @@ public class ConfigurationChangeTest {
public void testToString() throws Exception {
Configuration config = Configuration.current();
ConfigurationChange change =
ConfigurationChangeBuilder.of(config).removeKey("java.version").build();
- String toString =
- change.toString();
- assertThat(toString.contains("timestamp")).isTrue();
- assertThat(toString.contains("change-id")).isTrue();
- assertThat(toString.contains("snapshot-id")).isTrue();
- assertThat(toString.contains("key1")).isFalse();
- assertThat(toString.contains("key2")).isFalse();
+
assertThat(change.toString()).contains("timestamp").contains("change-id").contains("snapshot-id")
+ .doesNotContain("key1").doesNotContain("key2");
}
}
diff --git
a/modules/events/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java
b/modules/events/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java
index e16360b..bbfb7c6 100644
---
a/modules/events/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java
+++
b/modules/events/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java
@@ -77,7 +77,7 @@ public class FrozenPropertySourceTest {
PropertySource ps1 = FrozenPropertySource.of(myPS);
PropertySource ps2 = FrozenPropertySource.of(myPS);
assertThat(ps1.getName()).isEqualTo(ps2.getName());
-
assertThat(ps1.getProperties().size()).isEqualTo(ps2.getProperties().size());
+ assertThat(ps1.getProperties()).hasSize(ps2.getProperties().size());
}
@Test
@@ -101,8 +101,6 @@ public class FrozenPropertySourceTest {
public void testToString() throws Exception {
PropertySource ps = FrozenPropertySource.of(myPS);
String toString = ps.toString();
- assertThat(toString).isNotNull();
- assertThat(toString.contains("FrozenPropertySource")).isTrue();
- assertThat(toString.contains(myPS.getName())).isTrue();
+
assertThat(toString).isNotNull().contains("FrozenPropertySource").contains(myPS.getName());
}
}
diff --git
a/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java
b/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java
index 81ea141..6411738 100644
---
a/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java
+++
b/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java
@@ -134,28 +134,22 @@ public class ProgrammableFilterTest {
@Test
public void testGetFilters() throws Exception {
ThreadFilterContext filter = new ThreadFilterContext();
- assertThat(filter.getFilters()).isNotNull();
- assertThat(filter.getFilters().isEmpty()).isTrue();
+ assertThat(filter.getFilters()).isNotNull().isEmpty();
RegexPropertyFilter regexFilter = new RegexPropertyFilter();
regexFilter.setIncludes("test\\..*");
filter.addFilter(regexFilter);
- assertThat(filter.getFilters()).isNotNull();
- assertThat(filter.getFilters().isEmpty()).isFalse();
- assertThat(filter.getFilters()).hasSize(1);
- assertThat(regexFilter).isEqualTo(filter.getFilters().get(0));
+
assertThat(filter.getFilters()).isNotNull().isNotEmpty().hasSize(1).contains(regexFilter);
}
@Test
public void testToString() throws Exception {
ThreadFilterContext filter = new ThreadFilterContext();
- assertThat(filter.toString().contains("test\\..*")).isFalse();
- assertThat(filter.toString().contains("ProgrammableFilter")).isTrue();
-
assertThat(filter.toString().contains("RegexPropertyFilter")).isFalse();
+ assertThat(filter.toString()).contains("ProgrammableFilter")
+ .doesNotContain("RegexPropertyFilter").doesNotContain("test\\..*");
RegexPropertyFilter regexFilter = new RegexPropertyFilter();
regexFilter.setIncludes("test\\..*");
filter.addFilter(regexFilter);
- assertThat(filter.toString().contains("test\\..*")).isTrue();
- assertThat(filter.toString().contains("ProgrammableFilter")).isTrue();
- assertThat(filter.toString().contains("RegexPropertyFilter")).isTrue();
+ assertThat(filter.toString()).contains("ProgrammableFilter")
+ .contains("RegexPropertyFilter").contains("test\\..*");
}
}
diff --git
a/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
b/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
index 4fe0591..f37213b 100644
---
a/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
+++
b/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
@@ -147,8 +147,7 @@ public class ConfigurationFunctionsTest {
public void testEmptyConfiguration() throws Exception {
Configuration ps = ConfigurationFunctions.emptyConfiguration();
assertThat(ps).isNotNull();
- assertThat(ps.getProperties()).isNotNull();
- assertThat(ps.getProperties().isEmpty()).isTrue();
+ assertThat(ps.getProperties()).isNotNull().isEmpty();
}
diff --git
a/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
b/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
index e9bc970..17a0e21 100644
---
a/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
+++
b/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
@@ -355,8 +355,7 @@ public class PropertySourceFunctionsTest {
public void testEmptyPropertySource() throws Exception {
PropertySource ps = PropertySource.EMPTY;
assertThat(ps).isNotNull();
- assertThat(ps.getProperties()).isNotNull();
- assertThat(ps.getProperties().isEmpty()).isTrue();
+ assertThat(ps.getProperties()).isNotNull().isEmpty();
assertThat(ps.getName()).isEqualTo("<empty>");
}
}
diff --git
a/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/AbstractHzPropertySourceTest.java
b/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/AbstractHzPropertySourceTest.java
index 30a9bc4..a6c4e84 100644
---
a/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/AbstractHzPropertySourceTest.java
+++
b/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/AbstractHzPropertySourceTest.java
@@ -62,8 +62,7 @@ public class AbstractHzPropertySourceTest {
public void t01_testGetProperties(){
hps.setMapReference("config");
Map<String, PropertyValue> values = hps.getProperties();
- assertThat(values).isNotNull();
- assertThat(3).isEqualTo(values.size());
+ assertThat(values).isNotNull().hasSize(3);
assertThat(values.get("k1")).isNotNull();
assertThat(values.get("k2")).isNotNull();
assertThat("v1").isEqualTo(values.get("k1").getValue());
@@ -72,8 +71,7 @@ public class AbstractHzPropertySourceTest {
hps.setMapReference("config2");
Map<String, PropertyValue> values2 = hps.getProperties();
- assertThat(values2).isNotNull();
- assertThat(2).isEqualTo(values2.size());
+ assertThat(values2).isNotNull().hasSize(2);
assertThat(values2.get("key1")).isNotNull();
assertThat(values2.get("key2")).isNotNull();
assertThat("val1").isEqualTo(values2.get("key1").getValue());
diff --git
a/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java
b/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java
index cdf2140..17a025f 100644
---
a/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java
+++
b/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java
@@ -61,8 +61,7 @@ public class HazelcastPropertySourceTest {
public void t01_testGetProperties(){
hps.setMapReference("config3");
Map<String, PropertyValue> values = hps.getProperties();
- assertThat(values).isNotNull();
- assertThat(3).isEqualTo(values.size());
+ assertThat(values).isNotNull().hasSize(3);
assertThat(values.get("k1")).isNotNull();
assertThat(values.get("k2")).isNotNull();
assertThat("v1").isEqualTo(values.get("k1").getValue());
@@ -71,8 +70,7 @@ public class HazelcastPropertySourceTest {
hps.setMapReference("config4");
Map<String, PropertyValue> values2 = hps.getProperties();
- assertThat(values2).isNotNull();
- assertThat(2).isEqualTo(values2.size());
+ assertThat(values2).isNotNull().hasSize(2);
assertThat(values2.get("key1")).isNotNull();
assertThat(values2.get("key2")).isNotNull();
assertThat("val1").isEqualTo(values2.get("key1").getValue());
@@ -82,8 +80,7 @@ public class HazelcastPropertySourceTest {
hps.setMapReference("bar");
hps.setDefaultOrdinal(1500);
Map<String, PropertyValue> values3 = hps.getProperties();
- assertThat(values3).isNotNull();
- assertThat(0).isEqualTo(values3.size());
+ assertThat(values3).isNotNull().hasSize(0);
assertThat(hps.getOrdinal()).isEqualTo(1500);
}
@@ -159,8 +156,7 @@ public class HazelcastPropertySourceTest {
hps.setMapReference("config3");
hps.setDefaultOrdinal(200);
Map<String, PropertyValue> values = hps.getProperties();
- assertThat(values).isNotNull();
- assertThat(3).isEqualTo(values.size());
+ assertThat(values).isNotNull().hasSize(3);
assertThat(values.get("k1")).isNotNull();
assertThat(values.get("k2")).isNotNull();
assertThat("v1").isEqualTo(values.get("k1").getValue());
@@ -176,8 +172,7 @@ public class HazelcastPropertySourceTest {
assertThat(50L).isEqualTo(hps.getCachePeriod());
assertThat(hps.getValidUntil() >= System.currentTimeMillis()).isTrue();
values = hps.getProperties();
- assertThat(values).isNotNull();
- assertThat(3).isEqualTo(values.size());
+ assertThat(values).isNotNull().hasSize(3);
assertThat(values.get("k1")).isNotNull();
assertThat(values.get("k2")).isNotNull();
assertThat("v1").isEqualTo(values.get("k1").getValue());
@@ -189,8 +184,7 @@ public class HazelcastPropertySourceTest {
// Read updated values
values = hps.getProperties();
- assertThat(values).isNotNull();
- assertThat(3).isEqualTo(values.size());
+ assertThat(values).isNotNull().hasSize(3);
assertThat(values.get("k1")).isNotNull();
assertThat(values.get("k2")).isNotNull();
assertThat(values.get("k3")).isNotNull();
diff --git
a/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
b/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
index 9497565..2d7d246 100644
---
a/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
+++
b/modules/jndi/src/test/java/org/apache/tamaya/jndi/JNDIPropertySourceTest.java
@@ -53,20 +53,11 @@ public class JNDIPropertySourceTest{
public void testScanContext() throws NamingException,
MalformedURLException {
JNDIPropertySource ps = new JNDIPropertySource("jndi-test",
getTestDirContext(createFSContext()));
assertThat(ps.isScannable()).isFalse();
- Map<String,PropertyValue> props = ps.getProperties();
- assertThat(props).isNotNull();
- assertThat(props.isEmpty()).isTrue();
+ assertThat(ps.getProperties()).isNotNull().isEmpty();
ps.setScannable(true);
assertThat(ps.isScannable()).isTrue();
- props = ps.getProperties();
- assertThat(props).isNotNull();
- assertThat(props.isEmpty()).isFalse();
- assertThat(props).hasSize(5);
- assertThat(props.get("c.c1.test5")).isNotNull();
- assertThat(props.get("c.test3")).isNotNull();
- assertThat(props.get("c.test4")).isNotNull();
- assertThat(props.get("b.test2")).isNotNull();
- assertThat(props.get("a.test1")).isNotNull();
+ assertThat(ps.getProperties()).isNotNull().isNotEmpty().hasSize(5)
+ .containsKeys("a.test1", "b.test2", "c.test3", "c.test4",
"c.c1.test5");
}
}
diff --git
a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java
b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java
index 92002fb..7c98b08 100644
---
a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java
+++
b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java
@@ -56,8 +56,7 @@ public class MicroprofileConfigTest {
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/modules/resolver/src/test/java/org/apache/tamaya/resolver/ConfigResolutionTest.java
b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ConfigResolutionTest.java
index 33a9823..1e6270e 100644
---
a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ConfigResolutionTest.java
+++
b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ConfigResolutionTest.java
@@ -95,22 +95,19 @@ public class ConfigResolutionTest {
@Test
public void testClasspath_Refs() {
String value = Configuration.current().get("cp-ref");
- assertThat(value).isNotNull();
- assertThat(value.contains("This content comes from
Testresource.txt!")).isTrue();
+ assertThat(value).isNotNull().contains("This content comes from
Testresource.txt!");
}
@Test
public void testResource_Refs() {
String value = Configuration.current().get("res-ref");
- assertThat(value).isNotNull();
- assertThat(value.contains("This content comes from
Testresource.txt!")).isTrue();
+ assertThat(value).isNotNull().contains("This content comes from
Testresource.txt!");
}
@Test
public void testFile_Refs() {
String value = Configuration.current().get("file-ref");
- assertThat(value).isNotNull();
- assertThat(value.contains("This content comes from
Testresource2.txt!")).isTrue();
+ assertThat(value).isNotNull().contains("This content comes from
Testresource2.txt!");
}
@Test
diff --git
a/modules/resources/src/test/java/org/apache/tamaya/resource/AbstractPathPropertySourceProviderTest.java
b/modules/resources/src/test/java/org/apache/tamaya/resource/AbstractPathPropertySourceProviderTest.java
index 74806bb..1d13ed2 100644
---
a/modules/resources/src/test/java/org/apache/tamaya/resource/AbstractPathPropertySourceProviderTest.java
+++
b/modules/resources/src/test/java/org/apache/tamaya/resource/AbstractPathPropertySourceProviderTest.java
@@ -55,7 +55,7 @@ public class AbstractPathPropertySourceProviderTest {
ClassLoader.getSystemClassLoader().getResource("test.properties")
);
assertThat(ps).isNotNull();
- assertThat(ps.getProperties().isEmpty()).isTrue();
+ assertThat(ps.getProperties()).isEmpty();
}
private static final class EmptyPropertySource implements PropertySource {
