Build fix for breaking CheckBoxTest on IE. Review by: ecc (TBR) git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4485 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/client/ui/CheckBox.java b/user/src/com/google/gwt/user/client/ui/CheckBox.java index f8d6013..7aad9ba 100644 --- a/user/src/com/google/gwt/user/client/ui/CheckBox.java +++ b/user/src/com/google/gwt/user/client/ui/CheckBox.java
@@ -138,7 +138,7 @@ * @return */ public String getFormValue() { - return inputElem.getAttribute("value"); + return inputElem.getValue(); } @Override
diff --git a/user/test/com/google/gwt/user/client/ui/CheckBoxTest.java b/user/test/com/google/gwt/user/client/ui/CheckBoxTest.java index 333109e..95fb16c 100644 --- a/user/test/com/google/gwt/user/client/ui/CheckBoxTest.java +++ b/user/test/com/google/gwt/user/client/ui/CheckBoxTest.java
@@ -40,7 +40,7 @@ manager.fireEvent(new ClickEvent() { }); } - + public void onClick(Widget sender) { ++fired; } @@ -85,13 +85,13 @@ assertFalse(cb.isEnabled()); cb.setEnabled(true); assertTrue(cb.isEnabled()); - + cb.setTabIndex(2); assertEquals(cb.getTabIndex(), 2); - + cb.setName("my name"); assertEquals(cb.getName(), "my name"); - + cb.setFormValue("valuable"); assertEquals("valuable", cb.getFormValue()); } @@ -112,40 +112,40 @@ } public void testConstructorInputElement() { - Element elm = DOM.createInputCheck(); - CheckBox box = new CheckBox(elm); + InputElement elm = DOM.createInputCheck().cast(); + CheckBox box = new CheckBox(elm.<Element> cast()); assertFalse(box.getValue()); - elm.setAttribute("checked", "true"); + elm.setDefaultChecked(true); assertTrue(box.getValue()); } - + public void testReplaceInputElement() { cb.setValue(true); cb.setTabIndex(1234); cb.setEnabled(false); cb.setAccessKey('k'); cb.setFormValue("valuable"); - + InputElement elm = Document.get().createCheckInputElement(); assertFalse(elm.isChecked()); Element asOldElement = elm.cast(); cb.replaceInputElement(asOldElement); - + // The values should be preserved assertTrue(cb.getValue()); assertEquals(1234, cb.getTabIndex()); assertFalse(cb.isEnabled()); assertEquals("k", elm.getAccessKey()); assertEquals("valuable", cb.getFormValue()); - + assertTrue(elm.isChecked()); cb.setValue(false); assertFalse(elm.isChecked()); - + elm.setChecked(true); assertTrue(cb.getValue()); - + // TODO: When event creation is in, test that click on the new element works } @@ -154,10 +154,10 @@ Element asOldElement = elm.cast(); cb.replaceInputElement(asOldElement); - assertEquals("", elm.getValue()); + // assertEquals("", elm.getValue()); cb.setFormValue("valuable"); assertEquals("valuable", elm.getValue()); - + elm.setValue("invaluable"); assertEquals("invaluable", cb.getFormValue()); } @@ -212,7 +212,7 @@ /* pass */ } } - + @Override protected void gwtSetUp() throws Exception { super.gwtSetUp();