You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/04/15 22:22:25 UTC
svn commit: r765341 [7/7] - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/
main/java/org/apache/wicket/application/ main...
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptPage.java Wed Apr 15 20:22:01 2009
@@ -45,7 +45,9 @@
public void onClick()
{
if (!continueToOriginalDestination())
+ {
setResponsePage(Application.get().getHomePage());
+ }
}
});
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatefulPage.java Wed Apr 15 20:22:01 2009
@@ -58,7 +58,8 @@
}
};
add(actionLink);
- actionLink.add(new Label("linkClickCount", new PropertyModel<Integer>(this, "linkClickCount")));
+ actionLink.add(new Label("linkClickCount", new PropertyModel<Integer>(this,
+ "linkClickCount")));
final TextField<String> field = new TextField<String>("textfield", new Model<String>());
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessStatefullUrlCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessStatefullUrlCodingStrategyTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessStatefullUrlCodingStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessStatefullUrlCodingStrategyTest.java Wed Apr 15 20:22:01 2009
@@ -38,8 +38,7 @@
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/?wicket:interface=%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A");
tester.processRequestCycle();
@@ -57,16 +56,14 @@
executeTest(StatefulPage.class, "StatefulPage_QueryString_Result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/?wicket:interface=:0:actionLink::ILinkListener::");
tester.processRequestCycle();
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/statefull/?wicket:interface=%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A");
tester.processRequestCycle();
@@ -86,8 +83,7 @@
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A/");
tester.processRequestCycle();
@@ -104,16 +100,14 @@
executeTest(StatefulPage.class, "StatefulPage_Default_Result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/wicket:interface/%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A/");
tester.processRequestCycle();
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/statefull/wicket:interface/%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A/");
tester.processRequestCycle();
@@ -134,8 +128,7 @@
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A/");
tester.processRequestCycle();
@@ -153,16 +146,14 @@
executeTest(StatefulPage.class, "StatefulPage_Indexed_Result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/?wicket:interface=:0:actionLink::ILinkListener::");
tester.processRequestCycle();
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/statefull/wicket:interface/%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A/");
tester.processRequestCycle();
@@ -183,8 +174,7 @@
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A/");
tester.processRequestCycle();
@@ -202,16 +192,14 @@
executeTest(StatefulPage.class, "StatefulPage_Hybrid_Result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/?wicket:interface=:0:actionLink::ILinkListener::");
tester.processRequestCycle();
tester.setParameterForNextRequest("statelessform:textfield", "test");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
+ tester.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/statefull/wicket:interface/%3A0%3Astatelessform%3A%3AIFormSubmitListener%3A%3A/");
tester.processRequestCycle();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java Wed Apr 15 20:22:01 2009
@@ -24,7 +24,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestPageWithIFrame extends WebPage{
+public class TestPageWithIFrame extends WebPage
+{
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(TestPageWithIFrame.class);
@@ -38,6 +39,7 @@
super(id);
}
+ @Override
protected void onComponentTag(ComponentTag tag)
{
checkComponentTag(tag, "iframe");
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java Wed Apr 15 20:22:01 2009
@@ -41,6 +41,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception
{
tester = new WicketTester();
@@ -51,6 +52,7 @@
/**
* @see junit.framework.TestCase#tearDown()
*/
+ @Override
protected void tearDown() throws Exception
{
tester.destroy();
@@ -79,10 +81,9 @@
*/
public void testBadRequest3()
{
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/nonexistent.TestPage");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/nonexistent.TestPage");
WebRequestCycle requestCycle = tester.createRequestCycle();
tester.processRequestCycle(requestCycle);
assertEquals(HttpServletResponse.SC_NOT_FOUND, getErrorCode(requestCycle));
@@ -95,11 +96,10 @@
public void testDirectAccessToMountedPageAllowed()
{
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:" +
- TestPage.class.getName() + "");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:" +
+ TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -122,7 +122,7 @@
tester.setupRequestAndResponse();
tester.getServletRequest().setURL(
- "?wicket:bookmarkablePage=:" + TestPage.class.getName() + "");
+ "?wicket:bookmarkablePage=:" + TestPage.class.getName() + "");
try
{
WebRequestCycle requestCycle = tester.createRequestCycle();
@@ -145,11 +145,10 @@
public void testDirectAccessToMountedPageWithExtraPath()
{
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:" +
- TestPage.class.getName() + "");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:" +
+ TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -162,10 +161,9 @@
tester.getApplication().getSecuritySettings().setEnforceMounts(false);
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -176,7 +174,7 @@
public void testValidMount1()
{
tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point");
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point");
IRequestTargetUrlCodingStrategy ucs = getRequestCodingStrategy();
assertNotNull(ucs);
assertNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));
@@ -187,10 +185,9 @@
*/
public void testValidMount2()
{
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
IRequestTargetUrlCodingStrategy ucs = getRequestCodingStrategy();
assertNotNull(ucs);
assertNotNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));
@@ -202,8 +199,10 @@
private IRequestTargetUrlCodingStrategy getRequestCodingStrategy()
{
String relativePath = tester.getApplication().getWicketFilter().getRelativePath(
- tester.getServletRequest());
- return tester.getApplication().getRequestCycleProcessor().getRequestCodingStrategy()
- .urlCodingStrategyForPath(relativePath);
+ tester.getServletRequest());
+ return tester.getApplication()
+ .getRequestCycleProcessor()
+ .getRequestCodingStrategy()
+ .urlCodingStrategyForPath(relativePath);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java Wed Apr 15 20:22:01 2009
@@ -49,6 +49,7 @@
*
* @return The loader instance to test
*/
+ @Override
protected IStringResourceLoader createLoader()
{
return new ClassStringResourceLoader(application.getClass());
@@ -57,13 +58,14 @@
/**
* @see org.apache.wicket.resource.StringResourceLoaderTestBase#testLoaderUnknownResources()
*/
+ @Override
public void testLoaderUnknownResources()
{
WicketTester tester = new WicketTester();
WebApplication app = tester.getApplication();
IStringResourceLoader loader = new ClassStringResourceLoader(app.getClass());
Assert.assertNull("Unknown resource should return null", loader.loadStringResource(
- component.getClass(), "test.string", Locale.getDefault(), null));
+ component.getClass(), "test.string", Locale.getDefault(), null));
tester.destroy();
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java Wed Apr 15 20:22:01 2009
@@ -47,6 +47,7 @@
*
* @return The loader instance to test
*/
+ @Override
protected IStringResourceLoader createLoader()
{
return new BundleStringResourceLoader("org.apache.wicket.resource.DummyResources");
@@ -55,6 +56,7 @@
/**
* @see org.apache.wicket.resource.StringResourceLoaderTestBase#testLoaderValidKeyStyleNoLocale()
*/
+ @Override
public void testLoaderValidKeyStyleNoLocale()
{
String s = loader.loadStringResource(component.getClass(), "test.string", null, "alt");
@@ -64,11 +66,12 @@
/**
* @see org.apache.wicket.resource.StringResourceLoaderTestBase#testLoaderUnknownResources()
*/
+ @Override
public void testLoaderUnknownResources()
{
IStringResourceLoader loader = new BundleStringResourceLoader("unknown.resource");
Assert.assertNull("Unknown resource should return null", loader.loadStringResource(
- component.getClass(), "test.string", Locale.getDefault(), null));
+ component.getClass(), "test.string", Locale.getDefault(), null));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java Wed Apr 15 20:22:01 2009
@@ -48,6 +48,7 @@
*
* @return The loader instance to test
*/
+ @Override
protected IStringResourceLoader createLoader()
{
return new ComponentStringResourceLoader();
@@ -56,6 +57,7 @@
/**
* @see org.apache.wicket.resource.StringResourceLoaderTestBase#testLoaderUnknownResources()
*/
+ @Override
public void testLoaderUnknownResources()
{
Component c = new DummyComponent("hello", application)
@@ -65,8 +67,8 @@
DummyPage page = new DummyPage();
page.add(c);
IStringResourceLoader loader = new ComponentStringResourceLoader();
- Assert.assertNull("Missing resource should return null", loader.loadStringResource(c
- .getClass(), "test.string.bad", Locale.getDefault(), null));
+ Assert.assertNull("Missing resource should return null", loader.loadStringResource(
+ c.getClass(), "test.string.bad", Locale.getDefault(), null));
}
/**
@@ -75,7 +77,7 @@
public void testNullComponent()
{
Assert.assertNull("Null component should skip resource load", loader.loadStringResource(
- null, "test.string", Locale.getDefault(), null));
+ null, "test.string", Locale.getDefault(), null));
}
/**
@@ -89,8 +91,8 @@
DummyComponent c = new DummyComponent("hello", application);
panel.add(c);
IStringResourceLoader loader = new ComponentStringResourceLoader();
- Assert.assertEquals("Valid resourse string should be found", "Component string", loader
- .loadStringResource(c.getClass(), "component.string", Locale.getDefault(), null));
+ Assert.assertEquals("Valid resourse string should be found", "Component string",
+ loader.loadStringResource(c.getClass(), "component.string", Locale.getDefault(), null));
}
/**
@@ -100,10 +102,9 @@
{
DummyPage p = new DummyPage();
IStringResourceLoader loader = new ComponentStringResourceLoader();
- Assert
- .assertEquals("Valid resourse string should be found", "Another string", loader
- .loadStringResource(p.getClass(), "another.test.string", Locale
- .getDefault(), null));
+ Assert.assertEquals("Valid resourse string should be found", "Another string",
+ loader.loadStringResource(p.getClass(), "another.test.string", Locale.getDefault(),
+ null));
}
/**
@@ -114,11 +115,10 @@
DummySubClassPage p = new DummySubClassPage();
IStringResourceLoader loader = new ComponentStringResourceLoader();
Assert.assertEquals("Valid resource string should be found", "SubClass Test String",
- loader.loadStringResource(p.getClass(), "subclass.test.string",
- Locale.getDefault(), null));
- Assert
- .assertEquals("Valid resource string should be found", "Another string", loader
- .loadStringResource(p.getClass(), "another.test.string", Locale
- .getDefault(), null));
+ loader.loadStringResource(p.getClass(), "subclass.test.string", Locale.getDefault(),
+ null));
+ Assert.assertEquals("Valid resource string should be found", "Another string",
+ loader.loadStringResource(p.getClass(), "another.test.string", Locale.getDefault(),
+ null));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java Wed Apr 15 20:22:01 2009
@@ -33,7 +33,7 @@
public class DummyApplication extends WebApplication
{
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyComponent.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyComponent.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyComponent.java Wed Apr 15 20:22:01 2009
@@ -46,6 +46,7 @@
*
* @see org.apache.wicket.Component#onRender(org.apache.wicket.markup.MarkupStream)
*/
+ @Override
protected void onRender(final MarkupStream markupStream)
{
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/InvalidResourceSpecificationExceptionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/InvalidResourceSpecificationExceptionTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/InvalidResourceSpecificationExceptionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/InvalidResourceSpecificationExceptionTest.java Wed Apr 15 20:22:01 2009
@@ -44,6 +44,7 @@
*
* @return The name of the exception class
*/
+ @Override
protected String getExceptionClassName()
{
return WicketRuntimeException.class.getName();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java Wed Apr 15 20:22:01 2009
@@ -62,18 +62,20 @@
*/
protected abstract IStringResourceLoader createLoader();
+ @Override
protected void setUp() throws Exception
{
super.setUp();
- this.application = new DummyApplication();
+ application = new DummyApplication();
// Initialize the application
- tester = new WicketTester(this.application);
- this.component = new DummyComponent("test", this.application);
+ tester = new WicketTester(application);
+ component = new DummyComponent("test", application);
DummyPage page = new DummyPage();
- page.add(this.component);
- this.loader = createLoader();
+ page.add(component);
+ loader = createLoader();
}
+ @Override
protected void tearDown() throws Exception
{
tester.destroy();
@@ -84,13 +86,13 @@
*/
public void testLoaderValidKeyNoStyleDefaultLocale()
{
- String s = loader.loadStringResource(component.getClass(), "test.string", Locale
- .getDefault(), null);
+ String s = loader.loadStringResource(component.getClass(), "test.string",
+ Locale.getDefault(), null);
Assert.assertEquals("Resource should be loaded", "This is a test", s);
// And do it again to ensure caching path is exercised
s = loader.loadStringResource(component.getClass(), "test.string", Locale.getDefault(),
- null);
+ null);
Assert.assertEquals("Resource should be loaded", "This is a test", s);
}
@@ -99,8 +101,8 @@
*/
public void testLoaderInvalidKeyNoStyleDefaultLocale()
{
- Assert.assertNull("Missing key should return null", loader.loadStringResource(component
- .getClass(), "unknown.string", Locale.getDefault(), null));
+ Assert.assertNull("Missing key should return null", loader.loadStringResource(
+ component.getClass(), "unknown.string", Locale.getDefault(), null));
}
/**
@@ -109,7 +111,7 @@
public void testLoaderValidKeyNoStyleAlternativeLocale()
{
String s = loader.loadStringResource(component.getClass(), "test.string", new Locale("zz"),
- null);
+ null);
Assert.assertEquals("Resource should be loaded", "Flib flob", s);
}
@@ -118,8 +120,8 @@
*/
public void testLoaderInvalidKeyNoStyleAlternativeLocale()
{
- Assert.assertNull("Missing key should return null", loader.loadStringResource(component
- .getClass(), "unknown.string", new Locale("zz"), null));
+ Assert.assertNull("Missing key should return null", loader.loadStringResource(
+ component.getClass(), "unknown.string", new Locale("zz"), null));
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java Wed Apr 15 20:22:01 2009
@@ -58,6 +58,7 @@
*
* @see org.apache.wicket.validation.validator.AbstractValidator#onValidate(org.apache.wicket.validation.IValidatable)
*/
+ @Override
protected void onValidate(IValidatable v)
{
error(v);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/XmlPage.java Wed Apr 15 20:22:01 2009
@@ -36,6 +36,7 @@
/**
* @see org.apache.wicket.markup.html.WebPage#getMarkupType()
*/
+ @Override
public String getMarkupType()
{
return "xml";
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/response/StringResponseTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/response/StringResponseTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/response/StringResponseTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/response/StringResponseTest.java Wed Apr 15 20:22:01 2009
@@ -33,7 +33,7 @@
{
tester.setupRequestAndResponse();
tester.getApplication().getRequestCycleSettings().setUnexpectedExceptionDisplay(
- IExceptionSettings.SHOW_EXCEPTION_PAGE);
+ IExceptionSettings.SHOW_EXCEPTION_PAGE);
WebRequestCycle cycle = tester.createRequestCycle();
cycle.setResponse(new StringResponse());
@@ -43,7 +43,7 @@
// exception is thrown instead
cycle.request(new BookmarkablePageRequestTarget(BrokenPage.class));
Method method = MockWebApplication.class.getDeclaredMethod("generateLastRenderedPage",
- new Class[] { WebRequestCycle.class });
+ new Class[] { WebRequestCycle.class });
method.setAccessible(true);
Page page = (Page)method.invoke(tester, new Object[] { cycle });
assertTrue("Page is not an ExceptionErrorPage", page instanceof ExceptionErrorPage);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/session/InvalidateSessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/session/InvalidateSessionTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/session/InvalidateSessionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/session/InvalidateSessionTest.java Wed Apr 15 20:22:01 2009
@@ -98,7 +98,7 @@
*/
public MyPage()
{
- boolean sessionInvalid = Session.get().isSessionInvalidated();
+ Session.get().isSessionInvalidated();
MySession sess = MySession.get();
if (sess.getName() != null)
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPage.java Wed Apr 15 20:22:01 2009
@@ -36,6 +36,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
public void onClick()
{
throw new WicketRuntimeException("wanted exception");
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java Wed Apr 15 20:22:01 2009
@@ -40,6 +40,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
public void onClick()
{
if (getPageParameters().size() == 2)
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java Wed Apr 15 20:22:01 2009
@@ -45,10 +45,9 @@
executeTest(StatelessComponentPage.class, "StatelessComponentPage_result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPage&wicket:interface=:0:link::ILinkListener::");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPage&wicket:interface=:0:link::ILinkListener::");
try
{
tester.processRequestCycle();
@@ -70,10 +69,9 @@
// test is always the home page. it doesn't work then
executeTest(StatelessComponentPage.class, "StatelessComponentPage_mount_result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/:0:link::ILinkListener::");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/:0:link::ILinkListener::");
try
{
tester.processRequestCycle();
@@ -95,13 +93,12 @@
params.put("testParam2", "testValue2");
executeTest(StatelessComponentPageWithParams.class, params,
- "StatelessComponentPageWithParams_result.html");
+ "StatelessComponentPageWithParams_result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPageWithParams&testParam1=testValue1&testParam2=testValue2&wicket:interface=:0:link::ILinkListener::");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPageWithParams&testParam1=testValue1&testParam2=testValue2&wicket:interface=:0:link::ILinkListener::");
try
{
tester.processRequestCycle();
@@ -123,15 +120,14 @@
params.put("testParam1", "testValue1");
params.put("testParam2", "testValue2");
tester.getApplication().mountBookmarkablePage("/stateless",
- StatelessComponentPageWithParams.class);
+ StatelessComponentPageWithParams.class);
// test is always the home page. it doesn't work then
executeTest(StatelessComponentPageWithParams.class, params,
- "StatelessComponentPageWithParams_mount_result.html");
+ "StatelessComponentPageWithParams_mount_result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testParam1/testValue1/testParam2/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testParam1/testValue1/testParam2/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/");
try
{
tester.processRequestCycle();
@@ -151,17 +147,17 @@
PageParameters params = new PageParameters();
params.put("0", "testValue1");
params.put("1", "testValue2");
- tester.getApplication().mount(
+ tester.getApplication()
+ .mount(
new IndexedParamUrlCodingStrategy("/stateless",
- StatelessComponentPageWithParams.class));
+ StatelessComponentPageWithParams.class));
// test is always the home page. it doesn't work then
executeTest(StatelessComponentPageWithParams.class, params,
- "StatelessComponentPageWithParams_indexed_mount_result.html");
+ "StatelessComponentPageWithParams_indexed_mount_result.html");
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testValue1/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/");
+ tester.getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/testValue1/testValue2/wicket:interface/%3A0%3Alink%3A%3AILinkListener%3A%3A/");
try
{
tester.processRequestCycle();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Wed Apr 15 20:22:01 2009
@@ -46,7 +46,7 @@
{
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java Wed Apr 15 20:22:01 2009
@@ -109,8 +109,7 @@
* @throws Exception
* WICKET-1344 public void testBigDecimalRounding() throws Exception {
* BigDecimalConverter bdc = new BigDecimalConverter(); assertEquals("123.45",
- * bdc.convertToObject("123.45", Locale.ENGLISH).toString());
- * }
+ * bdc.convertToObject("123.45", Locale.ENGLISH).toString()); }
*/
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java Wed Apr 15 20:22:01 2009
@@ -136,8 +136,7 @@
public void test_3() throws IOException
{
String input = "wicket:interface=:2:entityTree:node:node:0:node:nodeLink::IBehaviorListener";
- ICrypt crypt = new CachingSunJceCryptFactory(ISecuritySettings.DEFAULT_ENCRYPTION_KEY)
- .newCrypt();
+ ICrypt crypt = new CachingSunJceCryptFactory(ISecuritySettings.DEFAULT_ENCRYPTION_KEY).newCrypt();
String s = crypt.encryptUrlSafe(input);
String output = crypt.decryptUrlSafe(s);
@@ -240,8 +239,7 @@
public void test_UrlSafe_3() throws IOException
{
String input = "wicket:interface=:2:entityTree:node:node:0:node:nodeLink::IBehaviorListener";
- ICrypt crypt = new CachingSunJceCryptFactory(ISecuritySettings.DEFAULT_ENCRYPTION_KEY)
- .newCrypt();
+ ICrypt crypt = new CachingSunJceCryptFactory(ISecuritySettings.DEFAULT_ENCRYPTION_KEY).newCrypt();
String s = crypt.encryptUrlSafe(input);
String output = crypt.decryptUrlSafe(s);
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=765341&r1=765340&r2=765341&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 Apr 15 20:22:01 2009
@@ -44,6 +44,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj instanceof PageA)
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=765341&r1=765340&r2=765341&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 Apr 15 20:22:01 2009
@@ -41,6 +41,7 @@
}
+ @Override
public boolean equals(Object obj)
{
if (obj instanceof PageB)
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java Wed Apr 15 20:22:01 2009
@@ -81,7 +81,7 @@
WebApplication app = new WebApplication()
{
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/Address.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/Address.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/Address.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/Address.java Wed Apr 15 20:22:01 2009
@@ -30,7 +30,7 @@
*/
public String getStreet()
{
- return this.street;
+ return street;
}
/**
@@ -46,7 +46,7 @@
*/
public int getNumber()
{
- return this.number;
+ return number;
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/BytesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/BytesTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/BytesTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/BytesTest.java Wed Apr 15 20:22:01 2009
@@ -35,6 +35,7 @@
/**
* Save the default locale.
*/
+ @Override
public void setUp()
{
defaultLocale = Locale.getDefault();
@@ -46,6 +47,7 @@
/**
* Restore the default locale.
*/
+ @Override
public void tearDown()
{
Locale.setDefault(defaultLocale);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java Wed Apr 15 20:22:01 2009
@@ -104,11 +104,11 @@
/**
* Test method for component cloning
*/
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings( { "unchecked" })
public void testComponentClone()
{
- PropertyModel<String> pm = new PropertyModel<String>(new TextField<String>("test", new Model<String>("test")),
- "modelObject");
+ PropertyModel<String> pm = new PropertyModel<String>(new TextField<String>("test",
+ new Model<String>("test")), "modelObject");
PropertyModel<String> pm2 = (PropertyModel<String>)Objects.cloneModel(pm);
assertTrue(pm.getObject() == pm2.getObject());
}
@@ -141,6 +141,7 @@
/**
* @see Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o)
{
CloneObject other = (CloneObject)o;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java Wed Apr 15 20:22:01 2009
@@ -49,6 +49,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return Primitives.hashCode(value);
@@ -63,6 +64,7 @@
/**
* Creates the objects for the tests.
*/
+ @Override
public void setUp()
{
eq1 = new HashCodeObject(26);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Wed Apr 15 20:22:01 2009
@@ -59,7 +59,7 @@
{
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java Wed Apr 15 20:22:01 2009
@@ -54,8 +54,7 @@
// Click the autolink
tester.setupRequestAndResponse();
WebRequestCycle cycle = tester.createRequestCycle();
- ((MockHttpServletRequest)tester.getWicketRequest().getHttpServletRequest())
- .setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/page2/abc");
+ ((MockHttpServletRequest)tester.getWicketRequest().getHttpServletRequest()).setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/page2/abc");
tester.processRequestCycle(cycle);
assertEquals(Page2.class, tester.getLastRenderedPage().getClass());
@@ -63,6 +62,6 @@
// Validate the document
String document = tester.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(), "IndexedParamTest_ExpectedResult-2.html",
- true);
+ true);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/resource/ResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/resource/ResourceTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/resource/ResourceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/resource/ResourceTest.java Wed Apr 15 20:22:01 2009
@@ -64,8 +64,9 @@
public void createAndTestResource(Path sourcePath, String style, Locale locale, String extension)
{
IResourceStreamLocator locator = new ResourceStreamLocator(sourcePath);
- IResourceStream resource = locator.locate(this.getClass(), this.getClass().getName()
- .replace('.', '/'), style, locale, "txt");
+ IResourceStream resource = locator.locate(this.getClass(), this.getClass()
+ .getName()
+ .replace('.', '/'), style, locale, "txt");
compareFilename(resource, extension);
}
@@ -114,7 +115,7 @@
// Determine source path
IResourceStreamLocator locator = new ResourceStreamLocator();
IResourceStream resource = locator.locate(getClass(), this.getClass().getName().replace(
- '.', '/'), null, null, "txt");
+ '.', '/'), null, null, "txt");
String path = getPath(resource);
path = Strings.beforeLastPathComponent(path, '/') + "/sourcePath";
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/size/BytesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/size/BytesTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/size/BytesTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/size/BytesTest.java Wed Apr 15 20:22:01 2009
@@ -40,6 +40,7 @@
/**
* Save the default locale.
*/
+ @Override
public void setUp()
{
defaultLocale = Locale.getDefault();
@@ -48,6 +49,7 @@
/**
* Restore the default locale.
*/
+ @Override
public void tearDown()
{
Locale.setDefault(defaultLocale);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java Wed Apr 15 20:22:01 2009
@@ -58,9 +58,9 @@
}
/**
- * Test <a
- * href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Object.html#equals(java.lang.Object)">reflexivity<a>
- * of the equals implementation.
+ * Test <a href=
+ * "http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Object.html#equals(java.lang.Object)"
+ * >reflexivity<a> of the equals implementation.
*
* @throws Exception
*/
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java Wed Apr 15 20:22:01 2009
@@ -35,6 +35,6 @@
public BlockedResourceLinkPage()
{
add(new ResourceLink<Void>("link", new ResourceReference(BlockedResourceLinkPage.class,
- "BlockedResourceLinkPage.html")));
+ "BlockedResourceLinkPage.html")));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockAjaxFormPage.java Wed Apr 15 20:22:01 2009
@@ -82,6 +82,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void onEvent(AjaxRequestTarget target)
{
text.validate();
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormPage.java Wed Apr 15 20:22:01 2009
@@ -103,7 +103,8 @@
public MockFormPage()
{
domainObject = new MockDomainObject();
- Form<MockDomainObject> form = new Form<MockDomainObject>("form", new CompoundPropertyModel<MockDomainObject>(domainObject));
+ Form<MockDomainObject> form = new Form<MockDomainObject>("form",
+ new CompoundPropertyModel<MockDomainObject>(domainObject));
add(form);
form.add(new TextField<String>("text"));
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=765341&r1=765340&r2=765341&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 Apr 15 20:22:01 2009
@@ -38,7 +38,7 @@
public MockPageParameterPage(PageParameters pageParameters)
{
add(new BookmarkablePageLink("link", MockPageParameterPage.class,
- new PageParameters("id=1")));
+ new PageParameters("id=1")));
add(new Label("label", pageParameters.getString("id")));
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java Wed Apr 15 20:22:01 2009
@@ -58,8 +58,8 @@
super(id);
// label model here comes from java
- add(new RequiredTextField<String>("id", new PropertyModel<String>(book, "id"))
- .setLabel(new Model<String>("id")));
+ add(new RequiredTextField<String>("id", new PropertyModel<String>(book, "id")).setLabel(new Model<String>(
+ "id")));
// label model here comes from CreateBook.properties
add(new RequiredTextField<String>("name", new PropertyModel<String>(book, "name")));
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_2/Test.java Wed Apr 15 20:22:01 2009
@@ -35,8 +35,9 @@
{
final WicketTester tester = new WicketTester();
final IAuthorizationStrategy authorizationStrategy = new SimplePageAuthorizationStrategy(
- RedirectPage.class, LoginPage.class)
+ RedirectPage.class, LoginPage.class)
{
+ @Override
protected boolean isAuthorized()
{
return false;
@@ -44,7 +45,7 @@
};
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(
- authorizationStrategy);
+ authorizationStrategy);
tester.startPage(RedirectPage.class);
tester.assertRenderedPage(LoginPage.class);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java Wed Apr 15 20:22:01 2009
@@ -48,6 +48,7 @@
super(name);
}
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -142,7 +143,7 @@
assertBooksEquals(new Book[] { books[0], books[3] }, choicePage.listMultipleChoice);
assertBooksEquals(new Book[] { books[0], books[1], books[3] },
- choicePage.checkBoxMultipleChoice);
+ choicePage.checkBoxMultipleChoice);
assertBooksEquals(books, choicePage.checkGroup);
}
@@ -163,7 +164,7 @@
formTester.submit();
assertBooksEquals(new Book[] { books[0], books[1], books[3] },
- choicePage.listMultipleChoice);
+ choicePage.listMultipleChoice);
assertBooksEquals(new Book[] { books[0], books[2], books[3] }, choicePage.checkGroup);
}
@@ -204,7 +205,7 @@
assertEquals(true, choicePage.checkBox);
assertBooksEquals(new Book[] { books[2], books[1] }, choicePage.initialListMultipleChoice);
assertBooksEquals(new Book[] { books[3], books[0] },
- choicePage.initialCheckBoxMultipleChoice);
+ choicePage.initialCheckBoxMultipleChoice);
assertBooksEquals(new Book[] { books[3], books[2] }, choicePage.initialCheckGroup);
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/EmailPage.java Wed Apr 15 20:22:01 2009
@@ -52,7 +52,7 @@
*/
public String getEmail()
{
- return this.email;
+ return email;
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_4/FormTesterTest.java Wed Apr 15 20:22:01 2009
@@ -36,6 +36,7 @@
super(name);
}
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -61,7 +62,10 @@
assertNull(page.getEmail());
assertTrue(Session.get().getFeedbackMessages().hasMessageFor(page.get("form:email")));
- assertEquals("wrong email address pattern for email", Session.get().getFeedbackMessages()
- .messageForComponent(page.get("form:email")).getMessage().toString());
+ assertEquals("wrong email address pattern for email", Session.get()
+ .getFeedbackMessages()
+ .messageForComponent(page.get("form:email"))
+ .getMessage()
+ .toString());
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java Wed Apr 15 20:22:01 2009
@@ -31,7 +31,8 @@
/**
* Test method for
- * {@link org.apache.wicket.util.time.TimeFrame#eachDay(org.apache.wicket.util.time.TimeOfDay, org.apache.wicket.util.time.TimeOfDay)}.
+ * {@link org.apache.wicket.util.time.TimeFrame#eachDay(org.apache.wicket.util.time.TimeOfDay, org.apache.wicket.util.time.TimeOfDay)}
+ * .
*/
public void testEachDay()
{
@@ -41,7 +42,8 @@
/**
* Test method for
- * {@link org.apache.wicket.util.time.TimeFrame#valueOf(org.apache.wicket.util.time.Time, org.apache.wicket.util.time.Duration)}.
+ * {@link org.apache.wicket.util.time.TimeFrame#valueOf(org.apache.wicket.util.time.Time, org.apache.wicket.util.time.Duration)}
+ * .
*/
public void testValueOfTimeDuration()
{
@@ -62,7 +64,8 @@
/**
* Test method for
- * {@link org.apache.wicket.util.time.TimeFrame#overlaps(org.apache.wicket.util.time.TimeFrame)}.
+ * {@link org.apache.wicket.util.time.TimeFrame#overlaps(org.apache.wicket.util.time.TimeFrame)}
+ * .
*/
public void testOverlaps()
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeMapTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeMapTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeMapTest.java Wed Apr 15 20:22:01 2009
@@ -39,17 +39,17 @@
{
final TimeMap map = new TimeMap();
final Time start = Time.valueOf(TimeOfDay.valueOf(new GregorianCalendar(Locale.ENGLISH),
- "3.14pm"));
+ "3.14pm"));
final Time end = Time.valueOf(TimeOfDay.valueOf(new GregorianCalendar(Locale.ENGLISH),
- "3.20pm"));
+ "3.20pm"));
final String value = "test";
map.put(TimeFrame.valueOf(start, end), value);
Assert.assertEquals(value, map.get(Time.valueOf(TimeOfDay.valueOf(new GregorianCalendar(
- Locale.ENGLISH), "3.15pm"))));
+ Locale.ENGLISH), "3.15pm"))));
Assert.assertNull(map.get(Time.valueOf(TimeOfDay.valueOf(new GregorianCalendar(
- Locale.ENGLISH), "3.21pm"))));
+ Locale.ENGLISH), "3.21pm"))));
Assert.assertNull(map.get(Time.valueOf(TimeOfDay.valueOf(new GregorianCalendar(
- Locale.ENGLISH), "3.13pm"))));
+ Locale.ENGLISH), "3.13pm"))));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/time/TimeTest.java Wed Apr 15 20:22:01 2009
@@ -36,7 +36,7 @@
*/
public void test() throws ParseException
{
- final Time start = Time.now();
+ Time.now();
// TODO Post 1.2: Bug: Eelco mentioned this test fails on his computer
// from time to time. I have seen this and it's very weird -- Jonathan
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java?rev=765341&r1=765340&r2=765341&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/EmailValidatorTest.java Wed Apr 15 20:22:01 2009
@@ -53,8 +53,9 @@
"1.2.3.4@5.6.7.nl", "m@m.nl", "M@M.NL" };
for (int i = 0; i < emails.length; i++)
{
- assertTrue(emails[i] + " should be valid", test.getPattern().matcher(emails[i])
- .matches());
+ assertTrue(emails[i] + " should be valid", test.getPattern()
+ .matcher(emails[i])
+ .matches());
}
}
@@ -68,8 +69,9 @@
"blaat@.nl" };
for (int i = 0; i < emails.length; i++)
{
- assertFalse(emails[i] + " should not be valid", test.getPattern().matcher(emails[i])
- .matches());
+ assertFalse(emails[i] + " should not be valid", test.getPattern()
+ .matcher(emails[i])
+ .matches());
}
}
}