Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/HrefTest.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/HrefTest.java?view=diff&rev=512501&r1=512500&r2=512501 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/HrefTest.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/HrefTest.java Tue Feb 27 15:49:50 2007 @@ -19,7 +19,7 @@ import wicket.WicketTestCase; /** - * Simple application that demonstrates the mock http application code (and + * Simple tester that demonstrates the mock http application code (and * checks that it is working) * * @author Chris Turner @@ -47,7 +47,7 @@ public void testRenderHomePage_1() throws Exception { tester.getApplication().getMarkupSettings().setStripWicketTags(false); - executeTest(Href_1.class, "HrefExpectedResult_1.html"); + executeTest(Href_1.class, "HrefExpectedResult_1.html"); } /** @@ -58,7 +58,7 @@ public void testRenderHomePage_2() throws Exception { tester.getApplication().getMarkupSettings().setStripWicketTags(true); - executeTest(Href_1.class, "HrefExpectedResult_1-1.html"); + executeTest(Href_1.class, "HrefExpectedResult_1-1.html"); } /** @@ -69,7 +69,7 @@ public void testRenderHomePage_2a() throws Exception { tester.getApplication().getMarkupSettings().setStripWicketTags(true); - executeTest(Href_2.class, "HrefExpectedResult_2.html"); + executeTest(Href_2.class, "HrefExpectedResult_2.html"); } /** @@ -79,6 +79,6 @@ */ public void testRenderHomePage_3() throws Exception { - executeTest(Href_3.class, "HrefExpectedResult_3.html"); + executeTest(Href_3.class, "HrefExpectedResult_3.html"); } }
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_1.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_1.java?view=diff&rev=512501&r1=512500&r2=512501 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_1.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_1.java Tue Feb 27 15:49:50 2007 @@ -22,19 +22,19 @@ /** * Mock page for testing. - * + * * @author Chris Turner */ -public class Href_1 extends WebPage +public class Href_1 extends WebPage { private static final long serialVersionUID = 1L; /** * Constructt */ - public Href_1() + public Href_1() { - add(new WebMarkupContainer("link1")); - add(new WebMarkupContainer("link2")); - } + add(new WebMarkupContainer("link1")); + add(new WebMarkupContainer("link2")); + } } Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_2.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_2.java?view=diff&rev=512501&r1=512500&r2=512501 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_2.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_2.java Tue Feb 27 15:49:50 2007 @@ -17,10 +17,9 @@ package wicket.markup.html.link; - /** * Mock page for testing. - * + * * @author Chris Turner */ public class Href_2 extends Href_1 @@ -31,8 +30,8 @@ * Construct. * */ - public Href_2() + public Href_2() { - - } + + } } Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_3.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_3.java?view=diff&rev=512501&r1=512500&r2=512501 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_3.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Href_3.java Tue Feb 27 15:49:50 2007 @@ -22,10 +22,10 @@ /** * Mock page for testing. - * + * * @author Chris Turner */ -public class Href_3 extends WebPage +public class Href_3 extends WebPage { private static final long serialVersionUID = 1L; @@ -33,9 +33,9 @@ * Construct. * */ - public Href_3() + public Href_3() { - add(new WebMarkupContainer("link1")); - add(new WebMarkupContainer("link2").setVisible(false)); - } + add(new WebMarkupContainer("link1")); + add(new WebMarkupContainer("link2").setVisible(false)); + } } Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java?view=diff&rev=512501&r1=512500&r2=512501 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/IndexedParamUrlCodingTest.java Tue Feb 27 15:49:50 2007 @@ -33,42 +33,53 @@ /** * Construct. + * * @param name */ public IndexedParamUrlCodingTest(String name) { super(name); } - + /** * @throws Exception */ public void testIndexedLink() throws Exception { - tester.getApplication().mount("/test1", new IndexedParamUrlCodingStrategy("/test1",BookmarkableHomePageLinksPage.class,null)); - tester.getApplication().mount("/test2", new IndexedParamUrlCodingStrategy("/test2",BookmarkableHomePageLinksPage.class,"mypagemap")); - + tester.getApplication().mount( + "/test1", + new IndexedParamUrlCodingStrategy("/test1", BookmarkableHomePageLinksPage.class, + null)); + tester.getApplication().mount( + "/test2", + new IndexedParamUrlCodingStrategy("/test2", BookmarkableHomePageLinksPage.class, + "mypagemap")); + tester.setupRequestAndResponse(); WebRequestCycle cycle = tester.createRequestCycle(); - + PageParameters parameters = new PageParameters(); parameters.add("0", "Integer0"); parameters.add("1", "Integer1"); - - String url1 = cycle.urlFor(new BookmarkablePageRequestTarget(BookmarkableHomePageLinksPage.class,parameters)).toString(); - String url2 = cycle.urlFor(new BookmarkablePageRequestTarget("mypagemap",BookmarkableHomePageLinksPage.class,parameters)).toString(); + + String url1 = cycle.urlFor( + new BookmarkablePageRequestTarget(BookmarkableHomePageLinksPage.class, parameters)) + .toString(); + String url2 = cycle.urlFor( + new BookmarkablePageRequestTarget("mypagemap", BookmarkableHomePageLinksPage.class, + parameters)).toString(); assertEquals("test1/Integer0/Integer1", url1); assertEquals("test2/Integer0/Integer1/wicket:pageMapName/mypagemap", url2); - + tester.setupRequestAndResponse(); tester.getServletRequest().setURL("/" + url1); cycle = tester.createRequestCycle(); IRequestCodingStrategy encoder = cycle.getProcessor().getRequestCodingStrategy(); - + RequestParameters requestParameters = encoder.decode(tester.getWicketRequest()); - + IRequestTarget target1 = cycle.getProcessor().resolve(cycle, requestParameters); - if(target1 instanceof BookmarkablePageRequestTarget) + if (target1 instanceof BookmarkablePageRequestTarget) { assertNull(((BookmarkablePageRequestTarget)target1).getPageMapName()); } @@ -76,17 +87,17 @@ { fail("url: " + url1 + " wasn't resolved to a bookmarkable target: " + target1); } - + tester.setupRequestAndResponse(); tester.getServletRequest().setURL("/" + url2); cycle = tester.createRequestCycle(); encoder = cycle.getProcessor().getRequestCodingStrategy(); - + requestParameters = encoder.decode(tester.getWicketRequest()); - + IRequestTarget target2 = cycle.getProcessor().resolve(cycle, requestParameters); - - if(target2 instanceof BookmarkablePageRequestTarget) + + if (target2 instanceof BookmarkablePageRequestTarget) { assertEquals("mypagemap", ((BookmarkablePageRequestTarget)target2).getPageMapName()); } @@ -95,5 +106,4 @@ fail("url: " + url2 + " wasn't resolved to a bookmarkable target: " + target2); } } - } Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Page1.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Page1.java?view=diff&rev=512501&r1=512500&r2=512501 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Page1.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/Page1.java Tue Feb 27 15:49:50 2007 @@ -21,10 +21,10 @@ /** * Mock page for testing autolinks - * + * * @author Chris Turner */ -public class Page1 extends WebPage +public class Page1 extends WebPage { private static final long serialVersionUID = 1L; @@ -32,7 +32,7 @@ * Construct. * */ - public Page1() + public Page1() { - } + } } Modified: incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/XmlPage.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/XmlPage.java?view=diff&rev=512501&r1=512500&r2=512501 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/XmlPage.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/link/XmlPage.java Tue Feb 27 15:49:50 2007 @@ -21,10 +21,10 @@ /** * Mock page for testing. - * + * * @author Chris Turner */ -public class XmlPage extends WebPage +public class XmlPage extends WebPage { private static final long serialVersionUID = 1L; @@ -32,10 +32,10 @@ * Construct. * */ - public XmlPage() + public XmlPage() { - } - + } + /** * * @return string
