Author: ivaynberg
Date: Fri Jan 30 17:29:15 2009
New Revision: 739341
URL: http://svn.apache.org/viewvc?rev=739341&view=rev
Log:
WICKET-2057
Added:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPostprocessingCallDecoratorTest.java
(with props)
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPreprocessingCallDecoratorTest.java
(with props)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/AjaxPreprocessingCallDecorator.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/AjaxPreprocessingCallDecorator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/AjaxPreprocessingCallDecorator.java?rev=739341&r1=739340&r2=739341&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/AjaxPreprocessingCallDecorator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/AjaxPreprocessingCallDecorator.java
Fri Jan 30 17:29:15 2009
@@ -49,8 +49,9 @@
*/
public CharSequence decorateScript(CharSequence script)
{
- CharSequence s = (delegate == null) ? script :
delegate.decorateScript(script);
- return preDecorateScript(s);
+ CharSequence s = preDecorateScript(script);
+ return (delegate == null) ? s : delegate.decorateScript(s);
+
}
/**
@@ -58,8 +59,8 @@
*/
public CharSequence decorateOnSuccessScript(CharSequence script)
{
- CharSequence s = (delegate == null) ? script :
delegate.decorateOnSuccessScript(script);
- return preDecorateOnSuccessScript(s);
+ CharSequence s = preDecorateOnSuccessScript(script);
+ return (delegate == null) ? s :
delegate.decorateOnSuccessScript(s);
}
/**
@@ -67,8 +68,9 @@
*/
public CharSequence decorateOnFailureScript(CharSequence script)
{
- CharSequence s = (delegate == null) ? script :
delegate.decorateOnFailureScript(script);
- return preDecorateOnFailureScript(s);
+ CharSequence s = preDecorateOnFailureScript(script);
+
+ return (delegate == null) ? s :
delegate.decorateOnFailureScript(s);
}
Added:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPostprocessingCallDecoratorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPostprocessingCallDecoratorTest.java?rev=739341&view=auto
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPostprocessingCallDecoratorTest.java
(added)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPostprocessingCallDecoratorTest.java
Fri Jan 30 17:29:15 2009
@@ -0,0 +1,96 @@
+/*
+ * 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 junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.wicket.ajax.calldecorator.AjaxPostprocessingCallDecorator;
+
+/**
+ * @author tetsuo WICKET-2057
+ */
+public class AjaxPostprocessingCallDecoratorTest extends TestCase
+{
+ IAjaxCallDecorator delegate;
+ AjaxPostprocessingCallDecorator decorator;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ delegate = new IAjaxCallDecorator()
+ {
+ private static final long serialVersionUID = 1L;
+
+ public CharSequence decorateScript(CharSequence script)
+ {
+ return "^" + script;
+ }
+
+ public CharSequence
decorateOnSuccessScript(CharSequence script)
+ {
+ return "^s" + script;
+ }
+
+ public CharSequence
decorateOnFailureScript(CharSequence script)
+ {
+ return "^f" + script;
+ }
+ };
+ decorator = new AjaxPostprocessingCallDecorator(delegate)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public CharSequence postDecorateScript(CharSequence
script)
+ {
+ return "-" + super.postDecorateScript(script);
+ }
+
+ @Override
+ public CharSequence
postDecorateOnSuccessScript(CharSequence script)
+ {
+ return "-s" +
super.postDecorateOnSuccessScript(script);
+ }
+
+ @Override
+ public CharSequence
postDecorateOnFailureScript(CharSequence script)
+ {
+ return "-f" +
super.postDecorateOnFailureScript(script);
+ }
+ };
+ }
+
+ /** test script */
+ public void testDecorateScript()
+ {
+ Assert.assertEquals("-^.", decorator.decorateScript("."));
+ }
+
+ /** test script */
+ public void testDecorateOnSuccessScript()
+ {
+ Assert.assertEquals("-s^s.",
decorator.decorateOnSuccessScript("."));
+ }
+
+ /** test script */
+ public void testDecorateOnFailureScript()
+ {
+ Assert.assertEquals("-f^f.",
decorator.decorateOnFailureScript("."));
+ }
+}
Propchange:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPostprocessingCallDecoratorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPreprocessingCallDecoratorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPreprocessingCallDecoratorTest.java?rev=739341&view=auto
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPreprocessingCallDecoratorTest.java
(added)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPreprocessingCallDecoratorTest.java
Fri Jan 30 17:29:15 2009
@@ -0,0 +1,96 @@
+/*
+ * 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 junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.wicket.ajax.calldecorator.AjaxPreprocessingCallDecorator;
+
+/**
+ * @author tetsuo WICKET-2057
+ */
+public class AjaxPreprocessingCallDecoratorTest extends TestCase
+{
+ IAjaxCallDecorator delegate;
+ AjaxPreprocessingCallDecorator decorator;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ delegate = new IAjaxCallDecorator()
+ {
+ private static final long serialVersionUID = 1L;
+
+ public CharSequence decorateScript(CharSequence script)
+ {
+ return "^" + script;
+ }
+
+ public CharSequence
decorateOnSuccessScript(CharSequence script)
+ {
+ return "^s" + script;
+ }
+
+ public CharSequence
decorateOnFailureScript(CharSequence script)
+ {
+ return "^f" + script;
+ }
+ };
+ decorator = new AjaxPreprocessingCallDecorator(delegate)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public CharSequence preDecorateScript(CharSequence
script)
+ {
+ return "-" + super.preDecorateScript(script);
+ }
+
+ @Override
+ public CharSequence
preDecorateOnSuccessScript(CharSequence script)
+ {
+ return "-s" +
super.preDecorateOnSuccessScript(script);
+ }
+
+ @Override
+ public CharSequence
preDecorateOnFailureScript(CharSequence script)
+ {
+ return "-f" +
super.preDecorateOnFailureScript(script);
+ }
+ };
+ }
+
+ /** test decorator */
+ public void testDecorateScript()
+ {
+ Assert.assertEquals("^-.", decorator.decorateScript("."));
+ }
+
+ /** test decorator */
+ public void testDecorateOnSuccessScript()
+ {
+ Assert.assertEquals("^s-s.",
decorator.decorateOnSuccessScript("."));
+ }
+
+ /** test decorator */
+ public void testDecorateOnFailureScript()
+ {
+ Assert.assertEquals("^f-f.",
decorator.decorateOnFailureScript("."));
+ }
+}
Propchange:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxPreprocessingCallDecoratorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
