Revision: 6537 Author: amitman...@google.com Date: Wed Oct 28 19:23:32 2009 Log: Merged c6472, c6476, c6523, and c6536 from trunk
Patch by: amitmanjhi http://code.google.com/p/google-web-toolkit/source/detail?r=6537 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java /releases/2.0/user/src/com/google/gwt/junit/BatchingStrategy.java /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java /releases/2.0/user/src/com/google/gwt/junit/Platform.java /releases/2.0/user/test/com/google/gwt/core/client/impl/StackTraceCreatorTest.java /releases/2.0/user/test/com/google/gwt/dev/jjs/test/RunAsyncMetricsIntegrationTest.java /releases/2.0/user/test/com/google/gwt/dom/client/ElementTest.java /releases/2.0/user/test/com/google/gwt/dom/client/MapTests.java /releases/2.0/user/test/com/google/gwt/dom/client/NodeTest.java /releases/2.0/user/test/com/google/gwt/dom/client/StyleInjectorTest.java /releases/2.0/user/test/com/google/gwt/emultest/java/lang/StringTest.java /releases/2.0/user/test/com/google/gwt/event/dom/client/DomEventTest.java /releases/2.0/user/test/com/google/gwt/http/client/RequestBuilderTest.java /releases/2.0/user/test/com/google/gwt/uibinder/sample/client/UiBinderTest.java /releases/2.0/user/test/com/google/gwt/user/client/EventTest.java /releases/2.0/user/test/com/google/gwt/user/client/WindowTest.java /releases/2.0/user/test/com/google/gwt/user/client/rpc/UnicodeEscapingTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/AbsolutePanelTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/AnchorTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/ButtonTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/CheckBoxTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/CreateEventTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMRtlTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/DateBoxTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/DeckPanelTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/DialogBoxTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/HistoryTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/ImageTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/ListBoxTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/MenuBarTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/PopupTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/RichTextAreaTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/SimpleRadioButtonTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/StackPanelTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/SuggestBoxTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/TextAreaTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/TextBoxBaseTestBase.java /releases/2.0/user/test/com/google/gwt/user/client/ui/TreeTest.java /releases/2.0/user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java /releases/2.0/user/test/com/google/gwt/xml/client/XMLTest.java ======================================= --- /releases/2.0/branch-info.txt Wed Oct 28 17:14:14 2009 +++ /releases/2.0/branch-info.txt Wed Oct 28 19:23:32 2009 @@ -105,3 +105,12 @@ Fixes a very obscure bug in ControlFlowAnalyzer. svn merge --ignore-ancestry -c6532 http://google-web-toolkit.googlecode.com/svn/trunk/ . +tr...@6472, @6476, @6523, @6536 were merged into this branch + Update the collection of tests that are ignored on HtmlUnit to reflect HtmlUnit update to 2.7-snapshot (6472) + Updated Htmlunit to HtmlUnit (uppercase U) (6475) + Adjust test timeout value based on Batching Strategy (6523) + Remove all enqueued JS jobs during a module transition -- HtmlUnit plugin (r6536) + svn merge --ignore-ancestry -c 6472 https://google-web-toolkit.googlecode.com/svn/trunk/ . + svn merge --ignore-ancestry -c 6476 https://google-web-toolkit.googlecode.com/svn/trunk/ . + svn merge --ignore-ancestry -c 6523 https://google-web-toolkit.googlecode.com/svn/trunk/ . + svn merge --ignore-ancestry -c 6536 https://google-web-toolkit.googlecode.com/svn/trunk/ . ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java Fri Oct 16 20:54:44 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java Wed Oct 28 19:23:32 2009 @@ -24,6 +24,7 @@ import com.google.gwt.dev.util.log.PrintWriterTreeLogger; import com.gargoylesoftware.htmlunit.ScriptResult; +import com.gargoylesoftware.htmlunit.WebWindow; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine; import com.gargoylesoftware.htmlunit.javascript.host.Window; @@ -209,8 +210,11 @@ currentUrl = getUrlBeforeHash(currentUrl); String newUrl = getUrlBeforeHash((String) args[0].getValue()); if (!newUrl.equals(currentUrl)) { - // TODO: removeAllJobs for all windows? - window.getWebWindow().getTopWindow().getJobManager().removeAllJobs(); + WebWindow webWindow = window.getWebWindow(); + do { + webWindow.getJobManager().removeAllJobs(); + webWindow = webWindow.getParentWindow(); + } while (webWindow != webWindow.getTopWindow()); } } result = jsEngine.callFunction(htmlPage, jsFunction, jsContext, window, ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/BatchingStrategy.java Thu Oct 1 10:34:33 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/BatchingStrategy.java Wed Oct 28 19:23:32 2009 @@ -71,6 +71,15 @@ toExecute.removeAll(toRemove); return toExecute; } + + /** + * Returns the multiplicative factor for adjusting the timeout. Default value + * of 1 for no batching. + */ + protected int getTimeoutMultiplier() { + return 1; + } + } /** @@ -130,6 +139,11 @@ public boolean isSingleTestOnly() { return false; } + + @Override + protected int getTimeoutMultiplier() { + return 4; + } } /** @@ -151,4 +165,9 @@ public boolean isSingleTestOnly() { return false; } -} + + @Override + protected int getTimeoutMultiplier() { + return 4; + } +} ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Wed Oct 28 13:23:35 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Wed Oct 28 19:23:32 2009 @@ -330,9 +330,9 @@ /** * The amount of time to wait for all clients to complete a single test * method, in milliseconds, measured from when the <i>last</i> client connects - * (and thus starts the test). 20 minutes. + * (and thus starts the test). default of 5 minutes. */ - private static final long TEST_METHOD_TIMEOUT_MILLIS = 4 * 300000; + private static final long TEST_METHOD_TIMEOUT_MILLIS = 300000; /** * Singleton object for hosting unit tests. All test case instances executed @@ -529,6 +529,11 @@ * Determines how to batch up tests for execution. */ private BatchingStrategy batchingStrategy = new NoBatchingStrategy(); + + /** + * Timeout in presence of batching. reassigned later. + */ + private long testBatchingMethodTimeoutMillis = TEST_METHOD_TIMEOUT_MILLIS; /** * Determines how modules are compiled. @@ -729,13 +734,13 @@ */ lastModule = currentModule; if (testMethodTimeout == 0) { - testMethodTimeout = currentTimeMillis + TEST_METHOD_TIMEOUT_MILLIS; + testMethodTimeout = currentTimeMillis + testBatchingMethodTimeoutMillis; } else if (testMethodTimeout < currentTimeMillis) { double elapsed = (currentTimeMillis - testBeginTime) / 1000.0; throw new TimeoutException( "The browser did not complete the test method " + currentTestInfo.toString() + " in " - + TEST_METHOD_TIMEOUT_MILLIS + + testBatchingMethodTimeoutMillis + "ms.\n We have no results from:\n" + messageQueue.getWorkingClients(currentTestInfo) + "Actual time elapsed: " + elapsed + " seconds.\n"); @@ -862,7 +867,7 @@ // TODO (amitmanjhi): Remove this hard-coding. A RunStyle somehow needs to // specify how it interacts with the platforms. return runStyle instanceof RunStyleHtmlUnit - && bannedPlatforms.contains(Platform.Htmlunit); + && bannedPlatforms.contains(Platform.HtmlUnit); } private void processTestResult(TestCase testCase, TestResult testResult, @@ -915,6 +920,8 @@ private void runTestImpl(GWTTestCase testCase, TestResult testResult) throws UnableToCompleteException { + testBatchingMethodTimeoutMillis = batchingStrategy.getTimeoutMultiplier() + * TEST_METHOD_TIMEOUT_MILLIS; if (mustNotExecuteTest(getBannedPlatforms(testCase.getClass(), testCase.getName()))) { return; ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/Platform.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/Platform.java Wed Oct 28 19:23:32 2009 @@ -18,9 +18,9 @@ /** * An enum to indicate the Platform where a test should run. In general, it * should be able to represent a large matrix such as: Browser * Os_combo * - * {hosted, web} * {htmlunit, actual_browser}. For now, we just distinguish - * between Htmlunit and non-Htmlunit platforms. + * {hosted, web} * {htmlUnit, actual_browser}. For now, we just distinguish + * between HtmlUnit and non-HtmlUnit platforms. */ public enum Platform { - Htmlunit -} + HtmlUnit +} ======================================= --- /releases/2.0/user/test/com/google/gwt/core/client/impl/StackTraceCreatorTest.java Thu Aug 20 05:47:14 2009 +++ /releases/2.0/user/test/com/google/gwt/core/client/impl/StackTraceCreatorTest.java Wed Oct 28 19:23:32 2009 @@ -65,7 +65,7 @@ /** * Just make sure that reentrant behavior doesn't fail. */ - @DoNotRunWith(value = {Platform.Htmlunit}) + @DoNotRunWith(value = {Platform.HtmlUnit}) public static void testReentrantCalls() { if (!GWT.isScript()) { // sample is useless in hosted mode @@ -82,7 +82,7 @@ assertEquals(start, end); } - @DoNotRunWith(value = {Platform.Htmlunit}) + @DoNotRunWith(value = {Platform.HtmlUnit}) public static void testStackTraces() { JsArrayString start = sample(); ======================================= --- /releases/2.0/user/test/com/google/gwt/dev/jjs/test/RunAsyncMetricsIntegrationTest.java Fri Aug 28 14:37:20 2009 +++ /releases/2.0/user/test/com/google/gwt/dev/jjs/test/RunAsyncMetricsIntegrationTest.java Wed Oct 28 19:23:32 2009 @@ -34,9 +34,7 @@ * number of more detailed tests are in * {...@link com.google.gwt.core.client.impl.AsyncFragmentLoaderTest}. * - * This test is flaky on HtmlUnit. */ -...@donotrunwith(Platform.Htmlunit) public class RunAsyncMetricsIntegrationTest extends GWTTestCase { private static final class LightweightMetricsEvent extends JavaScriptObject { protected LightweightMetricsEvent() { @@ -123,6 +121,7 @@ lwmObserver.uninstall(); } + @DoNotRunWith(Platform.HtmlUnit) public void testMetricsSignalled() { if (!GWT.isScript()) { // There are no runAsync lightweight metrics in hosted mode ======================================= --- /releases/2.0/user/test/com/google/gwt/dom/client/ElementTest.java Tue Oct 13 16:57:19 2009 +++ /releases/2.0/user/test/com/google/gwt/dom/client/ElementTest.java Wed Oct 28 19:23:32 2009 @@ -218,7 +218,7 @@ /** * scroll[Left|Top], getAbsolute[Left|Top]. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testGetAbsolutePositionWhenBodyScrolled() { Document doc = Document.get(); BodyElement body = doc.getBody(); @@ -375,7 +375,7 @@ /** * offset[Left|Top|Width|Height], offsetParent. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testOffsets() { DivElement outer = Document.get().createDivElement(); DivElement middle = Document.get().createDivElement(); @@ -462,7 +462,7 @@ /** * Tests that scrollLeft behaves as expected in RTL mode. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testScrollLeftInRtl() { final DivElement outer = Document.get().createDivElement(); final DivElement inner = Document.get().createDivElement(); @@ -528,7 +528,7 @@ */ // TODO (amitmanjhi): Remove annotation after updating HtmlUnit. kprobst says // the issue has been fixed in htmlUnit trunk - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testSetInnerText() { Document doc = Document.get(); @@ -556,7 +556,6 @@ /** * style. */ - @DoNotRunWith({Platform.Htmlunit}) public void testStyle() { DivElement div = Document.get().createDivElement(); @@ -570,7 +569,6 @@ /** * Test that styles only allow camelCase. */ - @DoNotRunWith({Platform.Htmlunit}) public void testStyleCamelCase() { DivElement div = Document.get().createDivElement(); ======================================= --- /releases/2.0/user/test/com/google/gwt/dom/client/MapTests.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/dom/client/MapTests.java Wed Oct 28 19:23:32 2009 @@ -15,8 +15,6 @@ */ package com.google.gwt.dom.client; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; /** @@ -32,7 +30,6 @@ /** * getAreas. */ - @DoNotRunWith({Platform.Htmlunit}) public void testGetArea() { Document doc = Document.get(); MapElement map = doc.createMapElement(); ======================================= --- /releases/2.0/user/test/com/google/gwt/dom/client/NodeTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/dom/client/NodeTest.java Wed Oct 28 19:23:32 2009 @@ -16,8 +16,6 @@ package com.google.gwt.dom.client; import com.google.gwt.core.client.JavaScriptObject; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; /** @@ -155,7 +153,6 @@ /** * isOrHasChild. */ - @DoNotRunWith({Platform.Htmlunit}) public void testIsOrHasChild() { Document doc = Document.get(); DivElement div = doc.createDivElement(); ======================================= --- /releases/2.0/user/test/com/google/gwt/dom/client/StyleInjectorTest.java Fri Oct 16 15:58:05 2009 +++ /releases/2.0/user/test/com/google/gwt/dom/client/StyleInjectorTest.java Wed Oct 28 19:23:32 2009 @@ -33,7 +33,7 @@ return "com.google.gwt.dom.DOMTest"; } - @DoNotRunWith(value = {Platform.Htmlunit}) + @DoNotRunWith(value = {Platform.HtmlUnit}) @SuppressWarnings("deprecation") public void testOldMethods() { final DivElement elt = Document.get().createDivElement(); @@ -62,7 +62,7 @@ /** * Ensure that the IE createStyleSheet compatibility code is exercised. */ - @DoNotRunWith(value = {Platform.Htmlunit}) + @DoNotRunWith(value = {Platform.HtmlUnit}) @SuppressWarnings("deprecation") public void testOldMethodsWithLotsOfStyles() { StyleElement[] elements = new StyleElement[100]; @@ -94,12 +94,12 @@ }); } - @DoNotRunWith(value = {Platform.Htmlunit}) + @DoNotRunWith(value = {Platform.HtmlUnit}) public void testStyleInjectorBatched() { testStyleInjector("testStyleInjectorBatched", false); } - @DoNotRunWith(value = {Platform.Htmlunit}) + @DoNotRunWith(value = {Platform.HtmlUnit}) public void testStyleInjectorImmediate() { testStyleInjector("testStyleInjectorImmediate", true); } ======================================= --- /releases/2.0/user/test/com/google/gwt/emultest/java/lang/StringTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/emultest/java/lang/StringTest.java Wed Oct 28 19:23:32 2009 @@ -364,7 +364,7 @@ assertEquals("ABABAB", testStr.replace('\u1111', 'A')); } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testReplaceAll() { String regex = hideFromCompiler("*[").replaceAll( "([/\\\\\\.\\*\\+\\?\\|\\(\\)\\[\\]\\{\\}])", "\\\\$1"); @@ -389,7 +389,7 @@ assertEquals("$$x$", x5.replaceAll("(x)", "\\$\\$$1\\$")); } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testReplaceString() { assertEquals("foobar", hideFromCompiler("bazbar").replace("baz", "foo")); assertEquals("$0bar", hideFromCompiler("foobar").replace("foo", "$0")); ======================================= --- /releases/2.0/user/test/com/google/gwt/event/dom/client/DomEventTest.java Tue Oct 13 16:57:19 2009 +++ /releases/2.0/user/test/com/google/gwt/event/dom/client/DomEventTest.java Wed Oct 28 19:23:32 2009 @@ -20,8 +20,6 @@ import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HandlerTestBase; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.RootPanel; @@ -133,7 +131,6 @@ "onDoubleClick"); } - @DoNotRunWith({Platform.Htmlunit}) public void testMouseEventCoordinates() { Button b = new Button(); RootPanel.get().add(b); ======================================= --- /releases/2.0/user/test/com/google/gwt/http/client/RequestBuilderTest.java Tue Sep 29 12:15:40 2009 +++ /releases/2.0/user/test/com/google/gwt/http/client/RequestBuilderTest.java Wed Oct 28 19:23:32 2009 @@ -92,7 +92,7 @@ * <li>url == "www.freebsd.org" - violates same source * </ul> */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testRequestBuilderStringString() throws RequestException { try { new RequestBuilder((RequestBuilder.Method) null, null); ======================================= --- /releases/2.0/user/test/com/google/gwt/uibinder/sample/client/UiBinderTest.java Tue Oct 27 00:00:07 2009 +++ /releases/2.0/user/test/com/google/gwt/uibinder/sample/client/UiBinderTest.java Wed Oct 28 19:23:32 2009 @@ -236,7 +236,7 @@ WidgetBasedUi.Style style(); } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testNoOverrideInheritedSharedCssClasses() { Bundle bundle = GWT.create(Bundle.class); WidgetBasedUi ui = GWT.create(WidgetBasedUi.class); @@ -278,7 +278,6 @@ widgetUi.totallyPrivateStyleSpan.getClassName().length() > 0); } - @DoNotRunWith(Platform.Htmlunit) public void testRadioButton() { RadioButton able = widgetUi.myRadioAble; RadioButton baker = widgetUi.myRadioBaker; @@ -357,7 +356,7 @@ assertNotNull(widgetUi.heartCursorResource.getUrl()); } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testCssImportedScopes() { assertEquals(100, widgetUi.cssImportScopeSample.inner.getOffsetWidth()); } ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/EventTest.java Fri Sep 18 10:54:47 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/EventTest.java Wed Oct 28 19:23:32 2009 @@ -155,7 +155,7 @@ * Test that a double click results in exactly one simulated click event in * IE. See issue 3392 for more info. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testDoubleClickEvent() { TestLabel label = new TestLabel(); RootPanel.get().add(label); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/WindowTest.java Mon Oct 12 14:48:21 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/WindowTest.java Wed Oct 28 19:23:32 2009 @@ -169,7 +169,7 @@ * Tests the ability of the Window to get the client size correctly with and * without visible scroll bars. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testGetClientSize() { // NOTE: We must clear the DOM here so that previous tests do not pollute @@ -205,7 +205,7 @@ /** * Tests the ability of scroll the Window and catch scroll events. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testScrolling() { // Force scroll bars to appear Window.enableScrolling(true); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/rpc/UnicodeEscapingTest.java Thu Oct 15 12:17:51 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/rpc/UnicodeEscapingTest.java Wed Oct 28 19:23:32 2009 @@ -202,7 +202,7 @@ * * Note that this does not test all possible combinations. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) // TODO(jat): decide if we really want to specify this behavior since some // browsers and OOPHM plugins have issues with it -- disabled for now public void disabled_testServerToClientBMPSurrogates() { ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/AbsolutePanelTest.java Wed Sep 23 10:15:52 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/AbsolutePanelTest.java Wed Oct 28 19:23:32 2009 @@ -38,7 +38,7 @@ absolutePanel.add(label, 10, 10); } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testPositioning() { // Make an absolute panel with a label at (3, 7). AbsolutePanel abs = new AbsolutePanel(); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/AnchorTest.java Thu Oct 8 14:22:37 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/AnchorTest.java Wed Oct 28 19:23:32 2009 @@ -19,8 +19,6 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.i18n.client.HasDirection; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.user.client.DOM; @@ -147,7 +145,6 @@ } } - @DoNotRunWith({Platform.Htmlunit}) public void testEvents() { Anchor anchor = new Anchor("Trigger obscure JavaScript things"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/ButtonTest.java Wed Sep 2 19:23:54 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/ButtonTest.java Wed Oct 28 19:23:32 2009 @@ -18,8 +18,6 @@ import com.google.gwt.dom.client.EventTarget; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; @@ -83,7 +81,6 @@ /** * Tests issues 1585 and 3962: a button shouldn't submit a form. */ - @DoNotRunWith(Platform.Htmlunit) public void testPushButton() { FormPanel f = new FormPanel(); f.setAction("javascript:''"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/CheckBoxTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/CheckBoxTest.java Wed Oct 28 19:23:32 2009 @@ -23,8 +23,6 @@ import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.HandlerManager; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; @@ -68,7 +66,6 @@ * Test accessors. */ @SuppressWarnings("deprecation") - @DoNotRunWith({Platform.Htmlunit}) public void testAccessors() { cb.setHTML("test HTML"); assertEquals(cb.getHTML(), "test HTML"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/CreateEventTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/CreateEventTest.java Wed Oct 28 19:23:32 2009 @@ -197,7 +197,6 @@ * Tests that {...@link Event#getCurrentEvent()} returns the right value for * synthesized events. */ - @DoNotRunWith({Platform.Htmlunit}) public void testGetCurrentEvent() { CurrentEventListener listener = new CurrentEventListener(); Event.setEventListener(child, listener); @@ -217,7 +216,6 @@ /** * Tests NativeEvent.stopPropagation(). */ - @DoNotRunWith({Platform.Htmlunit}) public void testStopPropagation() { NonBubbleAssertingEventListener listener = new NonBubbleAssertingEventListener( "click") { @@ -241,7 +239,7 @@ /** * Tests createBlurEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerBlurEvent() { NonBubbleAssertingEventListener listener = new NonBubbleAssertingEventListener( "blur") { @@ -261,7 +259,6 @@ /** * Tests createChangeEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) public void testTriggerChangeEvent() { BubbleAssertingEventListener listener = new BubbleAssertingEventListener( "change"); @@ -276,7 +273,7 @@ /** * Tests createClickEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerClickEvent() { BubbleAssertingEventListener listener = new BubbleAssertingEventListener( "click") { @@ -316,7 +313,7 @@ /** * Tests createDblClickEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerDblClickEvent() { BubbleAssertingEventListener listener = new BubbleAssertingEventListener( "dblclick") { @@ -347,7 +344,7 @@ /** * Tests createErrorEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerErrorEvent() { ImgEventListener listener = new ImgEventListener("error"); Event.setEventListener(parent, listener); @@ -361,7 +358,7 @@ /** * Tests createFocusEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerFocusEvent() { NonBubbleAssertingEventListener listener = new NonBubbleAssertingEventListener( "focus") { @@ -381,7 +378,7 @@ /** * Tests createKeyDownEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerKeyDownEvent() { KeyEventListener listener = new KeyEventListener("keydown"); Event.setEventListener(parent, listener); @@ -397,7 +394,7 @@ /** * Tests createKeyPressEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerKeyPressEvent() { KeyEventListener listener = new KeyEventListener("keypress"); Event.setEventListener(parent, listener); @@ -413,7 +410,7 @@ /** * Tests createKeyUpEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerKeyUpEvent() { KeyEventListener listener = new KeyEventListener("keyup"); Event.setEventListener(parent, listener); @@ -442,7 +439,7 @@ /** * Tests createMouseDownEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerMouseDownEvent() { MouseEventListener listener = new MouseEventListener("mousedown"); Event.setEventListener(parent, listener); @@ -459,7 +456,7 @@ /** * Tests createMouseMoveEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerMouseMoveEvent() { MouseEventListener listener = new MouseEventListener("mousemove"); Event.setEventListener(parent, listener); @@ -476,7 +473,7 @@ /** * Tests createMouseOutEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerMouseOutEvent() { MouseEventListener listener = new MouseEventListener("mouseout") { public void onBrowserEvent(Event event) { @@ -502,7 +499,7 @@ /** * Tests createMouseOverEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerMouseOverEvent() { MouseEventListener listener = new MouseEventListener("mouseover") { public void onBrowserEvent(Event event) { @@ -527,7 +524,7 @@ /** * Tests createMouseUpEvent(). */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testTriggerMouseUpEvent() { MouseEventListener listener = new MouseEventListener("mouseup"); Event.setEventListener(parent, listener); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMRtlTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMRtlTest.java Wed Oct 28 19:23:32 2009 @@ -36,7 +36,7 @@ * Tests {...@link DOM#getAbsoluteLeft(Element)} for consistency when the element * contains children and has scrollbars. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testGetAbsolutePositionWhenScrolled() { assertTrue(LocaleInfo.getCurrentLocale().isRTL()); final Element outer = DOM.createDiv(); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMTest.java Tue Oct 13 16:57:19 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMTest.java Wed Oct 28 19:23:32 2009 @@ -120,7 +120,6 @@ * Tests {...@link DOM#getAbsoluteLeft(Element)} and * {...@link DOM#getAbsoluteTop(Element)}. */ - @DoNotRunWith({Platform.Htmlunit}) public void testGetAbsolutePosition() { final int border = 8; final int margin = 9; @@ -157,7 +156,6 @@ * contains children and has scrollbars. See issue #1093 for more details. * */ - @DoNotRunWith({Platform.Htmlunit}) public void testGetAbsolutePositionWhenScrolled() { final Element outer = DOM.createDiv(); final Element inner = DOM.createDiv(); @@ -192,7 +190,6 @@ * element has a border. * */ - @DoNotRunWith({Platform.Htmlunit}) public void testGetAbsolutePositionWithPixelBorders() { final Element outer = DOM.createDiv(); final Element inner = DOM.createDiv(); @@ -223,7 +220,6 @@ * Tests getAbsoluteLeft/Top() for the document.body element. This used to * cause exceptions to be thrown on Opera (see issue 1556). */ - @DoNotRunWith({Platform.Htmlunit}) public void testGetBodyAbsolutePosition() { try { // The body's absolute left/top depends upon the browser, but we just @@ -271,7 +267,6 @@ * Tests that {...@link DOM#isOrHasChild(Element, Element)} works consistently * across browsers. */ - @DoNotRunWith({Platform.Htmlunit}) public void testIsOrHasChild() { Element div = DOM.createDiv(); Element childDiv = DOM.createDiv(); @@ -297,7 +292,7 @@ */ // TODO (amitmanjhi): Remove annotation after updating HtmlUnit. kprobst says // the issue has been fixed in htmlUnit trunk - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testSetInnerText() { Element tableElem = DOM.createTable(); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/DateBoxTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/DateBoxTest.java Wed Oct 28 19:23:32 2009 @@ -30,7 +30,7 @@ return "com.google.gwt.user.User"; } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testAccessors() { DateBox db = new DateBox(); assertFalse(db.isDatePickerShowing()); @@ -40,7 +40,7 @@ assertFalse(db.isDatePickerShowing()); } - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testValueChangeEvent() { // Checks setValue(date, true); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/DeckPanelTest.java Wed Sep 23 10:15:52 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/DeckPanelTest.java Wed Oct 28 19:23:32 2009 @@ -81,7 +81,7 @@ * Test that the offsetHeight/Width of a widget are defined when the widget is * added to the DeckPanel. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testWidgetOffsetDimensionsOnload() { DeckPanel deck = new DeckPanel(); RootPanel.get().add(deck); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/DialogBoxTest.java Wed Sep 30 16:46:38 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/DialogBoxTest.java Wed Oct 28 19:23:32 2009 @@ -87,7 +87,7 @@ assertFalse(dialogBox.isShowing()); } - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testDebugId() { DialogBox dBox = new DialogBox(); dBox.setAnimationEnabled(false); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/HistoryTest.java Wed Sep 30 16:46:38 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/HistoryTest.java Wed Oct 28 19:23:32 2009 @@ -95,7 +95,6 @@ * Tests against issue #879: Ensure that empty history tokens do not add * additional characters after the '#' symbol in the URL. */ - @DoNotRunWith(Platform.Htmlunit) public void testEmptyHistoryTokens() { delayTestFinish(5000); @@ -286,7 +285,7 @@ * Test that using an empty history token works properly. There have been * problems (see issue 2905) with this in the past on Safari. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testEmptyHistoryToken() { final ArrayList<Object> counter = new ArrayList<Object>(); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/ImageTest.java Tue Oct 13 16:57:19 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/ImageTest.java Wed Oct 28 19:23:32 2009 @@ -276,7 +276,7 @@ /** * Tests the creation of an image in clipped mode. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testCreateClippedImage() { final Image image = new Image("counting-forwards.png", 16, 16, 16, 16); @@ -361,7 +361,7 @@ * {...@link com.google.gwt.user.client.ui.Image#setUrlAndVisibleRect(String,int,int,int,int)} * on a clipped image. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testSetUrlAndVisibleRectOnClippedImage() { final Image image = new Image("counting-backwards.png", 12, 12, 12, 12); delayTestFinish(5000); @@ -412,7 +412,7 @@ * {...@link com.google.gwt.user.client.ui.Image#setVisibleRect(int,int,int,int)} * on a clipped image. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testSetVisibleRectAndLoadEventsOnClippedImage() { final Image image = new Image("counting-backwards.png", 16, 16, 16, 16); @@ -453,13 +453,7 @@ /** * Tests that wrapping an existing DOM element works if you call * setUrlAndVisibleRect() on it. - *<p> - * Disabled it on HtmlUnit because of a HtmlUnit bug. - * - * @see <a - * href="https://sourceforge.net/tracker/?func=detail&aid=2861064&group_id=47038&atid=448266";>bug_report</a> */ - @DoNotRunWith({Platform.Htmlunit}) public void testWrapThenSetUrlAndVisibleRect() { String uid = Document.get().createUniqueId(); DivElement div = Document.get().createDivElement(); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/ListBoxTest.java Sat Oct 24 08:11:35 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/ListBoxTest.java Wed Oct 28 19:23:32 2009 @@ -40,7 +40,7 @@ assertEquals(0, lb.getItemCount()); } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testDebugId() { ListBox list = new ListBox(); list.addItem("option0", "value0"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/MenuBarTest.java Wed Sep 30 16:46:38 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/MenuBarTest.java Wed Oct 28 19:23:32 2009 @@ -207,7 +207,7 @@ assertNull(bar.getSelectedItem()); } - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testDebugId() { Command emptyCommand = new Command() { public void execute() { ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/PopupTest.java Wed Sep 30 16:46:38 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/PopupTest.java Wed Oct 28 19:23:32 2009 @@ -27,7 +27,7 @@ /** * Tests for {...@link PopupPanel}. */ -...@donotrunwith(Platform.Htmlunit) +...@donotrunwith(Platform.HtmlUnit) public class PopupTest extends GWTTestCase { /** @@ -130,7 +130,7 @@ * Tests that a large PopupPanel is not positioned off the top or left edges * of the browser window, making part of the panel unreachable. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testCenterLargePopup() { PopupPanel popup = new PopupPanel(); popup.setHeight("4096px"); @@ -211,7 +211,7 @@ } } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testPopup() { // Get rid of window margins so we can test absolute position. Window.setMargin("0px"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/RichTextAreaTest.java Tue Oct 13 16:57:19 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/RichTextAreaTest.java Wed Oct 28 19:23:32 2009 @@ -40,7 +40,7 @@ * IE actually preserves dynamically-created iframe contents across DOM * removal/re-adding). */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testAddEditRemoveAdd() { final RichTextArea area = new RichTextArea(); delayTestFinish(RICH_TEXT_ASYNC_DELAY); @@ -89,7 +89,7 @@ } } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testFormatAfterInitialize() { final RichTextArea area = new RichTextArea(); @@ -126,7 +126,7 @@ } } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testFormatWhenHidden() { final RichTextArea area = new RichTextArea(); delayTestFinish(RICH_TEXT_ASYNC_DELAY); @@ -148,7 +148,7 @@ /** * See that the custom InitializeEvent fires. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testRichTextInitializeEvent() { delayTestFinish(RICH_TEXT_ASYNC_DELAY); final RichTextArea richTextArea = new RichTextArea(); @@ -164,7 +164,7 @@ * Test that a delayed set of HTML is reflected. Some platforms have timing * subtleties that need to be tested. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testSetHTMLAfterInit() { final RichTextArea richTextArea = new RichTextArea(); delayTestFinish(RICH_TEXT_ASYNC_DELAY); @@ -182,7 +182,7 @@ * Test that an immediate set of HTML is reflected immediately and after the * area loads. Some platforms have timing subtleties that need to be tested. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testSetHTMLBeforeInit() { final RichTextArea richTextArea = new RichTextArea(); delayTestFinish(RICH_TEXT_ASYNC_DELAY); @@ -206,7 +206,7 @@ * Test that delayed set of text is reflected. Some platforms have timing * subtleties that need to be tested. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testSetTextAfterInit() { final RichTextArea richTextArea = new RichTextArea(); delayTestFinish(RICH_TEXT_ASYNC_DELAY); @@ -224,7 +224,7 @@ * Test that an immediate set of text is reflected immediately and after the * area loads. Some platforms have timing subtleties that need to be tested. */ - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testSetTextBeforeInit() { final RichTextArea richTextArea = new RichTextArea(); richTextArea.setText("foo"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/SimpleRadioButtonTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/SimpleRadioButtonTest.java Wed Oct 28 19:23:32 2009 @@ -15,8 +15,6 @@ */ package com.google.gwt.user.client.ui; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; /** @@ -29,7 +27,6 @@ return "com.google.gwt.user.UserTest"; } - @DoNotRunWith({Platform.Htmlunit}) public void testProperties() { SimpleRadioButton radio = new SimpleRadioButton("myName"); assertEquals("myName", radio.getName()); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/StackPanelTest.java Sat Oct 24 08:11:35 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/StackPanelTest.java Wed Oct 28 19:23:32 2009 @@ -56,7 +56,7 @@ HasWidgetsTester.testAll(createStackPanel(), new Adder(), true); } - @DoNotRunWith(Platform.Htmlunit) + @DoNotRunWith(Platform.HtmlUnit) public void testDebugId() { final StackPanel p = createStackPanel(); Label a = new Label("a"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/SuggestBoxTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/SuggestBoxTest.java Wed Oct 28 19:23:32 2009 @@ -17,8 +17,6 @@ import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; import java.util.Arrays; @@ -36,7 +34,6 @@ /** * Test the basic accessors. */ - @DoNotRunWith({Platform.Htmlunit}) public void testAccessors() { SuggestBox box = createSuggestBox(); @@ -56,7 +53,6 @@ assertTrue(box.isSuggestionListShowing()); } - @DoNotRunWith({Platform.Htmlunit}) public void testShowAndHide() { SuggestBox box = createSuggestBox(); assertFalse(box.isSuggestionListShowing()); @@ -85,7 +81,6 @@ assertFalse(box.isSuggestionListShowing()); } - @DoNotRunWith({Platform.Htmlunit}) public void testDefaults() { MultiWordSuggestOracle oracle = new MultiWordSuggestOracle(); oracle.setDefaultSuggestionsFromText(Arrays.asList("A", "B")); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/TextAreaTest.java Tue Sep 1 07:32:49 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/TextAreaTest.java Wed Oct 28 19:23:32 2009 @@ -30,7 +30,7 @@ * designed to work on all browsers and verifies that the newlines are * accounted for in all browsers. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testNewline() { testNewline("Hello World\r\n\r\n\r\n\r\n\r\n", 15, 6, 15); testNewline("Hello\r\n\r\n\r\n\r\nWorld, My name is John.", 7, 3, 15); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/TextBoxBaseTestBase.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/TextBoxBaseTestBase.java Wed Oct 28 19:23:32 2009 @@ -48,7 +48,7 @@ * Tests that {...@link TextArea#setCursorPos(int)} updates the cursor position * correctly. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testMovingCursor() { TextBoxBase area = createTextBoxBase(); RootPanel.get().add(area); @@ -99,7 +99,7 @@ } } - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testValueChangeEvent() { TextBoxBase tb = createTextBoxBase(); // To work cross-platform, the tb must be added to the root panel. ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/TreeTest.java Wed Sep 23 10:15:52 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/TreeTest.java Wed Oct 28 19:23:32 2009 @@ -15,8 +15,6 @@ */ package com.google.gwt.user.client.ui; -import com.google.gwt.junit.DoNotRunWith; -import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; @@ -154,7 +152,6 @@ b.setWidget(null); } - @DoNotRunWith({Platform.Htmlunit}) public void testRemove() { Tree t = new Tree(); TreeItem item = t.addItem("a"); ======================================= --- /releases/2.0/user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java Thu Jul 30 13:47:31 2009 +++ /releases/2.0/user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java Wed Oct 28 19:23:32 2009 @@ -83,7 +83,7 @@ * {...@link com.google.gwt.user.client.ui.impl.ClippedImagePrototype#applyTo(com.google.gwt.user.client.ui.Image)} * is called. */ - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testApplyToClippedImage() { final Image image = new Image("counting-backwards.png", 12, 13, 8, 8); ======================================= --- /releases/2.0/user/test/com/google/gwt/xml/client/XMLTest.java Tue Oct 13 16:57:19 2009 +++ /releases/2.0/user/test/com/google/gwt/xml/client/XMLTest.java Wed Oct 28 19:23:32 2009 @@ -138,7 +138,7 @@ return "com.google.gwt.xml.XML"; } - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testAttr() { Document d = createTestDocument(); Element de = d.getDocumentElement(); @@ -150,7 +150,7 @@ assertEquals(de.getAttributeNode("unset"), null); } - @DoNotRunWith({Platform.Htmlunit}) + @DoNotRunWith({Platform.HtmlUnit}) public void testCreate() { Document d = XMLParser.createDocument(); CDATASection createCDATA; @@ -206,7 +206,6 @@ } } - @DoNotRunWith({Platform.Htmlunit}) public void testDocument() { Document d = createTestDocument(); NodeList e1Nodes = d.getElementsByTagName("e1"); @@ -225,7 +224,6 @@ assertEquals(e1Node.toString(), alienNode11.toString()); } - @DoNotRunWith({Platform.Htmlunit}) public void testElement() { Document d = createTestDocument(); Element top = d.getDocumentElement(); @@ -267,7 +265,6 @@ } } - @DoNotRunWith({Platform.Htmlunit}) public void testNamedNodeMap() { Document d = createTestDocument(); NamedNodeMap m = d.getDocumentElement().getAttributes(); @@ -275,7 +272,6 @@ assertEquals(m.getLength(), 2); } - @DoNotRunWith({Platform.Htmlunit}) public void testNavigation() { Document d = createTestDocument(); Element documentElement = d.getDocumentElement(); @@ -352,7 +348,6 @@ } } - @DoNotRunWith({Platform.Htmlunit}) public void testPrefix() { Document d = XMLParser.parse("<?xml version=\"1.0\"?>\r\n" + "<!-- both namespace prefixes are available throughout -->\r\n" @@ -366,7 +361,6 @@ assertEquals(d.getElementsByTagName("book").item(0), d.getDocumentElement()); } - @DoNotRunWith({Platform.Htmlunit}) public void testProcessingInstruction() { Document d = createTestDocument(); ProcessingInstruction pi = (ProcessingInstruction) d.getChildNodes().item(0); @@ -376,7 +370,6 @@ assertEquals(pi.getData(), "other data"); } - @DoNotRunWith({Platform.Htmlunit}) public void testText() { Document d = createTestDocument(); List<Node> textLikeNodes = Arrays.asList(new Node[] { --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
