Author: thrantal
Date: Tue Sep 16 19:47:45 2008
New Revision: 696136
URL: http://svn.apache.org/viewvc?rev=696136&view=rev
Log:
Cleanup:
- removed unused variables and fields
- removed redundant thises
- added missing generic type parameters
- replaced old skool for loops with foreach
- no functional changes
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java?rev=696136&r1=696135&r2=696136&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/panels/signin/CookieTest.java
Tue Sep 16 19:47:45 2008
@@ -16,18 +16,13 @@
*/
package org.apache.wicket.examples.panels.signin;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
+import java.io.IOException;
+import java.util.Collection;
import junit.framework.Assert;
import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
@@ -45,16 +40,11 @@
*/
public class CookieTest extends TestCase
{
- private static final Log log = LogFactory.getLog(CookieTest.class);
-
private WicketTester tester;
private SignInPanel panel;
- private Form form;
+ private Form<?> form;
private Cookie cookieUsername;
- private Cookie cookiePassword;
- private Cookie[] cookies;
private WebPage page;
- private WebRequestCycle cycle;
/**
* Create the test case.
@@ -67,6 +57,7 @@
super(name);
}
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -77,49 +68,43 @@
final ISecuritySettings settings =
tester.getApplication().getSecuritySettings();
settings.setCryptFactory(new NoCryptFactory());
- this.panel = new SignInPanel("panel")
+ panel = new SignInPanel("panel")
{
+ @Override
public boolean signIn(final String username, final
String password)
{
return true;
}
};
- this.panel.setPersistent(true);
- this.form = (Form)panel.get("signInForm");
+ panel.setPersistent(true);
+ form = (Form<?>)panel.get("signInForm");
final ICrypt crypt =
tester.getApplication().getSecuritySettings().getCryptFactory()
.newCrypt();
final String encryptedPassword = crypt.encryptUrlSafe("test");
assertNotNull(encryptedPassword);
- this.cookieUsername = new Cookie("panel:signInForm:username",
"juergen");
- this.cookiePassword = new Cookie("panel:signInForm:password",
encryptedPassword);
- this.cookies = new Cookie[] { cookieUsername, cookiePassword };
+ cookieUsername = new Cookie("panel:signInForm:username",
"juergen");
+ Cookie cookiePassword = new Cookie("panel:signInForm:password",
encryptedPassword);
+ Cookie[] cookies = new Cookie[]{cookieUsername, cookiePassword};
tester.getServletRequest().setCookies(cookies);
- cycle = new WebRequestCycle(tester.getApplication(),
tester.getWicketRequest(), tester
- .getWicketResponse());
+ new WebRequestCycle(tester.getApplication(),
tester.getWicketRequest(), tester.getWicketResponse());
- this.page = new MockPage(null);
- page.add(this.panel);
+ page = new MockPage(null);
+ page.add(panel);
- WebRequestCycle cycle = new
WebRequestCycle(tester.getApplication(), tester
- .getWicketRequest(),
tester.getWicketResponse());
+ new WebRequestCycle(tester.getApplication(),
tester.getWicketRequest(), tester.getWicketResponse());
}
- /**
- *
- * @throws IOException
- * @throws ServletException
- */
public void testSetCookieOnForm() throws IOException, ServletException
{
// initialize
- this.form.loadPersistentFormComponentValues();
+ form.loadPersistentFormComponentValues();
// validate
- FormComponent username =
(FormComponent)panel.get("signInForm:username");
+ FormComponent<?> username =
(FormComponent<?>)panel.get("signInForm:username");
Assert.assertNotNull(username);
@@ -128,23 +113,17 @@
Assert.assertEquals(cookieUsername.getValue(),
username.getDefaultModelObjectAsString());
}
- /**
- *
- * @throws IOException
- * @throws ServletException
- */
public void testPersistCookieWithPersistenceDisabled() throws
IOException, ServletException
{
// test will call persistFromComponentData(), which is private
- this.panel.setPersistent(false);
- this.form.onFormSubmitted();
+ panel.setPersistent(false);
+ form.onFormSubmitted();
// validate
- Collection cookies = tester.getServletResponse().getCookies();
- Iterator iter = cookies.iterator();
- while (iter.hasNext())
+ Collection<Cookie> cookies =
tester.getServletResponse().getCookies();
+ for (Cookie cooky : cookies)
{
- Assert.assertEquals(0,
((Cookie)iter.next()).getMaxAge());
+ Assert.assertEquals(0, (cooky).getMaxAge());
}
}
@@ -158,30 +137,23 @@
panel.setPersistent(true);
// test will call persistFromComponentData(), which is private
- this.form.onFormSubmitted();
+ form.onFormSubmitted();
// validate
- Collection cookies = tester.getServletResponse().getCookies();
+ Collection<Cookie> cookies =
tester.getServletResponse().getCookies();
Assert.assertEquals(2, cookies.size());
- Iterator iter = cookies.iterator();
- while (iter.hasNext())
+ for (Cookie cooky : cookies)
{
- Cookie cookie = (Cookie)iter.next();
- Assert.assertNotNull(page.get(cookie.getName()));
+ Assert.assertNotNull(page.get(cooky.getName()));
// Skip "deleted" cookies
- if
(page.get(cookie.getName()).getDefaultModelObjectAsString() != "")
+ if
(page.get(cooky.getName()).getDefaultModelObjectAsString() != "")
{
- Assert.assertEquals(cookie.getValue(),
page.get(cookie.getName())
+ Assert.assertEquals(cooky.getValue(),
page.get(cooky.getName())
.getDefaultModelObjectAsString());
}
}
}
- /**
- *
- * @throws IOException
- * @throws ServletException
- */
public void testRemoveFromPage() throws IOException, ServletException
{
panel.setPersistent(true);
@@ -190,7 +162,7 @@
page.removePersistedFormData(SignInPanel.SignInForm.class,
true);
// validate
- Collection cookieCollection =
tester.getServletResponse().getCookies();
+ Collection<Cookie> cookieCollection =
tester.getServletResponse().getCookies();
// Cookies are remove by setting maxAge == 0
Assert.assertEquals(2, cookieCollection.size());
@@ -207,10 +179,8 @@
// validate
cookieCollection = tester.getServletResponse().getCookies();
Assert.assertEquals(4, cookieCollection.size());
- Iterator iter = cookieCollection.iterator();
- while (iter.hasNext())
+ for (Cookie cookie : cookieCollection)
{
- Cookie cookie = (Cookie)iter.next();
Assert.assertNotNull(page.get(cookie.getName()));
Assert.assertEquals(cookie.getMaxAge(), 0);
}
