TAMAYA-321 Fixed test. getOrDefault must accept null as well.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/b9ce1495 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/b9ce1495 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/b9ce1495 Branch: refs/heads/master Commit: b9ce14952b5e65bb9ec511bf3c5243167187d5e8 Parents: b117880 Author: Anatole Tresch <anat...@apache.org> Authored: Sun Nov 26 17:39:56 2017 +0100 Committer: Anatole Tresch <anat...@apache.org> Committed: Sun Nov 26 17:39:56 2017 +0100 ---------------------------------------------------------------------- .../apache/tamaya/spisupport/DefaultConfigurationTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b9ce1495/code/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationTest.java ---------------------------------------------------------------------- diff --git a/code/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationTest.java b/code/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationTest.java index 27eeda1..4711dc5 100644 --- a/code/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationTest.java +++ b/code/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationTest.java @@ -121,11 +121,10 @@ public class DefaultConfigurationTest { c.getOrDefault(null, "ok"); } - @Test(expected = NullPointerException.class) - public void getOrDefaultDoesNotAcceptNullAsDefaultValueForTwoParameterVariantDefaultValueIsSecond() { + @Test + public void getOrDefaultDoesAcceptNullAsDefaultValueForTwoParameterVariantDefaultValueIsSecond() { DefaultConfiguration c = new DefaultConfiguration(new DummyConfigurationContext()); - - c.getOrDefault("a", null); + assertNull(c.getOrDefault("a", null)); } @Test(expected = NullPointerException.class)