Repository: tapestry-5 Updated Branches: refs/heads/master 360f34498 -> adf7e8bd4
TAP5-901: apply tests from the patch, the original issue is already fixed Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/adf7e8bd Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/adf7e8bd Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/adf7e8bd Branch: refs/heads/master Commit: adf7e8bd488da8c1939e07eb596ddb0f656dd6fc Parents: 360f344 Author: Jochen Kemnade <jochen.kemn...@eddyson.de> Authored: Wed Aug 20 10:23:46 2014 +0200 Committer: Jochen Kemnade <jochen.kemn...@eddyson.de> Committed: Wed Aug 20 10:23:46 2014 +0200 ---------------------------------------------------------------------- .../integration/app2/base/ChildBasePage.java | 8 ++++++++ .../integration/app2/base/ParentBasePage.java | 5 +++++ .../app2/pages/OverrideAbstractMethods.java | 7 +++++++ .../pagelevel/OverrideMethodsTest.java | 21 ++++++++++++++++++++ .../app2/pages/OverrideAbstractMethods.tml | 4 ++++ 5 files changed, 45 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/adf7e8bd/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ChildBasePage.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ChildBasePage.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ChildBasePage.java new file mode 100644 index 0000000..44e9aff --- /dev/null +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ChildBasePage.java @@ -0,0 +1,8 @@ +package org.apache.tapestry5.integration.app2.base; + +public abstract class ChildBasePage extends ParentBasePage { + @Override + public String getObject() { + return "foobar"; + } +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/adf7e8bd/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ParentBasePage.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ParentBasePage.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ParentBasePage.java new file mode 100644 index 0000000..4030128 --- /dev/null +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/base/ParentBasePage.java @@ -0,0 +1,5 @@ +package org.apache.tapestry5.integration.app2.base; + +public abstract class ParentBasePage { + public abstract Object getObject(); +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/adf7e8bd/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.java new file mode 100644 index 0000000..bce4c12 --- /dev/null +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.java @@ -0,0 +1,7 @@ +package org.apache.tapestry5.integration.app2.pages; + +import org.apache.tapestry5.integration.app2.base.ChildBasePage; + +public class OverrideAbstractMethods extends ChildBasePage { + +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/adf7e8bd/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/OverrideMethodsTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/OverrideMethodsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/OverrideMethodsTest.java new file mode 100644 index 0000000..b612d1f --- /dev/null +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/OverrideMethodsTest.java @@ -0,0 +1,21 @@ +package org.apache.tapestry5.integration.pagelevel; + +import org.apache.tapestry5.dom.Document; +import org.apache.tapestry5.test.PageTester; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class OverrideMethodsTest extends Assert { + /** TAP5-901 */ + @Test + public void override_abstract_methods() { + PageTester tester = new PageTester(TestConstants.APP2_PACKAGE, TestConstants.APP2_NAME); + try { + Document doc = tester.renderPage("OverrideAbstractMethods"); + assertEquals("6", doc.getElementById("length").getChildMarkup()); + } finally { + tester.shutdown(); + } + } + +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/adf7e8bd/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.tml b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.tml new file mode 100644 index 0000000..a4965c7 --- /dev/null +++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app2/pages/OverrideAbstractMethods.tml @@ -0,0 +1,4 @@ +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> + <h1>Override Abstract Methods</h1> + <p id="length">${object.length()}</p> +</html> \ No newline at end of file