Repository: incubator-tamaya Updated Branches: refs/heads/master 4d5f5187c -> 32661ef7a
Added tests fir with and query, reenabled methods. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/32661ef7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/32661ef7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/32661ef7 Branch: refs/heads/master Commit: 32661ef7ac89b9908a471043cc6fc47a748bffef Parents: 4d5f518 Author: anatole <anat...@apache.org> Authored: Wed Mar 22 00:16:50 2017 +0100 Committer: anatole <anat...@apache.org> Committed: Wed Mar 22 00:17:40 2017 +0100 ---------------------------------------------------------------------- .../core/internal/DefaultConfiguration.java | 2 - .../propertysource/SystemPropertySource.java | 4 +- .../core/internal/DefaultConfigurationTest.java | 41 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/32661ef7/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java index 48cd555..54cd186 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java @@ -219,13 +219,11 @@ public class DefaultConfiguration implements Configuration { @Override public Configuration with(ConfigOperator operator) { - // todo obf if (1==1) throw new RuntimeException("No tests written."); return operator.operate(this); } @Override public <T> T query(ConfigQuery<T> query) { - // todo obf if (1==1) throw new RuntimeException("No tests written."); return query.query(this); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/32661ef7/code/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java b/code/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java index 4dca29d..7759827 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java +++ b/code/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java @@ -138,9 +138,9 @@ public class SystemPropertySource extends BasePropertySource { Map<String,PropertyValue> values = new HashMap<>(); for (Map.Entry<Object,Object> entry : sysProps.entrySet()) { if(prefix==null) { - values.put((String) entry.getKey(), PropertyValue.of((String) entry.getKey(), (String)entry.getValue(), getName())); + values.put(entry.getKey().toString(), PropertyValue.of(entry.getKey().toString(), entry.getValue().toString(), getName())); }else { - values.put(prefix + entry.getKey(), PropertyValue.of(prefix + entry.getKey(), (String)entry.getValue(), getName())); + values.put(prefix + entry.getKey(), PropertyValue.of(prefix + entry.getKey(), entry.getValue().toString(), getName())); } } return values; http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/32661ef7/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java ---------------------------------------------------------------------- diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java index 541689f..c12d157 100644 --- a/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java +++ b/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java @@ -18,6 +18,9 @@ */ package org.apache.tamaya.core.internal; +import org.apache.tamaya.ConfigOperator; +import org.apache.tamaya.ConfigQuery; +import org.apache.tamaya.Configuration; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.*; import org.junit.Test; @@ -26,6 +29,8 @@ import org.mockito.internal.matchers.Null; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; + public class DefaultConfigurationTest { /* @@ -129,6 +134,42 @@ public class DefaultConfigurationTest { c.getOrDefault("a", null); } + @Test(expected = NullPointerException.class) + public void with_Null() { + DefaultConfiguration c = new DefaultConfiguration(new DummyConfigurationContext()); + + c.with(null); + } + + @Test(expected = NullPointerException.class) + public void query_Null() { + DefaultConfiguration c = new DefaultConfiguration(new DummyConfigurationContext()); + + c.query(null); + } + + + @Test + public void with() { + DefaultConfiguration c = new DefaultConfiguration(new DummyConfigurationContext()); + assertEquals(c.with(new ConfigOperator() { + @Override + public Configuration operate(Configuration config) { + return config; + } + }), c); + } + + @Test + public void query() { + DefaultConfiguration c = new DefaultConfiguration(new DummyConfigurationContext()); + assertEquals(c.query(new ConfigQuery<String>() { + @Override + public String query(Configuration config) { + return "testQ"; + } + }), "testQ"); + }
