diff options
| author | Markus Keller | 2013-10-25 10:07:30 -0400 |
|---|---|---|
| committer | Markus Keller | 2013-10-25 10:16:03 -0400 |
| commit | bccc68c5828d2c053f6e7cbaa816077c400ed3cc (patch) | |
| tree | 3304b254a818fcf6e83d819a122e4d16a70b0caf | |
| parent | 5a748dd716a2f6cf95105a6f5f78eee6d06dbfc6 (diff) | |
| download | eclipse.platform.swt-bccc68c5828d2c053f6e7cbaa816077c400ed3cc.tar.gz eclipse.platform.swt-bccc68c5828d2c053f6e7cbaa816077c400ed3cc.tar.xz eclipse.platform.swt-bccc68c5828d2c053f6e7cbaa816077c400ed3cc.zip | |
Revert "Bug 420258: Test_BrowserSuite#Browser1() times out on Mac (takes almost 2h)"
This reverts commit 8fbc959aef2669dd6e0968ec4b6f32974f4bcd56.
| -rw-r--r-- | tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser1.java | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser1.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser1.java index 5848021c94..7763117d05 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser1.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser1.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2006 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,25 +10,19 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit.browser; -import org.eclipse.swt.SWT; -import org.eclipse.swt.browser.Browser; -import org.eclipse.swt.browser.LocationEvent; -import org.eclipse.swt.browser.LocationListener; -import org.eclipse.swt.browser.ProgressEvent; -import org.eclipse.swt.browser.ProgressListener; -import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.tests.junit.SwtJunit; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.*; +import org.eclipse.swt.layout.*; +import org.eclipse.swt.browser.*; +import org.eclipse.swt.*; public class Browser1 { - public static boolean verbose = true; + public static boolean verbose = false; public static boolean passed = false; public static boolean locationChanging = false; public static boolean locationChanged = false; public static boolean progressCompleted = false; public static boolean isMozilla = SwtJunit.isGTK || SwtJunit.isMotif; - public static boolean isMac = SwtJunit.isCocoa || SwtJunit.isCarbon; public static boolean test1(String url) { if (verbose) System.out.println("URL Loading - args: "+url+" Expected Event Sequence: Location.changing > Location.changed (top true)> Progress.completed"); @@ -202,7 +196,7 @@ public class Browser1 { int fail = 0; String[] urls = {"http://www.google.com"}; // TEMPORARILY NOT RUN FOR MOZILLA - if (!isMozilla && !isMac) { // timed out on Mac, see https://bugs.eclipse.org/420258 + if (!isMozilla) { for (int i = 0; i < urls.length; i++) { boolean result = test1(urls[i]); if (verbose) System.out.print(result ? "." : "E"); |