Bug 423561: DNFs and VM crash in mozilla.XPCOM._VtblCall in Browser2.test1

- Browser1 identifies browser type
- re-enabled Browser6 (was disabled in bug 151439)

3 files changed, 43 insertions, 34 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 7083cc90df..2feaec9130 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
@@ -16,6 +16,7 @@ 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.internal.mozilla.MozillaVersion;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.tests.junit.SwtTestUtil;
 import org.eclipse.swt.widgets.Display;
@@ -38,6 +39,13 @@ public class Browser1 {
 		final Shell shell = new Shell(display);
 		shell.setLayout(new FillLayout());
 		Browser browser = new Browser(shell, SWT.NONE);
+		if (verbose) {
+			String browserType = browser.getBrowserType();
+			System.out.println("browser type: " + browserType);
+			if ("mozilla".equals(browserType)) {
+				System.out.println("MozillaVersion.GetCurrentVersion(): " + MozillaVersion.GetCurrentVersion());
+			}
+		}
 		browser.addLocationListener(new LocationListener() {
 			public void changing(LocationEvent event) {
 				if (verbose) System.out.println("changing "+event.location);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser6.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser6.java
index 7cf330fe30..a24d01a003 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser6.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser6.java
@@ -10,16 +10,18 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit.browser;
 
-import org.eclipse.swt.tests.junit.SwtTestUtil;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.TitleEvent;
+import org.eclipse.swt.browser.TitleListener;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 public class Browser6 {
 	public static boolean verbose = false;
 	public static boolean passed = false;
-	public static boolean isMozilla = SwtTestUtil.isGTK;
+	public static boolean isMozilla = false; //SwtTestUtil.isGTK;
 	
 	public static boolean test1(String url) {
 		if (verbose) System.out.println("URL Loading, verify get title event - args: "+url+" Expected Event Sequence: Title.changed");
@@ -126,11 +128,9 @@ public class Browser6 {
 		
 		String[] urls = {"http://www.google.com"};
 		for (int i = 0; i < urls.length; i++) {
-			if (!isMozilla) {
-				boolean result = test1(urls[i]); 
-				if (verbose) System.out.print(result ? "." : "E");
-				if (!result) fail++;
-			}
+			boolean result = test1(urls[i]); 
+			if (verbose) System.out.print(result ? "." : "E");
+			if (!result) fail++;
 		}
 		
 		String pluginPath = System.getProperty("PLUGIN_PATH");
@@ -141,11 +141,9 @@ public class Browser6 {
 		urls = new String[] {url};
 		String[] titles = {"This is a test title that must be carefully checked when that page is loaded"};
 		for (int i = 0; i < urls.length; i++) {
-			if (!isMozilla) {
-				boolean result = test2(urls[i], titles[i]); 
-				if (verbose) System.out.print(result ? "." : "E");
-				if (!result) fail++;
-			}
+			boolean result = test2(urls[i], titles[i]); 
+			if (verbose) System.out.print(result ? "." : "E");
+			if (!result) fail++;
 		}
 		
 		
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java
index de7750e0ee..05cd550e09 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Test_BrowserSuite.java
@@ -21,49 +21,52 @@ import junit.framework.TestCase;
  */
 public class Test_BrowserSuite extends TestCase {
 
-public void testBrowser1() {
+public Test_BrowserSuite() {
 	Browser1.verbose = true;
-assertTrue(Browser1.test());
+	Browser2.verbose = true;
+	Browser3.verbose = true;
+	Browser4.verbose = true;
+	Browser5.verbose = true;
+	Browser6.verbose = true;
+	Browser7.verbose = true;
+	Browser8.verbose = true;
+	Browser9.verbose = true;
+}
+
+public void testBrowser1() {
+	assertTrue(Browser1.test());
 }
 
 public void testBrowser2() {
-	Browser2.verbose = true;
-assertTrue(Browser2.test());
+	assertTrue(Browser2.test());
 }
 
 public void testBrowser3() {
-	Browser3.verbose = true;
-assertTrue(Browser3.test());
+	assertTrue(Browser3.test());
 }
 
 public void testBrowser4() {
-	Browser4.verbose = true;
-assertTrue(Browser4.test());
+	assertTrue(Browser4.test());
 }
 
 public void testBrowser5() {
-	Browser5.verbose = true;
-assertTrue(Browser5.test());
+	assertTrue(Browser5.test());
 }
 
 public void testBrowser6() {
-	Browser6.verbose = true;
-assertTrue(Browser6.test());
+	assertTrue(Browser6.test());
 }
 
 public void testBrowser7() {
-	Browser7.verbose = true;
-assertTrue(Browser7.test());
+	assertTrue(Browser7.test());
 }
 
 public void testBrowser8() {
-	Browser8.verbose = true;
-assertTrue(Browser8.test());
+	assertTrue(Browser8.test());
 }
 
 public void testBrowser9() {
-	Browser9.verbose = true;
-assertTrue(Browser9.test());
+	assertTrue(Browser9.test());
 }
 
 @Override