Author: ivaynberg
Date: Fri Feb 12 06:38:45 2010
New Revision: 909259
URL: http://svn.apache.org/viewvc?rev=909259&view=rev
Log:
cleanup
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DatabaseLocator.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/RepeaterApplication.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=909259&r1=909258&r2=909259&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Fri Feb 12 06:38:45 2010
@@ -19,7 +19,6 @@
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IInitializer;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.IBehavior;
@@ -29,6 +28,8 @@
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,11 +69,11 @@
}
}
- private static final ResourceReference JS = new
ResourceReference(UploadProgressBar.class,
- "progressbar.js");
+ private static final ResourceReference JS = new
PackageResourceReference(
+ UploadProgressBar.class, "progressbar.js");
- private static final ResourceReference CSS = new
ResourceReference(UploadProgressBar.class,
- "UploadProgressBar.css");
+ private static final ResourceReference CSS = new
PackageResourceReference(
+ UploadProgressBar.class, "UploadProgressBar.css");
private static final String RESOURCE_NAME =
UploadProgressBar.class.getName();
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java?rev=909259&r1=909258&r2=909259&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/WicketTestCase.java
Fri Feb 12 06:38:45 2010
@@ -19,6 +19,7 @@
import junit.framework.TestCase;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -33,42 +34,19 @@
/** */
public WicketTester tester;
- /**
- * Constructor
- */
- public WicketTestCase()
- {
- }
-
- /**
- * Create the test.
- *
- * @param name
- * The test name
- */
- public WicketTestCase(String name)
- {
- super(name);
- }
-
- /**
- * @see junit.framework.TestCase#setUp()
- */
@Override
protected void setUp() throws Exception
{
tester = new WicketTester();
}
- /**
- * @see junit.framework.TestCase#tearDown()
- */
@Override
protected void tearDown() throws Exception
{
tester.destroy();
}
+
/**
* Use <code>-Dwicket.replace.expected.results=true</code> to
automatically replace the expected
* output file.
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java?rev=909259&r1=909258&r2=909259&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
Fri Feb 12 06:38:45 2010
@@ -16,18 +16,16 @@
*/
package org.apache.wicket.extensions.markup.html;
-import junit.framework.TestCase;
-
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanelTester;
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.WicketTester;
/**
*
@@ -36,7 +34,7 @@
* @author Antony Stubbs
*/
-public class AjaxLazyLoadPanelTesterTest extends TestCase
+public class AjaxLazyLoadPanelTesterTest extends WicketTestCase
{
private MarkupContainer ajaxLazyLoadPanel;
@@ -45,7 +43,6 @@
*/
public void test()
{
- WicketTester wt = new WicketTester();
final Page dummyPanelPage = new DummyPanelPage(new
TestPanelSource()
{
private static final long serialVersionUID = 1L;
@@ -67,13 +64,13 @@
}
});
- wt.startPage(dummyPanelPage);
- wt.assertLabel("panel:content",
+ tester.startPage(dummyPanelPage);
+ tester.assertLabel("panel:content",
"<img
src=\"resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/indicator.gif\"/>");
- AjaxLazyLoadPanelTester.executeAjaxLazyLoadPanel(wt,
dummyPanelPage);
- wt.debugComponentTrees();
- wt.assertLabel("panel:content", "lazy panel test");
- String doc = wt.getServletResponse().getDocument();
+ AjaxLazyLoadPanelTester.executeAjaxLazyLoadPanel(tester,
dummyPanelPage);
+ tester.debugComponentTrees();
+ tester.assertLabel("panel:content", "lazy panel test");
+ String doc = tester.getLastResponseAsString();
assertNotNull(doc);
}
}
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java?rev=909259&r1=909258&r2=909259&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
Fri Feb 12 06:38:45 2010
@@ -16,17 +16,15 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.table;
-import junit.framework.TestCase;
-
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.diff.DiffUtil;
-import org.apache.wicket.util.tester.WicketTester;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
*/
-public class DataTableTest extends TestCase
+public class DataTableTest extends WicketTestCase
{
/** Log for reporting. */
private static final Logger log =
LoggerFactory.getLogger(DataTableTest.class);
@@ -36,11 +34,10 @@
*/
public void test_1() throws Exception
{
- WicketTester tester = new WicketTester(new
RepeaterApplication());
tester.startPage(DataTablePage.class);
tester.assertRenderedPage(DataTablePage.class);
- String document = tester.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
int index = document.indexOf("<thead");
assertTrue("Expected at least on <thead>", index != -1);
index = document.indexOf("<thead", index + 1);
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DatabaseLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DatabaseLocator.java?rev=909259&r1=909258&r2=909259&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DatabaseLocator.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DatabaseLocator.java
Fri Feb 12 06:38:45 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.table;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Application;
/**
* service locator class for contacts database
@@ -31,7 +31,7 @@
*/
public static ContactsDatabase getDatabase()
{
- RepeaterApplication app =
(RepeaterApplication)RequestCycle.get().getApplication();
+ RepeaterApplication app =
(RepeaterApplication)Application.get();
return app.getContactsDB();
}
}
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/RepeaterApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/RepeaterApplication.java?rev=909259&r1=909258&r2=909259&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/RepeaterApplication.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/RepeaterApplication.java
Fri Feb 12 06:38:45 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.markup.html.repeater.data.table;
import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.ServerAndClientTimeFilter;
import org.apache.wicket.protocol.http.WebApplication;
/**
@@ -43,8 +42,8 @@
@Override
protected void init()
{
- getDebugSettings().setDevelopmentUtilitiesEnabled(true);
- getRequestCycleSettings().addResponseFilter(new
ServerAndClientTimeFilter());
+ // getDebugSettings().setDevelopmentUtilitiesEnabled(true);
+ // getRequestCycleSettings().addResponseFilter(new
ServerAndClientTimeFilter());
}
/**
