Updated Branches: refs/heads/master 3ee4294f1 -> 6cefb9f89
WICKET-5400 Behaviors#internalAdd(Behavior) erroneously gets id for stateless behaviors Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6cefb9f8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6cefb9f8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6cefb9f8 Branch: refs/heads/master Commit: 6cefb9f89975ace7fc90ec663c4d92ac9af14dfd Parents: 3ee4294 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Nov 11 12:20:13 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Nov 11 12:21:21 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Behaviors.java | 2 +- .../behavior/ImmutableBehaviorIdsTest.java | 20 ++++++++++---------- .../html/basic/SimplePageExpectedResult_13.html | 2 +- .../markup/html/basic/SimplePageTest.java | 4 ---- .../spring/injection/annot/SpringBeanTest.java | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6cefb9f8/wicket-core/src/main/java/org/apache/wicket/Behaviors.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Behaviors.java b/wicket-core/src/main/java/org/apache/wicket/Behaviors.java index a743e8b..3d406f2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Behaviors.java +++ b/wicket-core/src/main/java/org/apache/wicket/Behaviors.java @@ -63,7 +63,7 @@ final class Behaviors implements IDetachable private void internalAdd(final Behavior behavior) { component.data_add(behavior); - if (behavior.getStatelessHint(component)) + if (behavior.getStatelessHint(component) == false) { getBehaviorId(behavior); } http://git-wip-us.apache.org/repos/asf/wicket/blob/6cefb9f8/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java index 0e0b52a..add6c97 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java @@ -64,15 +64,15 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase tester.startPage(page); String output = tester.getLastResponseAsString(); - // System.out.println(output); +// System.out.println(output); assertTrue(output.contains("class=\"border\"")); assertTrue(output.contains("autocomplete=\"off\"")); assertTrue(output.contains("class2=\"border\"")); assertTrue(output.contains("autocomplete2=\"off\"")); - assertTrue(output.contains("IBehaviorListener.4")); - assertTrue(output.contains("IBehaviorListener.5")); - assertEquals(link, page.getContainer().getBehaviorById(4)); - assertEquals(link2, page.getContainer().getBehaviorById(5)); + assertTrue(output.contains("IBehaviorListener.0")); + assertTrue(output.contains("IBehaviorListener.1")); + assertEquals(link, page.getContainer().getBehaviorById(0)); + assertEquals(link2, page.getContainer().getBehaviorById(1)); // if we remove a behavior that is before the ibehaviorlistener its url index should not @@ -84,11 +84,11 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase page.getContainer().remove(auto2); tester.startPage(page); output = tester.getLastResponseAsString(); - // System.out.println(output); - assertTrue(output.contains("IBehaviorListener.4")); - assertTrue(output.contains("IBehaviorListener.5")); - assertEquals(link, page.getContainer().getBehaviorById(4)); - assertEquals(link2, page.getContainer().getBehaviorById(5)); +// System.out.println(output); + assertTrue(output.contains("IBehaviorListener.0")); + assertTrue(output.contains("IBehaviorListener.1")); + assertEquals(link, page.getContainer().getBehaviorById(0)); + assertEquals(link2, page.getContainer().getBehaviorById(1)); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/6cefb9f8/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html index edd5525..d319037 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html @@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.Sim <script type="text/javascript" > /*<![CDATA[*/ Wicket.Event.add(window, "domready", function(event) { -Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.IBehaviorListener.1-html","e":"click","c":"html1"});; +Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.IBehaviorListener.0-html","e":"click","c":"html1"});; ;}); /*]]>*/ </script> http://git-wip-us.apache.org/repos/asf/wicket/blob/6cefb9f8/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java index 6f4398f..f9f0ffd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java @@ -24,8 +24,6 @@ import org.apache.wicket.markup.html.border.Border; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.util.value.ValueMap; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** @@ -36,8 +34,6 @@ import org.slf4j.LoggerFactory; */ public class SimplePageTest extends WicketTestCase { - private static final Logger log = LoggerFactory.getLogger(SimplePageTest.class); - /** * @throws Exception */ http://git-wip-us.apache.org/repos/asf/wicket/blob/6cefb9f8/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java index da4feef..663aa4c 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java @@ -138,7 +138,7 @@ public class SpringBeanTest extends Assert // with no name specified we get IllegalStateException Page page = tester.startPage(new AnnotatedFieldInBehaviorPage()); - TestBehavior behavior = (TestBehavior)page.getBehaviorById(0); + TestBehavior behavior = page.getBehaviors(TestBehavior.class).get(0); assertNotNull(behavior.getBean()); } } @@ -203,4 +203,4 @@ class AnnotatedFieldInBehaviorPage extends DummyHomePage { add(new TestBehavior()); } -} \ No newline at end of file +}
