Author: pete
Date: Wed Sep 15 23:29:53 2010
New Revision: 997540
URL: http://svn.apache.org/viewvc?rev=997540&view=rev
Log:
remove some deprecated methods
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java?rev=997540&r1=997539&r2=997540&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
Wed Sep 15 23:29:53 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.examples.hangman;
-import java.util.Iterator;
-
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -101,9 +99,8 @@ public class HangManTest extends TestCas
private Letter letter(Game hangman, char c)
{
- for (Iterator iter = hangman.getLetters().iterator();
iter.hasNext();)
+ for (Letter letter : hangman.getLetters())
{
- Letter letter = (Letter)iter.next();
if
(letter.asString().equalsIgnoreCase(Character.toString(c)))
{
return letter;
@@ -154,7 +151,7 @@ public class HangManTest extends TestCas
{
WicketTester tester = new WicketTester(new
HangmanApplication());
- tester.startPage(Home.class, new
PageParameters("word=hangman"));
+ tester.startPage(Home.class, new PageParameters().set("word",
"hangman"));
tester.assertComponent("start", Link.class);
tester.assertContains("Wicket Examples - hangman");
tester.clickLink("start");
@@ -177,7 +174,7 @@ public class HangManTest extends TestCas
{
WicketTester tester = new WicketTester(new
HangmanApplication());
- tester.startPage(Home.class, new
PageParameters("word=hangman"));
+ tester.startPage(Home.class, new PageParameters().set("word",
"hangman"));
tester.assertComponent("start", Link.class);
tester.assertContains("Wicket Examples - hangman");
tester.clickLink("start");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java?rev=997540&r1=997539&r2=997540&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
Wed Sep 15 23:29:53 2010
@@ -98,7 +98,7 @@ public class MarkupInheritanceTest exten
// Validate the document
assertEquals(MarkupInheritanceExtension_4.class,
tester.getLastRenderedPage().getClass());
- String document =
tester.getLastResponse().getTextResponse().toString();
+ String document = tester.getLastResponse().getDocument();
DiffUtil.validatePage(document, getClass(),
"MarkupInheritanceExpectedResult_4.html", true);
MarkupInheritanceExtension_4 page =
(MarkupInheritanceExtension_4)tester.getLastRenderedPage();
@@ -108,7 +108,7 @@ public class MarkupInheritanceTest exten
assertEquals(MarkupInheritanceExtension_4.class,
tester.getLastRenderedPage().getClass());
- document =
tester.getLastResponse().getTextResponse().toString();
+ document = tester.getLastResponse().getDocument();
DiffUtil.validatePage(document, getClass(),
"MarkupInheritanceExpectedResult_4-1.html",
true);
}
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=997540&r1=997539&r2=997540&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:29:53 2010
@@ -101,19 +101,19 @@ public class EnclosureTest extends Wicke
{
// render with enclosure initially visible
tester.startPage(EnclosurePage_6.class);
- String doc =
tester.getLastResponse().getTextResponse().toString();
+ String doc = tester.getLastResponse().getDocument();
assertTrue(doc.contains("content1"));
assertTrue(doc.contains("content2"));
// render with enclosure hidden
tester.clickLink("link");
- doc = tester.getLastResponse().getTextResponse().toString();
+ doc = tester.getLastResponse().getDocument();
assertFalse(doc.contains("content1"));
assertFalse(doc.contains("content2"));
// render with enclosure visible again
tester.clickLink("link");
- doc = tester.getLastResponse().getTextResponse().toString();
+ doc = tester.getLastResponse().getDocument();
assertTrue(doc.contains("content1"));
assertTrue(doc.contains("content2"));
}
@@ -151,7 +151,7 @@ public class EnclosureTest extends Wicke
private void assertResultPage(final String file) throws IOException
{
- String document =
tester.getLastResponse().getTextResponse().toString();
+ String document = tester.getLastResponse().getDocument();
document = document.replaceAll("[1-9]+[.]IFormSubmitListener",
"1.IFormSubmitListener");
DiffUtil.validatePage(document, getClass(), file, true);
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java?rev=997540&r1=997539&r2=997540&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageA.java Wed
Sep 15 23:29:53 2010
@@ -41,6 +41,12 @@ public class PageA extends WebPage
this.page = page;
}
+ @Override
+ protected void configureResponse()
+ {
+ super.configureResponse();
+ }
+
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
@@ -49,7 +55,7 @@ public class PageA extends WebPage
{
if (obj instanceof PageA)
{
- if (getNumericId() == ((PageA)obj).getNumericId())
+ if (getPageId() == ((PageA)obj).getPageId())
{
if (page != null)
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java?rev=997540&r1=997539&r2=997540&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/PageB.java Wed
Sep 15 23:29:53 2010
@@ -46,7 +46,7 @@ public class PageB extends WebPage
{
if (obj instanceof PageB)
{
- return getNumericId() == ((PageB)obj).getNumericId() &&
test.equals(((PageB)obj).test);
+ return getPageId() == ((PageB)obj).getPageId() &&
test.equals(((PageB)obj).test);
}
return false;
}
