(Fixed tests broke after the TemplateCollectionModelEx.contains(TemplateModel) method was removed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/7180eedb Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/7180eedb Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/7180eedb Branch: refs/heads/2.3-gae Commit: 7180eedb49cb8336ac85fea808d0abb7b53d598b Parents: c56467c Author: ddekany <[email protected]> Authored: Tue Mar 7 15:16:01 2017 +0100 Committer: ddekany <[email protected]> Committed: Tue Mar 7 15:16:01 2017 +0100 ---------------------------------------------------------------------- .../template/DefaultObjectWrapperTest.java | 19 ------------------- 1 file changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7180eedb/src/test/java/freemarker/template/DefaultObjectWrapperTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java index 28dcb7c..36c12fd 100644 --- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java +++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java @@ -732,18 +732,6 @@ public class DefaultObjectWrapperTest { assertFalse(coll.isEmpty()); assertCollectionTMEquals(coll, "a", "b", "c"); - assertTrue(coll.contains(OW22CA.wrap("a"))); - assertTrue(coll.contains(OW22CA.wrap("b"))); - assertTrue(coll.contains(OW22CA.wrap("c"))); - assertTrue(coll.contains(OW22CA.wrap("c"))); - assertFalse(coll.contains(OW22CA.wrap("d"))); - try { - assertFalse(coll.contains(OW22CA.wrap(1))); - fail(); - } catch (TemplateModelException e) { - assertThat(e.getMessage(), containsString("Integer")); - } - assertRoundtrip(OW22CA, set, DefaultNonListCollectionAdapter.class, TreeSet.class, "[a, b, c]"); assertSizeThroughAPIModel(3, coll); @@ -764,13 +752,6 @@ public class DefaultObjectWrapperTest { assertTrue(obj1 != null && obj1.equals(list) || obj2 != null && obj2.equals(list)); assertTrue(tm1 instanceof DefaultListAdapter || tm2 instanceof DefaultListAdapter); - List similarList = new ArrayList(); - similarList.add("b"); - assertTrue(coll.contains(OW22CA.wrap(similarList))); - assertTrue(coll.contains(OW22CA.wrap(null))); - assertFalse(coll.contains(OW22CA.wrap("a"))); - assertFalse(coll.contains(OW22CA.wrap(1))); - assertRoundtrip(OW22CA, set, DefaultNonListCollectionAdapter.class, HashSet.class, "[" + obj1 + ", " + obj2 + "]"); }
