Revision: 6651 Author: j...@google.com Date: Wed Nov 4 10:52:58 2009 Log: Merge of /trunk c6650.
http://code.google.com/p/google-web-toolkit/source/detail?r=6651 Modified: /releases/2.0/user/src/com/google/gwt/user/client/ui/CustomButton.java /releases/2.0/user/test/com/google/gwt/user/client/ui/CustomButtonTest.java ======================================= --- /releases/2.0/user/src/com/google/gwt/user/client/ui/CustomButton.java Wed Nov 4 10:24:42 2009 +++ /releases/2.0/user/src/com/google/gwt/user/client/ui/CustomButton.java Wed Nov 4 10:52:58 2009 @@ -804,6 +804,7 @@ protected void onDetach() { super.onDetach(); cleanupCaptureState(); + setHovering(false); } /** ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/CustomButtonTest.java Fri Feb 6 13:06:24 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/CustomButtonTest.java Wed Nov 4 10:52:58 2009 @@ -34,13 +34,36 @@ * Test for <code>PushButton</code> as most of this widget's functionality is UI * based, the primary test will be in the new UI testing framework once it is * released. - * */ public class CustomButtonTest extends GWTTestCase { public String getModuleName() { return "com.google.gwt.user.User"; } + + public void testCleanupOnRemoval() { + PushButton pb = new PushButton(); + ToggleButton tb = new ToggleButton(); + + RootPanel.get().add(pb); + RootPanel.get().add(tb); + + // Synthesize mouse-over events to get both buttons into the 'hover' state. + pb.getElement().dispatchEvent( + Document.get().createMouseOverEvent(1, 0, 0, 0, 0, false, false, false, + false, Event.BUTTON_LEFT, null)); + tb.getElement().dispatchEvent( + Document.get().createMouseOverEvent(1, 0, 0, 0, 0, false, false, false, + false, Event.BUTTON_LEFT, null)); + assertTrue(pb.isHovering()); + assertTrue(tb.isHovering()); + + // Remove the buttons. The hover state should be cleared. + pb.removeFromParent(); + tb.removeFromParent(); + assertFalse(pb.isHovering()); + assertFalse(tb.isHovering()); + } public void testCSS() { ToggleButton b = new ToggleButton("up", "down"); @@ -125,6 +148,33 @@ } } + public void testSyntheticClick() { + PushButton b = new PushButton(); + final ArrayList<String> events = new ArrayList<String>(); + + b.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent event) { + events.add(event.getNativeEvent().getType()); + } + }); + + RootPanel.get().add(b); + + // Synthesize over/down/up events, which should kick off CustomButton's + // internal machinery to synthesize a click. + b.getElement().dispatchEvent( + Document.get().createMouseOverEvent(1, 0, 0, 0, 0, false, false, false, + false, Event.BUTTON_LEFT, null)); + b.getElement().dispatchEvent( + Document.get().createMouseDownEvent(1, 0, 0, 0, 0, false, false, false, + false, Event.BUTTON_LEFT)); + b.getElement().dispatchEvent( + Document.get().createMouseUpEvent(1, 0, 0, 0, 0, false, false, false, + false, Event.BUTTON_LEFT)); + assertEquals("Expecting one click event", 1, events.size()); + assertEquals("Expecting one click event", "click", events.get(0)); + } + public void testTransitions() { ToggleButton b = new ToggleButton("transitions"); @@ -159,31 +209,4 @@ assertFalse(b.isDown()); assertFalse(b.isEnabled()); } - - public void testSyntheticClick() { - PushButton b = new PushButton(); - final ArrayList<String> events = new ArrayList<String>(); - - b.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - events.add(event.getNativeEvent().getType()); - } - }); - - RootPanel.get().add(b); - - // Synthesize over/down/up events, which should kick off CustomButton's - // internal machinery to synthesize a click. - b.getElement().dispatchEvent( - Document.get().createMouseOverEvent(1, 0, 0, 0, 0, false, false, false, - false, Event.BUTTON_LEFT, null)); - b.getElement().dispatchEvent( - Document.get().createMouseDownEvent(1, 0, 0, 0, 0, false, false, false, - false, Event.BUTTON_LEFT)); - b.getElement().dispatchEvent( - Document.get().createMouseUpEvent(1, 0, 0, 0, 0, false, false, false, - false, Event.BUTTON_LEFT)); - assertEquals("Expecting one click event", 1, events.size()); - assertEquals("Expecting one click event", "click", events.get(0)); - } -} +} --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
