Author: mgrigorov
Date: Sun Feb 27 09:40:07 2011
New Revision: 1075012
URL: http://svn.apache.org/viewvc?rev=1075012&view=rev
Log:
WICKET-3479 Interface TestPanelSource isn't named correctly
Introduce ITestPageSource.
Make TestPanelSource just extending the new one and empty. Mark it as
deprecated. It is removed completely in Wicket 1.5.
Added:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/TestPanelSource.java
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java?rev=1075012&r1=1075011&r2=1075012&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
Sun Feb 27 09:40:07 2011
@@ -26,7 +26,7 @@ import org.apache.wicket.extensions.ajax
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.tester.DummyPanelPage;
-import org.apache.wicket.util.tester.TestPanelSource;
+import org.apache.wicket.util.tester.ITestPanelSource;
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -46,7 +46,7 @@ public class AjaxLazyLoadPanelTesterTest
public void test()
{
WicketTester wt = new WicketTester();
- final Page dummyPanelPage = new DummyPanelPage(new
TestPanelSource()
+ final Page dummyPanelPage = new DummyPanelPage(new
ITestPanelSource()
{
private static final long serialVersionUID = 1L;
@@ -68,7 +68,8 @@ public class AjaxLazyLoadPanelTesterTest
});
wt.startPage(dummyPanelPage);
- wt.assertLabel("panel:content",
+ wt.assertLabel(
+ "panel:content",
"<img alt=\"Loading...\"
src=\"resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/indicator.gif\"/>");
AjaxLazyLoadPanelTester.executeAjaxLazyLoadPanel(wt,
dummyPanelPage);
wt.debugComponentTrees();
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1075012&r1=1075011&r2=1075012&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Sun Feb 27 09:40:07 2011
@@ -371,7 +371,7 @@ public class BaseWicketTester extends Mo
* a <code>Panel</code> factory that creates test
<code>Panel</code> instances
* @return a rendered <code>Panel</code>
*/
- public final Panel startPanel(final TestPanelSource testPanelSource)
+ public final Panel startPanel(final ITestPanelSource testPanelSource)
{
return (Panel)startPage(new ITestPageSource()
{
@@ -401,7 +401,7 @@ public class BaseWicketTester extends Mo
public Page getTestPage()
{
- return new DummyPanelPage(new TestPanelSource()
+ return new DummyPanelPage(new ITestPanelSource()
{
private static final long
serialVersionUID = 1L;
@@ -826,7 +826,7 @@ public class BaseWicketTester extends Mo
notNull(failMessage, ajaxFormSubmitBehavior);
setupAjaxSubmitRequestParameters(linkComponent,
ajaxFormSubmitBehavior);
-
+
WebRequestCycle requestCycle =
setupRequestAndResponse(true);
// Ok, finally we "click" the link
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java?rev=1075012&r1=1075011&r2=1075012&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java
Sun Feb 27 09:40:07 2011
@@ -37,7 +37,7 @@ public class DummyPanelPage extends WebP
* @param testPanelSource
* a <code>TestPanelSource</code>
*/
- public DummyPanelPage(final TestPanelSource testPanelSource)
+ public DummyPanelPage(final ITestPanelSource testPanelSource)
{
add(testPanelSource.getTestPanel(TEST_PANEL_ID));
}
Added:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java?rev=1075012&view=auto
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
(added)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
Sun Feb 27 09:40:07 2011
@@ -0,0 +1,39 @@
+/*
+ * 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.util.tester;
+
+import org.apache.wicket.IClusterable;
+import org.apache.wicket.markup.html.panel.Panel;
+
+/**
+ * A test <code>Panel</code> factory for <code>WicketTester</code>.
+ *
+ * @author Ingram Chen
+ * @since 1.2.6
+ */
+public interface ITestPanelSource extends IClusterable
+{
+ /**
+ * Defines a <code>Panel</code> instance source for
<code>WicketTester</code>.
+ *
+ * @param panelId
+ * <code>Component</code> id of the test <code>Panel</code>
+ * @return test <code>Panel</code> instance -- note that the test
<code>Panel</code>'s
+ * <code>Component</code> id must use the given
<code>panelId</code>.
+ */
+ Panel getTestPanel(final String panelId);
+}
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/TestPanelSource.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/TestPanelSource.java?rev=1075012&r1=1075011&r2=1075012&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/TestPanelSource.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/TestPanelSource.java
Sun Feb 27 09:40:07 2011
@@ -16,24 +16,16 @@
*/
package org.apache.wicket.util.tester;
-import org.apache.wicket.IClusterable;
-import org.apache.wicket.markup.html.panel.Panel;
/**
* A test <code>Panel</code> factory for <code>WicketTester</code>.
*
* @author Ingram Chen
* @since 1.2.6
+ * @deprecated
+ * @see ITestPanelSource
*/
-public interface TestPanelSource extends IClusterable
+@Deprecated
+public interface TestPanelSource extends ITestPanelSource
{
- /**
- * Defines a <code>Panel</code> instance source for
<code>WicketTester</code>.
- *
- * @param panelId
- * <code>Component</code> id of the test <code>Panel</code>
- * @return test <code>Panel</code> instance -- note that the test
<code>Panel</code>'s
- * <code>Component</code> id must use the given
<code>panelId</code>.
- */
- Panel getTestPanel(final String panelId);
}
