Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master a2b9f3662 -> 3c61d11cd
Fixed tests and regex filter. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/3c61d11c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/3c61d11c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/3c61d11c Branch: refs/heads/master Commit: 3c61d11cd1c699acf1c86de302ceae9207d6fc1f Parents: a2b9f36 Author: anatole <[email protected]> Authored: Fri Nov 11 17:02:26 2016 +0100 Committer: anatole <[email protected]> Committed: Fri Nov 11 17:02:26 2016 +0100 ---------------------------------------------------------------------- .../tamaya/filter/ProgrammableFilterTest.java | 42 +++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3c61d11c/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java b/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java index 3bbd482..c236d45 100644 --- a/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java +++ b/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java @@ -36,44 +36,41 @@ public class ProgrammableFilterTest { @Test public void testAddRemoveFilter() throws Exception { FilterContext filter = new FilterContext(); - RegexPropertyFilter regexFilter = new RegexPropertyFilter(); - regexFilter.setIncludes("test\\..*"); Map<String,String> map = new HashMap<>(); - map.put("test1", "test1"); - map.put("test2", "test2"); - map.put("test.test3", "test.test3"); assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true)), "test.test3"); + RegexPropertyFilter regexFilter = new RegexPropertyFilter(); + regexFilter.setIncludes("test\\..*"); filter.addFilter(regexFilter); - assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); - assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); - assertNull(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true))); + assertNull(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true))); + assertNull(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true))); + assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true)), "test.test3"); filter.removeFilter(0); assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true)), "test.test3"); filter.addFilter(0, regexFilter); - assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); - assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); - assertNull(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true))); + assertNull(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true))); + assertNull(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true))); + assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true)), "test.test3"); } @Test public void testClearFilters() throws Exception { FilterContext filter = new FilterContext(); RegexPropertyFilter regexFilter = new RegexPropertyFilter(); - regexFilter.setIncludes("test\\..*"); + regexFilter.setIncludes("test1.*"); Map<String,String> map = new HashMap<>(); map.put("test1", "test1"); map.put("test2", "test2"); map.put("test.test3", "test.test3"); assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); - assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); - assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true)), "test.test3"); + assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test1.", map, true)), "test2"); + assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test1.test3", map, true)), "test.test3"); filter.addFilter(regexFilter); assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); - assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); + assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test1.", map, true)), "test2"); assertNull(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true))); filter.clearFilters(); assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); @@ -94,26 +91,23 @@ public class ProgrammableFilterTest { assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true)), "test.test3"); filter.setFilters(regexFilter); - assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); - assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); - assertNull(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true))); + assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test.1", map, true)), "test1"); + assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test.2", map, true)), "test2"); + assertNull(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test3.test3", map, true))); } @Test public void testSetFilters1() throws Exception { FilterContext filter = new FilterContext(); RegexPropertyFilter regexFilter = new RegexPropertyFilter(); - regexFilter.setIncludes("test\\..*"); + regexFilter.setIncludes("test1.*"); Map<String,String> map = new HashMap<>(); - map.put("test1", "test1"); - map.put("test2", "test2"); - map.put("test.test3", "test.test3"); assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); - assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true)), "test.test3"); + assertEquals(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test1.test3", map, true)), "test.test3"); filter.setFilters(Arrays.asList(new PropertyFilter[]{regexFilter})); assertEquals(filter.filterProperty("test1", new org.apache.tamaya.spi.FilterContext("test1", map, true)), "test1"); - assertEquals(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true)), "test2"); + assertNull(filter.filterProperty("test2", new org.apache.tamaya.spi.FilterContext("test2", map, true))); assertNull(filter.filterProperty("test.test3", new org.apache.tamaya.spi.FilterContext("test.test3", map, true))); }
