You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/09/16 01:48:06 UTC

svn commit: r997543 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/util/io/ main/java/org/apache/wicket/util/tester/ test/java/org/apache/wicket/ test/java/org/apache/wicket/markup/html/basic/ test/java/org/apache/wicket/markup/html/interna...

Author: pete
Date: Wed Sep 15 23:48:05 2010
New Revision: 997543

URL: http://svn.apache.org/viewvc?rev=997543&view=rev
Log:
cleanup, leverage java 1.5, replace deprecated methods

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
    wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java Wed Sep 15 23:48:05 2010
@@ -25,8 +25,6 @@ import java.io.Serializable;
 import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.wicket.util.lang.Generics;
@@ -199,7 +197,7 @@ public final class WicketObjectOutputStr
 			{
 				mapBytes = Generics.newHashMap(4);
 			}
-			mapBytes.put(name, new Byte(val));
+			mapBytes.put(name, val);
 		}
 
 		/**
@@ -212,7 +210,7 @@ public final class WicketObjectOutputStr
 			{
 				mapChar = Generics.newHashMap(4);
 			}
-			mapChar.put(name, new Character(val));
+			mapChar.put(name, val);
 		}
 
 		/**
@@ -225,7 +223,7 @@ public final class WicketObjectOutputStr
 			{
 				mapDouble = Generics.newHashMap(4);
 			}
-			mapDouble.put(name, new Double(val));
+			mapDouble.put(name, val);
 		}
 
 		/**
@@ -238,7 +236,7 @@ public final class WicketObjectOutputStr
 			{
 				mapFloat = Generics.newHashMap(4);
 			}
-			mapFloat.put(name, new Float(val));
+			mapFloat.put(name, val);
 		}
 
 		/**
@@ -251,7 +249,7 @@ public final class WicketObjectOutputStr
 			{
 				mapInt = Generics.newHashMap(4);
 			}
-			mapInt.put(name, new Integer(val));
+			mapInt.put(name, val);
 		}
 
 		/**
@@ -264,7 +262,7 @@ public final class WicketObjectOutputStr
 			{
 				mapLong = Generics.newHashMap(4);
 			}
-			mapLong.put(name, new Long(val));
+			mapLong.put(name, val);
 		}
 
 		/**
@@ -290,7 +288,7 @@ public final class WicketObjectOutputStr
 			{
 				mapShort = Generics.newHashMap(4);
 			}
-			mapShort.put(name, new Short(val));
+			mapShort.put(name, val);
 		}
 
 		/**
@@ -308,10 +306,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(boolean.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapBoolean.size());
-				Iterator<Entry<String, Boolean>> it = mapBoolean.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Boolean> entry : mapBoolean.entrySet())
 				{
-					Map.Entry<String, Boolean> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeBoolean((entry.getValue()).booleanValue());
@@ -322,10 +318,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(byte.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapBytes.size());
-				Iterator<Entry<String, Byte>> it = mapBytes.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Byte> entry : mapBytes.entrySet())
 				{
-					Entry<String, Byte> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeByte((entry.getValue()).byteValue());
@@ -336,10 +330,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(short.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapShort.size());
-				Iterator<Entry<String, Short>> it = mapShort.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Short> entry : mapShort.entrySet())
 				{
-					Entry<String, Short> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeShort((entry.getValue()).shortValue());
@@ -350,10 +342,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(char.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapChar.size());
-				Iterator<Entry<String, Character>> it = mapChar.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Character> entry : mapChar.entrySet())
 				{
-					Entry<String, Character> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeChar((entry.getValue()).charValue());
@@ -364,10 +354,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(int.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapInt.size());
-				Iterator<Entry<String, Integer>> it = mapInt.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Integer> entry : mapInt.entrySet())
 				{
-					Entry<String, Integer> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeInt((entry.getValue()).intValue());
@@ -378,10 +366,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(long.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapLong.size());
-				Iterator<Entry<String, Long>> it = mapLong.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Long> entry : mapLong.entrySet())
 				{
-					Entry<String, Long> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeLong((entry.getValue()).longValue());
@@ -392,10 +378,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(float.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapFloat.size());
-				Iterator<Entry<String, Float>> it = mapFloat.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Float> entry : mapFloat.entrySet())
 				{
-					Entry<String, Float> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeFloat((entry.getValue()).floatValue());
@@ -406,10 +390,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(double.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapDouble.size());
-				Iterator<Entry<String, Double>> it = mapDouble.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Double> entry : mapDouble.entrySet())
 				{
-					Entry<String, Double> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeDouble((entry.getValue()).doubleValue());
@@ -420,10 +402,8 @@ public final class WicketObjectOutputStr
 				ClassStreamHandler lookup = ClassStreamHandler.lookup(Serializable.class);
 				writeShort(lookup.getClassId());
 				writeShort(mapObject.size());
-				Iterator<Entry<String, Object>> it = mapObject.entrySet().iterator();
-				while (it.hasNext())
+				for (Entry<String, Object> entry : mapObject.entrySet())
 				{
-					Entry<String, Object> entry = it.next();
 					// write the key.
 					writeObjectOverride(entry.getKey());
 					writeObjectOverride(entry.getValue());

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Wed Sep 15 23:48:05 2010
@@ -19,7 +19,6 @@ package org.apache.wicket.util.tester;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import junit.framework.Assert;
@@ -198,9 +197,8 @@ public class WicketTester extends BaseWi
 	 * @param path
 	 *            the absolute path on disk to the web application's contents (e.g. war root) - may
 	 *            be <code>null</code>
-	 * 
-	 * @see org.apache.wicket.protocol.http.MockWebApplication#MockWebApplication(org.apache.wicket.protocol.http.WebApplication,
-	 *      String)
+	 *
+	 * @see org.apache.wicket.mock.MockApplication#MockApplication()
 	 */
 	public WicketTester(final WebApplication application, final String path)
 	{
@@ -247,7 +245,7 @@ public class WicketTester extends BaseWi
 
 	/**
 	 * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
-	 * {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
+	 * {@link AjaxRequestTarget#addComponent(Component...)}. This method actually tests that a
 	 * <code>Component</code> is on the Ajax response sent back to the client.
 	 * <p>
 	 * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
@@ -265,7 +263,7 @@ public class WicketTester extends BaseWi
 
 	/**
 	 * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
-	 * {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
+	 * {@link AjaxRequestTarget#addComponent(Component...)}. This method actually tests that a
 	 * <code>Component</code> is on the Ajax response sent back to the client.
 	 * <p>
 	 * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
@@ -301,9 +299,9 @@ public class WicketTester extends BaseWi
 	{
 		List<Serializable> actualMessages = getMessages(FeedbackMessage.ERROR);
 		List<Serializable> msgs = new ArrayList<Serializable>();
-		for (Iterator<Serializable> iterator = actualMessages.iterator(); iterator.hasNext();)
+		for (Serializable actualMessage : actualMessages)
 		{
-			msgs.add(iterator.next().toString());
+			msgs.add(actualMessage.toString());
 		}
 		WicketTesterHelper.assertEquals(Arrays.asList(expectedErrorMessages), msgs);
 	}
@@ -507,9 +505,9 @@ public class WicketTester extends BaseWi
 	 * @param parameters
 	 */
 	public void assertBookmarkablePageLink(final String id,
-		final Class<? extends WebPage> pageClass, final String parameters)
+		final Class<? extends WebPage> pageClass, final PageParameters parameters)
 	{
-		BookmarkablePageLink<?> pageLink = null;
+		BookmarkablePageLink<?> pageLink;
 		try
 		{
 			pageLink = (BookmarkablePageLink<?>)getComponentFromLastRenderedPage(id);
@@ -525,7 +523,7 @@ public class WicketTester extends BaseWi
 
 		Assert.assertEquals(
 			"One or more of the parameters associated with the BookmarkablePageLink: " + id +
-				" do not match", new PageParameters(parameters), pageLink.getPageParameters());
+				" do not match", parameters, pageLink.getPageParameters());
 	}
 
 	/**
@@ -552,13 +550,12 @@ public class WicketTester extends BaseWi
 	 * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
 	 * output file.
 	 * 
-	 * @param <T>
 	 * @param testClass
 	 * @param page
 	 * @param filename
 	 * @throws Exception
 	 */
-	public <T extends Page> void executeTest(final Class<?> testClass, final Page page,
+	public void executeTest(final Class<?> testClass, final Page page,
 		final String filename) throws Exception
 	{
 		log.info("=== " + page.getClass().getName() + " ===");

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java Wed Sep 15 23:48:05 2010
@@ -47,13 +47,13 @@ public class SharedResourceUrlTest exten
 	{
 		ResourceReference rr = new SharedResourceReference("test");
 		CharSequence url = tester.getRequestCycle()
-			.mapUrlFor(rr, new PageParameters("param=value", ""))
+			.mapUrlFor(rr, new PageParameters().set("param", "value"))
 			.toString();
 		assertEquals("wicket/resource/org.apache.wicket.Application/test?param=value", url);
 
 		rr = new PackageResourceReference(SharedResourceUrlTest.class, "test");
 		url = tester.getRequestCycle()
-			.mapUrlFor(rr, new PageParameters("param=value", ""))
+			.mapUrlFor(rr, new PageParameters().set("param", "value"))
 			.toString();
 		assertEquals("wicket/resource/org.apache.wicket.SharedResourceUrlTest/test?param=value",
 			url);

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Wed Sep 15 23:48:05 2010
@@ -88,13 +88,11 @@ public abstract class WicketTestCase ext
 	 * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
 	 * output file.
 	 * 
-	 * @param <T>
-	 * 
 	 * @param page
 	 * @param filename
 	 * @throws Exception
 	 */
-	protected <T extends Page> void executeTest(final Page page, final String filename)
+	protected void executeTest(final Page page, final String filename)
 		throws Exception
 	{
 		tester.executeTest(getClass(), page, filename);
@@ -119,7 +117,6 @@ public abstract class WicketTestCase ext
 
 	/**
 	 * 
-	 * @param clazz
 	 * @param component
 	 * @param filename
 	 * @throws Exception
@@ -132,7 +129,6 @@ public abstract class WicketTestCase ext
 
 	/**
 	 * 
-	 * @param clazz
 	 * @param behavior
 	 * @param filename
 	 * @throws Exception

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java Wed Sep 15 23:48:05 2010
@@ -41,7 +41,7 @@ public class SimpleResponsePageClass ext
 			protected void onSubmit()
 			{
 				// use Page "class"
-				setResponsePage(SimplePage.class, new PageParameters("test=test"));
+				setResponsePage(SimplePage.class, new PageParameters().set("test", "test"));
 			}
 		};
 		add(form);

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java Wed Sep 15 23:48:05 2010
@@ -61,7 +61,7 @@ public class EnclosureTest extends Wicke
 	 */
 	public void testRenderHomePage4() throws Exception
 	{
-		executeTest(EnclosurePage_4.class, new PageParameters("visible=false"),
+		executeTest(EnclosurePage_4.class, new PageParameters().set("visible", false),
 			"EnclosurePageExpectedResult_4.html");
 	}
 
@@ -70,7 +70,7 @@ public class EnclosureTest extends Wicke
 	 */
 	public void testRenderHomePage4_1() throws Exception
 	{
-		executeTest(EnclosurePage_4.class, new PageParameters("visible=true"),
+		executeTest(EnclosurePage_4.class, new PageParameters().set("visible", true),
 			"EnclosurePageExpectedResult_4-1.html");
 	}
 
@@ -79,7 +79,7 @@ public class EnclosureTest extends Wicke
 	 */
 	public void testRenderHomePage5() throws Exception
 	{
-		executeTest(EnclosurePage_5.class, new PageParameters("visible=false"),
+		executeTest(EnclosurePage_5.class, new PageParameters().set("visible", false),
 			"EnclosurePageExpectedResult_5.html");
 	}
 
@@ -88,7 +88,7 @@ public class EnclosureTest extends Wicke
 	 */
 	public void testRenderHomePage5_1() throws Exception
 	{
-		executeTest(EnclosurePage_5.class, new PageParameters("visible=true"),
+		executeTest(EnclosurePage_5.class, new PageParameters().set("visible", true),
 			"EnclosurePageExpectedResult_5-1.html");
 	}
 
@@ -161,8 +161,6 @@ public class EnclosureTest extends Wicke
 	 */
 	public void testRender9() throws Exception
 	{
-		Class<? extends Page> clazz = EnclosurePage_9.class;
-
 		executePage(new EnclosurePage_9(), "EnclosurePageExpectedResult_9.html");
 		EnclosurePage_9 page = (EnclosurePage_9)tester.getLastRenderedPage();
 		assertTrue(page.inputOnBeforeRender);

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java Wed Sep 15 23:48:05 2010
@@ -37,7 +37,7 @@ public class BookmarkableHomePageLinksPa
 		Class<? extends Page> homePage = Application.get().getHomePage();
 		add(new BookmarkablePageLink<Void>("defaulthompage", homePage));
 		add(new BookmarkablePageLink<Void>("defaulthompagewithparams", homePage,
-			new PageParameters("param1=1,param2=test")));
+			new PageParameters().set("param1",1).set("param2", "test")));
 		add(new BookmarkablePageLink<Void>("defaulthompagewithpagemap", homePage));
 	}
 

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java Wed Sep 15 23:48:05 2010
@@ -37,7 +37,7 @@ public class AbortExceptionTest extends 
 	 */
 	public void testNoAbort()
 	{
-		tester.startPage(AbortExceptionPage.class, new PageParameters("trigger=false"));
+		tester.startPage(AbortExceptionPage.class, new PageParameters().set("trigger", false));
 		Assert.assertEquals((Integer)1234, tester.getLastResponse().getStatus());
 	}
 
@@ -48,7 +48,7 @@ public class AbortExceptionTest extends 
 	{
 		try
 		{
-			tester.startPage(AbortExceptionPage.class, new PageParameters("trigger=true"));
+			tester.startPage(AbortExceptionPage.class, new PageParameters().set("trigger", true));
 			Assert.assertEquals((Integer)1234, tester.getLastResponse().getStatus()); // this will
 			// fail
 		}

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java Wed Sep 15 23:48:05 2010
@@ -58,7 +58,7 @@ public class RequestEncodingTest extends
 	 */
 	public void testDefault()
 	{
-		tester.startPage(A.class, new PageParameters("file=umlaut-\u00E4-\u00F6-\u00FC"));
+		tester.startPage(A.class, new PageParameters().set("file", "umlaut-\u00E4-\u00F6-\u00FC"));
 		tester.assertRenderedPage(B.class);
 
 		String url2 = ((B)tester.getLastRenderedPage()).getInterceptContinuationURL();

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java Wed Sep 15 23:48:05 2010
@@ -177,7 +177,7 @@ public class FormTesterTest extends Wick
 		formTester.submit();
 		assertNull(page.getFileUpload());
 
-		tester.assertErrorMessages(new String[] { "Field 'file' is required." });
+		tester.assertErrorMessages("Field 'file' is required.");
 	}
 
 	/**
@@ -185,7 +185,7 @@ public class FormTesterTest extends Wick
 	 */
 	public void testSubmitMultipartForm()
 	{
-		tester.startPage(MockFormFileUploadPage.class, new PageParameters("required=false"));
+		tester.startPage(MockFormFileUploadPage.class, new PageParameters().set("required" , false));
 		MockFormFileUploadPage page = (MockFormFileUploadPage)tester.getLastRenderedPage();
 		MockDomainObjectFileUpload domainObject = page.getDomainObject();
 
@@ -209,6 +209,8 @@ public class FormTesterTest extends Wick
 	{
 		tester.startPage(new MockFormPage()
 		{
+			private static final long serialVersionUID = -3023635650340910221L;
+
 			@Override
 			protected void onBeforeRender()
 			{

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=997543&r1=997542&r2=997543&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java Wed Sep 15 23:48:05 2010
@@ -38,7 +38,7 @@ public class MockPageParameterPage exten
 	public MockPageParameterPage(PageParameters pageParameters)
 	{
 		add(new BookmarkablePageLink<Void>("link", MockPageParameterPage.class,
-			new PageParameters("id=1")));
+			new PageParameters().set("id", 1)));
 		add(new Label("label", pageParameters.get("id").toString()));
 	}