You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/09/04 11:24:25 UTC
git commit: WICKET-4748 Improve WicketTester to be able to find
AjaxBehaviors on second/third/... event name
Updated Branches:
refs/heads/master 9d7cb148c -> 9ff46e183
WICKET-4748 Improve WicketTester to be able to find AjaxBehaviors on second/third/... event name
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9ff46e18
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9ff46e18
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9ff46e18
Branch: refs/heads/master
Commit: 9ff46e183a344cec599a5299b512706021b58d3c
Parents: 9d7cb14
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Sep 4 11:23:54 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Sep 4 11:23:54 2012 +0200
----------------------------------------------------------------------
.../wicket/util/tester/WicketTesterHelper.java | 16 ++-
.../apache/wicket/ajax/AjaxEventBehaviorTest.java | 93 +++++++++++++++
2 files changed, 103 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9ff46e18/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
index 1d8fc72..daa731b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
@@ -180,13 +180,17 @@ public class WicketTesterHelper
if (behavior instanceof AjaxEventBehavior)
{
String behaviorEvent = ((AjaxEventBehavior)behavior).getEvent();
- if (behaviorEvent.startsWith("on"))
+ String[] eventNames = Strings.split(behaviorEvent, ' ');
+ for (String eventName : eventNames)
{
- behaviorEvent = behaviorEvent.substring(2);
- }
- if (event.equalsIgnoreCase(behaviorEvent))
- {
- return (AjaxEventBehavior)behavior;
+ if (eventName.startsWith("on"))
+ {
+ eventName = eventName.substring(2);
+ }
+ if (event.equalsIgnoreCase(eventName))
+ {
+ return (AjaxEventBehavior)behavior;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/9ff46e18/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java
new file mode 100644
index 0000000..5c6a2c1
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.ajax;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.markup.IMarkupResourceStreamProvider;
+import org.apache.wicket.markup.html.WebComponent;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
+import org.junit.Test;
+
+/**
+ * @since 6.0.1
+ */
+public class AjaxEventBehaviorTest extends WicketTestCase
+{
+ /**
+ * Tests execution of the second configured event
+ * https://issues.apache.org/jira/browse/WICKET-4748
+ */
+ @Test
+ public void executeSecondEvent()
+ {
+ AtomicInteger counter = new AtomicInteger(0);
+ SecondEventTestPage page = new SecondEventTestPage(counter);
+ tester.startPage(page);
+
+ assertEquals(0, counter.get());
+
+ // execute the first event (without the leading 'on')
+ tester.executeAjaxEvent("comp", "eventOne");
+ assertEquals(1, counter.get());
+
+ // execute the first event (with the leading 'on')
+ tester.executeAjaxEvent("comp", "oneventOne");
+ assertEquals(2, counter.get());
+
+ // execute the second event (without the leading 'on')
+ tester.executeAjaxEvent("comp", "eventTwo");
+ assertEquals(3, counter.get());
+
+ // execute the second event (with the leading 'on')
+ tester.executeAjaxEvent("comp", "oneventTwo");
+ assertEquals(4, counter.get());
+ }
+
+ /**
+ * Test page for #executeSecondEvent()
+ */
+ private static class SecondEventTestPage extends WebPage implements IMarkupResourceStreamProvider
+ {
+ private SecondEventTestPage(final AtomicInteger counter)
+ {
+ WebComponent comp = new WebComponent("comp");
+ add(comp);
+
+ // register a behavior that listens on two events and the
+ // tested one also has a prefix 'on'
+ comp.add(new AjaxEventBehavior("eventOne oneventTwo")
+ {
+ @Override
+ protected void onEvent(AjaxRequestTarget target)
+ {
+ counter.incrementAndGet();
+ }
+ });
+ }
+
+ @Override
+ public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
+ {
+ return new StringResourceStream("<html><body><span wicket:id='comp'></span></body></html>");
+ }
+ }
+}