Updated Branches: refs/heads/wicket-6.x 8808dd8f2 -> 6c37c6604
tweak for WICKET-5411 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6c37c660 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6c37c660 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6c37c660 Branch: refs/heads/wicket-6.x Commit: 6c37c6604b6358b6a9d836770445744ed2b51293 Parents: 8808dd8 Author: Igor Vaynberg <[email protected]> Authored: Tue Nov 26 08:16:39 2013 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Tue Nov 26 08:16:39 2013 -0800 ---------------------------------------------------------------------- .../apache/wicket/markup/html/form/AutoFormLabelPickupTest.java | 4 ++-- .../apache/wicket/markup/html/form/AutoLabelWithContentTest.java | 4 ++-- .../wicket/markup/html/form/AutoLabelWithinEnclosureTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6c37c660/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java index b47f570..caa592b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java @@ -65,14 +65,14 @@ public class AutoFormLabelPickupTest extends WicketTestCase public void labelIsPrintedFromModel() throws Exception { tester.startPage(new PrintLabelPage(Model.of("label from model"))); - tester.assertContains("<label wicket:for=\"input\" for=\"input2\" id=\"input2-w-lbl\">\\|label from model\\|</label>"); + tester.assertContains("<label wicket:for=\"input\" id=\"input2-w-lbl\" for=\"input2\">\\|label from model\\|</label>"); } @Test public void labelIsPrintedFromProperties() throws Exception { tester.startPage(new PrintLabelPage(Model.of((String)null))); - tester.assertContains("<label wicket:for=\"input\" for=\"input2\" id=\"input2-w-lbl\">\\|label from properties\\|</label>"); + tester.assertContains("<label wicket:for=\"input\" id=\"input2-w-lbl\" for=\"input2\">\\|label from properties\\|</label>"); } @Test http://git-wip-us.apache.org/repos/asf/wicket/blob/6c37c660/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java index 303fa83..1f66dcc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithContentTest.java @@ -45,7 +45,7 @@ public class AutoLabelWithContentTest extends WicketTestCase public void labelWithMessage() throws Exception { tester.startPage(LabelWithMessagePage.class); - tester.assertContains("<label wicket:for=\"textfield\" for=\"textfield2\" id=\"textfield2-w-lbl\"><wicket:message key=\"foo\">my test text</wicket:message></label>"); + tester.assertContains("<label wicket:for=\"textfield\" id=\"textfield2-w-lbl\" for=\"textfield2\"><wicket:message key=\"foo\">my test text</wicket:message></label>"); } public static class LabelWithNestedComponentsPage extends WebPage @@ -62,6 +62,6 @@ public class AutoLabelWithContentTest extends WicketTestCase public void labelWithNestedComponent() { tester.startPage(LabelWithNestedComponentsPage.class); - tester.assertContains("<label wicket:for=\"textfield\" for=\"textfield2\" id=\"textfield2-w-lbl\"><input type=\"text\" wicket:id=\"textfield\" value=\"\" name=\"textfield\" id=\"textfield2\"/></label>"); + tester.assertContains("<label wicket:for=\"textfield\" id=\"textfield2-w-lbl\" for=\"textfield2\"><input type=\"text\" wicket:id=\"textfield\" value=\"\" name=\"textfield\" id=\"textfield2\"/></label>"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/6c37c660/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java index 5429900..ed4c5d9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoLabelWithinEnclosureTest.java @@ -46,7 +46,7 @@ public class AutoLabelWithinEnclosureTest extends WicketTestCase { tester.startPage(new LabelWithinEnclosurePage(true)); tester.dumpPage(); - tester.assertContains("<label wicket:for=\"textfield\" for=\"textfield2\" id=\"textfield2-w-lbl\">blabla</label>"); + tester.assertContains("<label wicket:for=\"textfield\" id=\"textfield2-w-lbl\" for=\"textfield2\">blabla</label>"); } @Test
