This is an automated email from the ASF dual-hosted git repository.
anatole 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 464bead Fixed test.
464bead is described below
commit 464bead639535e7f68bd406141f0fc01e8a127b1
Author: Anatole Tresch <[email protected]>
AuthorDate: Sun Aug 25 22:29:39 2019 +0200
Fixed test.
---
.../java/org/apache/tamaya/resolver/ManualSetupTest.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
index 7b06541..b2ab10c 100644
---
a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
+++
b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Creates and test a manual filter setup using a custom resolver.
@@ -40,12 +40,11 @@ public class ManualSetupTest {
ExpressionEvaluator evaluator = new
DefaultExpressionEvaluator(Arrays.asList(new CustomResolver()));
ExpressionResolutionFilter reolverFilter = new
ExpressionResolutionFilter(evaluator);
PropertyValue filtered =
reolverFilter.filterProperty(PropertyValue.createValue("foo",
"${foo:cccabABabbaaaba}"), null);
- assertNotNull(filtered);
PropertyValue unfiltered =
reolverFilter.filterProperty(PropertyValue.createValue("foo",
"${url:cccabABabbaaaba}"), null);
- assertNotNull(filtered);
- assertEquals("CCCBBABBBBBBBBB", filtered.getValue());
- assertNotNull(unfiltered);
- assertEquals("?{url:cccabABabbaaaba}", unfiltered.getValue());
+ assertThat(filtered).isNotNull();
+ assertThat(unfiltered).isNotNull();
+
assertThat(filtered.getValue()).isNotNull().isEqualTo("CCCBBABBBBBBBBB");
+
assertThat(unfiltered.getValue()).isNotNull().isEqualTo("?{url:cccabABabbaaaba}");
}
private static final class CustomResolver implements ExpressionResolver{