Author: mgrigorov
Date: Sun Jul 18 10:38:17 2010
New Revision: 965209
URL: http://svn.apache.org/viewvc?rev=965209&view=rev
Log:
WICKET-2758 Patches for tests in trunk
Fix the URLs in threadtests to be 1.5 complaint
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java?rev=965209&r1=965208&r2=965209&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
Sun Jul 18 10:38:17 2010
@@ -42,13 +42,11 @@ public class App1Test1
{
List<String> gets = Arrays.asList(new String[] {
-
"/app1/?wicket:bookmarkablePage=:org.apache.wicket.threadtest.apps.app1.Home",
-
"/app1/?wicket:interface=:${iteration}:link::ILinkListener::",
-
"/app1/?wicket:interface=:${iteration}:link:1:ILinkListener::",
-
"/app1/?wicket:interface=:${iteration}:link:2:ILinkListener::" });
+
"/app1/wicket/bookmarkable/org.apache.wicket.threadtest.apps.app1.Home",
+
"/app1/wicket/page?0-${iteration}.ILinkListener-link" });
// you can turn this on if you e.g. want to attach to a profiler
- // Thread.sleep(5000);
+// Thread.sleep(5000);
WicketObjects.setObjectStreamFactory(new
WicketObjectStreamFactory());
SimpleGetCommand getCmd = new SimpleGetCommand(gets, 10);
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java?rev=965209&r1=965208&r2=965209&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
Sun Jul 18 10:38:17 2010
@@ -39,7 +39,7 @@ public class App1Test2
public static void main(String[] args) throws Exception
{
- List<String> gets = Arrays.asList(new String[] {
"/app1?wicket:bookmarkablePage=one:org.apache.wicket.threadtest.apps.app1.Home"
});
+ List<String> gets = Arrays.asList(new String[] {
"/app1/wicket/bookmarkable/org.apache.wicket.threadtest.apps.app1.Home" });
SimpleGetCommand getCmd = new SimpleGetCommand(gets, 5);
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java?rev=965209&r1=965208&r2=965209&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
Sun Jul 18 10:38:17 2010
@@ -41,11 +41,10 @@ public class App1Test3
{
List<String> gets = new ArrayList<String>();
-
gets.add("/app1?wicket:bookmarkablePage=one:org.apache.wicket.threadtest.apps.app1.ResourceTestPage");
+
gets.add("/app1/wicket/bookmarkable/org.apache.wicket.threadtest.apps.app1.ResourceTestPage");
for (int i = 0; i < ResourceTestPage.IMAGES_PER_PAGE; i++)
{
-
gets.add("/app1?wicket:interface=one:${iteration}:listView:" + i +
- ":image::IResourceListener::");
+
gets.add("/app1/wicket/page?0-IResourceListener-listView-${iteration}-image");
}
SimpleGetCommand getCmd = new SimpleGetCommand(gets, 5);
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java?rev=965209&r1=965208&r2=965209&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
Sun Jul 18 10:38:17 2010
@@ -39,7 +39,7 @@ public class App2Test1
public static void main(String[] args) throws Exception
{
- List<String> gets = Arrays.asList(new String[] {
"/app2?wicket:bookmarkablePage=one:org.apache.wicket.threadtest.apps.app2.Home"
});
+ List<String> gets = Arrays.asList(new String[] {
"/app2/wicket/bookmarkable/org.apache.wicket.threadtest.apps.app2.Home" });
SimpleGetCommand getCmd = new SimpleGetCommand(gets, 5);
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java?rev=965209&r1=965208&r2=965209&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
Sun Jul 18 10:38:17 2010
@@ -77,7 +77,7 @@ public class Home extends WebPage
public ActionPanel(String id, IModel<Contact> model)
{
super(id, model);
- add(new Link("select")
+ add(new Link<Void>("select")
{
private static final long serialVersionUID = 1L;
@@ -107,7 +107,7 @@ public class Home extends WebPage
{
super(name, new
CompoundPropertyModel<FormInputModel>(new FormInputModel()));
add(new LocaleDropDownChoice("localeSelect"));
- add(new Link("defaultLocaleLink")
+ add(new Link<Void>("defaultLocaleLink")
{
private static final long serialVersionUID = 1L;
@@ -222,7 +222,7 @@ public class Home extends WebPage
add(new Button("saveButton"));
- add(new Link("resetButtonLink")
+ add(new Link<Void>("resetButtonLink")
{
private static final long serialVersionUID = 1L;
@@ -351,7 +351,7 @@ public class Home extends WebPage
public Home()
{
- add(new Link("link")
+ add(new Link<Void>("link")
{
private static final long serialVersionUID = 1L;
int i = 0;
