You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2015/06/02 00:44:35 UTC
tapestry-5 git commit: TAP5-2109: ignores text just
before the closing tag
Repository: tapestry-5
Updated Branches:
refs/heads/master a949d55e7 -> 2619a327f
TAP5-2109: <t:content> ignores text just before the closing tag
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2619a327
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2619a327
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2619a327
Branch: refs/heads/master
Commit: 2619a327f9f1082dd95f6e97f7d43c76abb88a22
Parents: a949d55
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 1 15:44:20 2015 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 1 15:44:20 2015 -0700
----------------------------------------------------------------------
.../internal/services/SaxTemplateParser.java | 2 ++
.../services/TemplateParserImplTest.java | 22 ++++++++++++++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2619a327/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
index 3deaa8d..62f84d6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SaxTemplateParser.java
@@ -634,6 +634,8 @@ public class SaxTemplateParser
// parse is aborted, leaving
// tokens with just tokens defined inside <t:content>.
+ processTextBuffer(newState);
+
active = false;
break;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2619a327/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
index 0b3e915..b00215a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
@@ -1058,4 +1058,26 @@ public class TemplateParserImplTest extends InternalBaseTestCase
return builder.toString();
}
+
+ @Test
+ public void text_from_content_not_dropped() {
+ List<TemplateToken> tokens = tokens("content-TAP5-2109.tml");
+
+ System.out.println(tokens);
+
+ assertEquals(tokens.size(), 4);
+
+ TextToken t0 = get(tokens, 0);
+
+ assertEquals(t0.text.trim(), "BEGIN");
+
+ StartComponentToken t1 = get(tokens, 1);
+ assertEquals(t1.getComponentType(), "somecomponent");
+
+ EndElementToken t2 = get(tokens, 2);
+
+ TextToken t3 = get(tokens, 3);
+
+ assertEquals(t3.text.trim(), "END");
+ }
}