Author: pete
Date: Thu Apr 28 14:50:22 2011
New Revision: 1097489
URL: http://svn.apache.org/viewvc?rev=1097489&view=rev
Log:
cleanup - remove redundant casts / calls
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTests.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1097489&r1=1097488&r2=1097489&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Thu Apr 28 14:50:22 2011
@@ -1362,7 +1362,7 @@ public class BaseWicketTester
public Result ifContains(String pattern)
{
return isTrue("pattern '" + pattern + "' not found in:\n" +
getLastResponseAsString(),
- getLastResponseAsString().toString().matches("(?s).*" +
pattern + ".*"));
+ getLastResponseAsString().matches("(?s).*" +
pattern + ".*"));
}
/**
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java?rev=1097489&r1=1097488&r2=1097489&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
Thu Apr 28 14:50:22 2011
@@ -105,7 +105,7 @@ public class ParentResourceEscapePathTes
tester.processRequest();
tester.assertNoErrorMessage();
- String res = new
String(tester.getLastResponse().getBinaryResponse());
+ String res = tester.getLastResponse().getBinaryResponse();
assertEquals("// ParentResourceTest.js", res);
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java?rev=1097489&r1=1097488&r2=1097489&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
Thu Apr 28 14:50:22 2011
@@ -45,7 +45,7 @@ public class AjaxEnclosureTest extends W
{
{
// enclosure On
- AjaxEnclosurePage_1 ajaxPage =
(AjaxEnclosurePage_1)tester.startPage(AjaxEnclosurePage_1.class);
+ AjaxEnclosurePage_1 ajaxPage =
tester.startPage(AjaxEnclosurePage_1.class);
assertVisible(ajaxPage.getLabel1(), true);
assertVisible(ajaxPage.getLabel2(), true);
String doc = tester.getLastResponseAsString();
@@ -88,7 +88,7 @@ public class AjaxEnclosureTest extends W
final String enclosurePath = "InlineEnclosure-1";
{
// label 2 On
- AjaxEnclosurePage_1 ajaxPage =
(AjaxEnclosurePage_1)tester.startPage(AjaxEnclosurePage_1.class);
+ AjaxEnclosurePage_1 ajaxPage =
tester.startPage(AjaxEnclosurePage_1.class);
ensureEnclosureIsVisible(enclosurePath, ajaxPage);
assertVisible(ajaxPage.getLabel1(), true);
assertVisible(ajaxPage.getLabel2(), true);
@@ -130,7 +130,7 @@ public class AjaxEnclosureTest extends W
{
// 1. test that enclosure1, enclosure2, label1, label2
are visible, click link1,
// hiding label1 and the whole enclosure
- AjaxEnclosurePage_2 ajaxPage =
(AjaxEnclosurePage_2)tester.startPage(AjaxEnclosurePage_2.class);
+ AjaxEnclosurePage_2 ajaxPage =
tester.startPage(AjaxEnclosurePage_2.class);
ensureEnclosureIsVisible(enclosure1Path, ajaxPage);
assertVisible(ajaxPage.getEnclosure2Marker(), true);
assertVisible(ajaxPage.getLabel1(), true);
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTests.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTests.java?rev=1097489&r1=1097488&r2=1097489&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTests.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTests.java
Thu Apr 28 14:50:22 2011
@@ -37,7 +37,7 @@ public class TogglePageTests extends Wic
{
{
// On
- FullReloadPage noAjaxPage =
(FullReloadPage)tester.startPage(FullReloadPage.class);
+ FullReloadPage noAjaxPage =
tester.startPage(FullReloadPage.class);
assertVisible(noAjaxPage.getToggleable());
tester.clickLink(noAjaxPage.getLink().getPageRelativePath());
}
@@ -67,7 +67,7 @@ public class TogglePageTests extends Wic
{
{
// On
- TraditionalEnclosureAjaxPage ajaxPage =
(TraditionalEnclosureAjaxPage)tester.startPage(TraditionalEnclosureAjaxPage.class);
+ TraditionalEnclosureAjaxPage ajaxPage =
tester.startPage(TraditionalEnclosureAjaxPage.class);
assertVisible(ajaxPage.getToggleable());
tester.clickLink(ajaxPage.getLink().getPageRelativePath(), true);
}
@@ -100,7 +100,8 @@ public class TogglePageTests extends Wic
{
{
// On
- InlineEnclosureWithAdditionalAjaxTargetPage ajaxPage =
(InlineEnclosureWithAdditionalAjaxTargetPage)tester.startPage(InlineEnclosureWithAdditionalAjaxTargetPage.class);
+ InlineEnclosureWithAdditionalAjaxTargetPage ajaxPage =
+
tester.startPage(InlineEnclosureWithAdditionalAjaxTargetPage.class);
assertVisible(ajaxPage.getLabel1());
assertVisible(ajaxPage.getLabel2());
tester.clickLink(ajaxPage.getLink().getPageRelativePath(), true);
@@ -146,7 +147,7 @@ public class TogglePageTests extends Wic
{
// On
- InlineEnclosureAjaxPage ajaxPage =
(InlineEnclosureAjaxPage)tester.startPage(InlineEnclosureAjaxPage.class);
+ InlineEnclosureAjaxPage ajaxPage =
tester.startPage(InlineEnclosureAjaxPage.class);
assertVisible(ajaxPage.getToggleable());
tester.clickLink(ajaxPage.getLink().getPageRelativePath(), true);
}
