Repository: incubator-tamaya Updated Branches: refs/heads/master ca19d2d42 -> e52829c43
[TAMAYA-244] Fixed mistake in the generation of the toString method of PropertyValue. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/e52829c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/e52829c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/e52829c4 Branch: refs/heads/master Commit: e52829c439ddb12eceae94a44ddcdb5c47e39700 Parents: ca19d2d Author: Oliver B. Fischer <ple...@apache.org> Authored: Sat Mar 25 22:25:01 2017 +0100 Committer: Oliver B. Fischer <ple...@apache.org> Committed: Sat Mar 25 22:25:01 2017 +0100 ---------------------------------------------------------------------- code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java | 2 +- .../src/test/java/org/apache/tamaya/spi/FilterContextTest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e52829c4/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java ---------------------------------------------------------------------- diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java index 159160a..d1a8b9c 100644 --- a/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java +++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java @@ -186,7 +186,7 @@ public final class PropertyValue implements Serializable{ return "PropertyValue{" + "key='" + key + '\'' + ", value='" + value + '\'' + - ", source='" + value + '\'' + + ", source='" + source + '\'' + (metaEntries.isEmpty()?"":", metaEntries=" + metaEntries) + '}'; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e52829c4/code/api/src/test/java/org/apache/tamaya/spi/FilterContextTest.java ---------------------------------------------------------------------- diff --git a/code/api/src/test/java/org/apache/tamaya/spi/FilterContextTest.java b/code/api/src/test/java/org/apache/tamaya/spi/FilterContextTest.java index 3123660..822113a 100644 --- a/code/api/src/test/java/org/apache/tamaya/spi/FilterContextTest.java +++ b/code/api/src/test/java/org/apache/tamaya/spi/FilterContextTest.java @@ -96,8 +96,10 @@ public class FilterContextTest { PropertyValue val = PropertyValue.of("testToString", "val", "mySource"); FilterContext ctx = new FilterContext(val, config, new TestConfigContext()); String toString = ctx.toString(); + assertNotNull(toString); - assertTrue(toString.contains("FilterContext{value='PropertyValue{key='testToString', value='val', source='val'}', configEntries=[")); + assertTrue(toString.contains("FilterContext{value='PropertyValue{key='testToString', value='val', " + + "source='mySource'}', configEntries=[")); assertTrue(toString.contains("key-0")); assertTrue(toString.contains("key-1")); assertTrue(toString.endsWith("}"));
