This is an automated email from the ASF dual-hosted git repository. thiagohp pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit cb35c7e2c16963c4f0c8d9d79b1649fa9f1be7e2 Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br> AuthorDate: Fri Oct 25 16:24:55 2024 -0300 TAP5-2793: renaming test app1's Recursive to SelfRecursive --- tapestry-core/src/test/app1/Index.tml | 2 +- tapestry-core/src/test/app1/RecursiveDemo.tml | 5 ----- tapestry-core/src/test/app1/SelfRecursiveDemo.tml | 5 +++++ .../org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java | 6 +++--- .../app1/components/{Recursive.java => SelfRecursive.java} | 4 ++-- .../java/org/apache/tapestry5/integration/app1/pages/Index.java | 4 +++- .../app1/pages/{RecursiveDemo.java => SelfRecursiveDemo.java} | 4 ++-- .../app1/components/{Recursive.tml => SelfRecursive.tml} | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tapestry-core/src/test/app1/Index.tml b/tapestry-core/src/test/app1/Index.tml index 36a8fbf7c..e47d20d44 100644 --- a/tapestry-core/src/test/app1/Index.tml +++ b/tapestry-core/src/test/app1/Index.tml @@ -87,7 +87,7 @@ </li> <li> - <a href="recursivedemo">Recursive Demo</a> + <a href="recursivedemo">Self-Recursive Demo</a> -- check for handling of recursive components </li> diff --git a/tapestry-core/src/test/app1/RecursiveDemo.tml b/tapestry-core/src/test/app1/RecursiveDemo.tml deleted file mode 100644 index ff71df5ca..000000000 --- a/tapestry-core/src/test/app1/RecursiveDemo.tml +++ /dev/null @@ -1,5 +0,0 @@ -<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> - - This page contains a <t:recursive>Recursive component</t:recursive>, so it will never be able to render itself. - -</html> diff --git a/tapestry-core/src/test/app1/SelfRecursiveDemo.tml b/tapestry-core/src/test/app1/SelfRecursiveDemo.tml new file mode 100644 index 000000000..6433fe6b4 --- /dev/null +++ b/tapestry-core/src/test/app1/SelfRecursiveDemo.tml @@ -0,0 +1,5 @@ +<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> + + This page contains a <t:selfrecursive>Recursive component</t:selfrecursive>, so it will never be able to render itself. + +</html> diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java index e5f11d07d..b5734b110 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java @@ -542,12 +542,12 @@ public class CoreBehaviorsTests extends App1TestCase @Test public void recursive_components_are_identified_as_errors() { - openLinks("Recursive Demo"); + openLinks("Self-Recursive Demo"); assertTextPresent( EXCEPTION_PROCESSING_REQUEST, - "The template for component org.apache.tapestry5.integration.app1.components.Recursive is recursive (contains another direct or indirect reference to component org.apache.tapestry5.integration.app1.components.Recursive). This is not supported (components may not contain themselves).", - "component is <t:recursive>recursive</t:recursive>, so we\'ll see a failure."); + "The template for component org.apache.tapestry5.integration.app1.components.SelfRecursive is recursive (contains another direct or indirect reference to component org.apache.tapestry5.integration.app1.components.SelfRecursive). This is not supported (components may not contain themselves).", + "component is <t:SelfRecursive>recursive</t:SelfRecursive>, so we\'ll see a failure."); } @Test diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Recursive.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SelfRecursive.java similarity index 88% rename from tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Recursive.java rename to tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SelfRecursive.java index 9df84ca3c..f61cbcf0b 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Recursive.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SelfRecursive.java @@ -1,4 +1,4 @@ -// Copyright 2007 The Apache Software Foundation +// Copyright 2007, 2024 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ package org.apache.tapestry5.integration.app1.components; -public class Recursive +public class SelfRecursive { } diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java index 8566ff258..75328a876 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java @@ -625,7 +625,9 @@ public class Index new Item("ObjectEditorDemo","Object Editor Demo","Edit Bean with address objects"), - new Item("IfDemo","If Demo","If component with all its options") + new Item("IfDemo","If Demo","If component with all its options"), + + new Item("SelfRecursiveDemo", "Self-Recursive Demo", "check for handling of self-recursive components") ); static diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RecursiveDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelfRecursiveDemo.java similarity index 87% rename from tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RecursiveDemo.java rename to tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelfRecursiveDemo.java index 30232a7e4..65e8d0722 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RecursiveDemo.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelfRecursiveDemo.java @@ -1,4 +1,4 @@ -// Copyright 2007 The Apache Software Foundation +// Copyright 2007, 2024 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ package org.apache.tapestry5.integration.app1.pages; -public class RecursiveDemo +public class SelfRecursiveDemo { } diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Recursive.tml b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/SelfRecursive.tml similarity index 54% rename from tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Recursive.tml rename to tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/SelfRecursive.tml index 9f6884582..18bfdce0d 100644 --- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Recursive.tml +++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/SelfRecursive.tml @@ -1,7 +1,7 @@ <div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"> <p> - This component is <t:recursive>recursive</t:recursive>, so we'll see a failure. + This component is <t:SelfRecursive>recursive</t:SelfRecursive>, so we'll see a failure. </p> <t:body/>