Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae eef30af2f -> 4ba673678
(Removed unnecessary test permutation.) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/064d12eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/064d12eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/064d12eb Branch: refs/heads/2.3-gae Commit: 064d12eb95b2086fbff903e1950d41f103face7b Parents: eef30af Author: ddekany <ddek...@apache.org> Authored: Sun Oct 25 16:30:28 2015 +0100 Committer: ddekany <ddek...@apache.org> Committed: Sun Oct 25 16:30:28 2015 +0100 ---------------------------------------------------------------------- .../java/freemarker/core/IteratorIssuesTest.java | 19 ------------------- 1 file changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/064d12eb/src/test/java/freemarker/core/IteratorIssuesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/core/IteratorIssuesTest.java b/src/test/java/freemarker/core/IteratorIssuesTest.java index 78de020..453da4a 100644 --- a/src/test/java/freemarker/core/IteratorIssuesTest.java +++ b/src/test/java/freemarker/core/IteratorIssuesTest.java @@ -43,15 +43,6 @@ public class IteratorIssuesTest extends TemplateTest { } @Test - public void testHasContentAndListDOW2324() throws Exception { - addToDataModel("it", getDOW2324().wrap(getAbcIt())); - assertOutput(FTL_HAS_CONTENT_AND_LIST, OUT_HAS_CONTENT_AND_LIST_ABC); - - addToDataModel("it", getDOW2324().wrap(getEmptyIt())); - assertOutput(FTL_HAS_CONTENT_AND_LIST, OUT_HAS_CONTENT_AND_LIST_EMPTY); - } - - @Test public void testHasContentAndListBW230() throws Exception { addToDataModel("it", getBW230().wrap(getAbcIt())); assertOutput(FTL_HAS_CONTENT_AND_LIST, OUT_HAS_CONTENT_AND_LIST_ABC); @@ -91,12 +82,6 @@ public class IteratorIssuesTest extends TemplateTest { } @Test - public void testListAndHasContentDOW2324() throws Exception { - addToDataModel("it", getDOW2324().wrap(getAbcIt())); - assertErrorContains(FTL_LIST_AND_HAS_CONTENT, "can be listed only once"); - } - - @Test public void testListAndHasContentBW230() throws Exception { addToDataModel("it", getBW230().wrap(getAbcIt())); assertOutput(FTL_LIST_AND_HAS_CONTENT, OUT_LIST_AND_HAS_CONTENT_BW_WRONG); @@ -129,10 +114,6 @@ public class IteratorIssuesTest extends TemplateTest { private DefaultObjectWrapper getDOW2323() { return new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_23).build(); } - - private DefaultObjectWrapper getDOW2324() { - return new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_24).build(); - } private BeansWrapper getBW230() { return new BeansWrapperBuilder(Configuration.VERSION_2_3_0).build();
