You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by st...@apache.org on 2015/01/07 23:21:42 UTC

[9/9] incubator-tamaya git commit: TAMAYA-49 fix test which I broke

TAMAYA-49 fix test which I broke


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/585167aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/585167aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/585167aa

Branch: refs/heads/master
Commit: 585167aa8dbcf695399977e889b5681e49e82f1d
Parents: 3d6456d
Author: Mark Struberg <st...@apache.org>
Authored: Wed Jan 7 23:19:34 2015 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Jan 7 23:19:34 2015 +0100

----------------------------------------------------------------------
 .../org/apache/tamaya/modules/json/JSONPropertySourceTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/585167aa/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java b/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
index 8935857..0c48534 100644
--- a/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
+++ b/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
@@ -32,6 +32,7 @@ import java.net.URL;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.fail;
@@ -150,7 +151,7 @@ public class JSONPropertySourceTest {
 
         JSONPropertySource source = new JSONPropertySource(configFile, 10);
 
-        assertThat(source.get(PropertySource.TAMAYA_ORDINAL).isPresent(), is(false));
+        assertThat(source.get(PropertySource.TAMAYA_ORDINAL), nullValue());
     }
 
     @Test