51480

11 files changed, 115 insertions, 101 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
index 9435453499..74319fb3a0 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
@@ -720,7 +720,9 @@ String getPath(String fileName) {
 	String urlPath;
 	
 	String pluginPath = System.getProperty("PLUGIN_PATH");
-	System.out.println("PLUGIN_PATH <"+pluginPath+">");
+	if (verbose) {
+		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+	}
 	if (pluginPath == null) {
 		URL url = getClass().getClassLoader().getResource(fileName);
 		if (url == null) {
@@ -735,7 +737,9 @@ String getPath(String fileName) {
 	if (SwtJunit.isWindows && urlPath.indexOf(File.separatorChar) == 0) urlPath = urlPath.substring(1);
 	urlPath = urlPath.replaceAll("%20", " ");	
 	
-	System.out.println("Resolved file name for " + fileName + " = " + urlPath);
+	if (verbose) {
+		System.out.println("Resolved file name for " + fileName + " = " + urlPath);
+	}
 	return urlPath;
 }
 RGB getRealRGB(Color color) {
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 022873662e..ddf0c42d00 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,13 +16,14 @@ import org.eclipse.swt.browser.*;
 import org.eclipse.swt.*;
 
 public class Browser1 {
+	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 test1(String url) {
-		System.out.println("URL Loading - args: "+url+" Expected Event Sequence: Location.changing > Location.changed (top true)> Progress.completed");
+		if (verbose) System.out.println("URL Loading - args: "+url+" Expected Event Sequence: Location.changing > Location.changed (top true)> Progress.completed");
 		passed = false;
 		locationChanging = locationChanged = progressCompleted = false;
 				
@@ -32,7 +33,7 @@ public class Browser1 {
 		Browser browser = new Browser(shell, SWT.NONE);
 		browser.addLocationListener(new LocationListener() {
 			public void changing(LocationEvent event) {
-				System.out.println("changing "+event.location);
+				if (verbose) System.out.println("changing "+event.location);
 				/* certain browsers do send multiple changing events. Safari does this. */
 				/* verify the page has not been reported as being loaded */
 				passed = !progressCompleted;
@@ -40,7 +41,7 @@ public class Browser1 {
 				if (!passed) shell.close();
 			}
 			public void changed(LocationEvent event) {
-				System.out.println("changed "+event.location);
+				if (verbose) System.out.println("changed "+event.location);
 				/* ignore non top frame loading */
 				if (!event.top) return;
 				/* verify a changed follows at least one changing */
@@ -54,7 +55,7 @@ public class Browser1 {
 			public void changed(ProgressEvent event) {
 			}
 			public void completed(ProgressEvent event) {
-				System.out.println("completed");
+				if (verbose) System.out.println("completed");
 				passed = locationChanging && locationChanged && !progressCompleted;
 				progressCompleted = true;
 				// TEMPORARILY COMMENTED OUT
@@ -65,16 +66,16 @@ public class Browser1 {
 					 
 					new Thread() {
 						public void run() {
-							System.out.println("timer start");
+							if (verbose) System.out.println("timer start");
 							try { sleep(2000); } catch (Exception e) {};
 							if (!display.isDisposed())
 								display.asyncExec(new Runnable(){
 									public void run() {
-										System.out.println("timer asyncexec shell.close");
+										if (verbose) System.out.println("timer asyncexec shell.close");
 										if (!shell.isDisposed()) shell.close();							
 									}
 								});
-							System.out.println("timer over");
+							if (verbose) System.out.println("timer over");
 						};
 					}.start();
 				}
@@ -91,7 +92,7 @@ public class Browser1 {
 	}
 	
 	public static boolean test2(String url) {
-		System.out.println("URL Loading Filtering - args: "+url+" Expected Event Sequence: Location.changing cancel true > no Location.changed, no Progress.completed");
+		if (verbose) System.out.println("URL Loading Filtering - args: "+url+" Expected Event Sequence: Location.changing cancel true > no Location.changed, no Progress.completed");
 		locationChanging = locationChanged = progressCompleted = false;
 		passed = false;
 		final String[] locationCancelled = new String[1];
@@ -101,7 +102,7 @@ public class Browser1 {
 		final Browser browser = new Browser(shell, SWT.NONE);
 		browser.addLocationListener(new LocationListener() {
 			public void changing(LocationEvent event) {
-				System.out.println("changing "+event.location);
+				if (verbose) System.out.println("changing "+event.location);
 				passed = !locationChanging && !locationChanged && !progressCompleted;
 				locationChanging = true;
 				if (!passed) {
@@ -111,16 +112,16 @@ public class Browser1 {
 				event.doit = false;
 				new Thread() {
 					public void run() {
-						System.out.println("timer start");
+						if (verbose) System.out.println("timer start");
 						try { sleep(2000); } catch (Exception e) {};
 						if (!display.isDisposed())
 							display.asyncExec(new Runnable(){
 								public void run() {
-									System.out.println("timer asyncexec shell.close");
+									if (verbose) System.out.println("timer asyncexec shell.close");
 									if (!shell.isDisposed()) shell.close();							
 								}
 							});
-						System.out.println("timer over");
+						if (verbose) System.out.println("timer over");
 					};
 				}.start();
 			}
@@ -134,7 +135,7 @@ public class Browser1 {
 				 * otherwise it is considered that the location was not successfully cancelled. 
 				 */
 				passed = event.location.length() == 0;
-				System.out.println("changed "+event.location+" "+passed);
+				if (verbose) System.out.println("changed "+event.location+" "+passed);
 				locationChanged = true;
 			}
 		});
@@ -152,7 +153,7 @@ public class Browser1 {
 				 */
 				String location = browser.getUrl();
 				passed = location.length() == 0;
-				System.out.println("completed "+passed);
+				if (verbose) System.out.println("completed "+passed);
 				progressCompleted = true;
 			}
 		});
@@ -195,12 +196,12 @@ public class Browser1 {
 		String[] urls = {"http://www.google.com"};
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test1(urls[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test2(urls[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser2.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser2.java
index 54fe597cdb..b834c56f6c 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser2.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser2.java
@@ -16,13 +16,14 @@ import org.eclipse.swt.browser.*;
 import org.eclipse.swt.*;
 
 public class Browser2 {
+	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 test1(String html) {
-		System.out.println("setText - args: "+html+" Expected Event Sequence: Location.changing > Location.changed > Progress.completed");
+		if (verbose) System.out.println("setText - args: "+html+" Expected Event Sequence: Location.changing > Location.changed > Progress.completed");
 		passed = false;
 		locationChanging = locationChanged = progressCompleted = false;
 				
@@ -32,14 +33,14 @@ public class Browser2 {
 		Browser browser = new Browser(shell, SWT.NONE);
 		browser.addLocationListener(new LocationListener() {
 			public void changing(LocationEvent event) {
-				System.out.println("changing "+event.location);
+				if (verbose) System.out.println("changing "+event.location);
 				/* certain browsers do send multiple changing events. Safari does this. */
 				passed = !locationChanged && !progressCompleted;
 				locationChanging = true;
 				if (!passed) shell.close();
 			}
 			public void changed(LocationEvent event) {
-				System.out.println("changed "+event.location);
+				if (verbose) System.out.println("changed "+event.location);
 				passed = locationChanging && !locationChanged && !progressCompleted;
 				locationChanged = true;
 				if (!passed) shell.close();
@@ -49,7 +50,7 @@ public class Browser2 {
 			public void changed(ProgressEvent event) {
 			}
 			public void completed(ProgressEvent event) {
-				System.out.println("completed");
+				if (verbose) System.out.println("completed");
 				passed = locationChanging && locationChanged && !progressCompleted;
 				progressCompleted = true;
 				if (!passed) shell.close();
@@ -59,16 +60,16 @@ public class Browser2 {
 					 */
 					new Thread() {
 						public void run() {
-							System.out.println("timer start");
+							if (verbose) System.out.println("timer start");
 							try { sleep(2000); } catch (Exception e) {};
 							if (!display.isDisposed())
 								display.asyncExec(new Runnable(){
 									public void run() {
-										System.out.println("timer asyncexec shell.close");
+										if (verbose) System.out.println("timer asyncexec shell.close");
 										if (!shell.isDisposed()) shell.close();							
 									}
 								});
-							System.out.println("timer over");
+							if (verbose) System.out.println("timer over");
 						};
 					}.start();
 				}
@@ -85,7 +86,7 @@ public class Browser2 {
 	}
 	
 	public static boolean test2(String html) {
-		System.out.println("setText URL Loading Filtering - args: "+html+" Expected Event Sequence: Location.changing cancel true > no Location.changed, no Progress.completed");
+		if (verbose) System.out.println("setText URL Loading Filtering - args: "+html+" Expected Event Sequence: Location.changing cancel true > no Location.changed, no Progress.completed");
 		locationChanging = locationChanged = progressCompleted = false;
 		passed = false;
 		final String[] locationCancelled = new String[1];
@@ -95,7 +96,7 @@ public class Browser2 {
 		final Browser browser = new Browser(shell, SWT.NONE);
 		browser.addLocationListener(new LocationListener() {
 			public void changing(LocationEvent event) {
-				System.out.println("changing "+event.location);
+				if (verbose) System.out.println("changing "+event.location);
 				/*
 				* Feature on Internet Explorer.  When pending requests are stopped, IE
 				* emits a Location.changing with res://C:\WINDOWS\System32\shdoclc.dll/navcancl.htm.
@@ -113,16 +114,16 @@ public class Browser2 {
 				event.doit = false;
 				new Thread() {
 					public void run() {
-						System.out.println("timer start");
+						if (verbose) System.out.println("timer start");
 						try { sleep(2000); } catch (Exception e) {};
 						if (!display.isDisposed())
 							display.asyncExec(new Runnable(){
 								public void run() {
-									System.out.println("timer asyncexec shell.close");
+									if (verbose) System.out.println("timer asyncexec shell.close");
 									if (!shell.isDisposed()) shell.close();							
 								}
 							});
-						System.out.println("timer over");
+						if (verbose) System.out.println("timer over");
 					};
 				}.start();
 			}
@@ -136,7 +137,7 @@ public class Browser2 {
 				 * otherwise it is considered that the location was not successfully cancelled. 
 				 */
 				passed = event.location.length() == 0;
-				System.out.println("changed "+event.location+" "+passed);
+				if (verbose) System.out.println("changed "+event.location+" "+passed);
 				/* ignore LocationChanged that are empty */
 				locationChanged = !passed;
 			}
@@ -155,7 +156,7 @@ public class Browser2 {
 				 */
 				String location = browser.getUrl();
 				passed = location.length() == 0;
-				System.out.println("completed "+passed);
+				if (verbose) System.out.println("completed "+passed);
 				progressCompleted = true;
 			}
 		});
@@ -198,12 +199,12 @@ public class Browser2 {
 		String[] html = {file1};
 		for (int i = 0; i < html.length; i++) {
 			boolean result = test1(html[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		for (int i = 0; i < html.length; i++) {
 			boolean result = test2(html[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser3.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser3.java
index 31cf90eb5d..6e399b4f51 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser3.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser3.java
@@ -16,11 +16,12 @@ import org.eclipse.swt.browser.*;
 import org.eclipse.swt.*;
 
 public class Browser3 {
+	public static boolean verbose = false;
 	public static boolean passed = false;	
 	public static boolean openWindow, locationChanging, locationChanged, visibilityShow, progressCompleted;
 	
 	public static boolean test1(String url) {
-		System.out.println("javascript window.open - args: "+url+" Expected Event Sequence: Browser1:OpenWindow.open > { Browser2:Location.changing, Browser2:Visibility.show, Browser2:Location.changed } > Browser2:Progress.completed");
+		if (verbose) System.out.println("javascript window.open - args: "+url+" Expected Event Sequence: Browser1:OpenWindow.open > { Browser2:Location.changing, Browser2:Visibility.show, Browser2:Location.changed } > Browser2:Progress.completed");
 		passed = false;
 		locationChanging = locationChanged = progressCompleted = false;
 				
@@ -36,13 +37,13 @@ public class Browser3 {
 				openWindow = true;
 				Browser src = (Browser)event.widget;
 				if (src != browser1) {
-					System.out.println("Failure - expected "+browser1+", got "+src);
+					if (verbose) System.out.println("Failure - expected "+browser1+", got "+src);
 					passed = false;
 					shell.close();
 					return;
 				}
 				if (event.browser != null) {
-					System.out.println("Failure - expected null, got "+event.browser);
+					if (verbose) System.out.println("Failure - expected null, got "+event.browser);
 					passed = false;
 					shell.close();
 					return;
@@ -53,7 +54,7 @@ public class Browser3 {
 		browser2.addLocationListener(new LocationListener() {
 			public void changed(LocationEvent event) {
 				if (!openWindow || !locationChanging) {
-					System.out.println("Failure - LocationEvent.changing received at wrong time");
+					if (verbose) System.out.println("Failure - LocationEvent.changing received at wrong time");
 					passed = false;
 					shell.close();
 					return;
@@ -62,7 +63,7 @@ public class Browser3 {
 			}
 			public void changing(LocationEvent event) {
 				if (!openWindow) {
-					System.out.println("Failure - LocationEvent.changing received at wrong time");
+					if (verbose) System.out.println("Failure - LocationEvent.changing received at wrong time");
 					passed = false;
 					shell.close();
 					return;
@@ -72,13 +73,13 @@ public class Browser3 {
 		});
 		browser2.addVisibilityWindowListener(new VisibilityWindowListener() {
 			public void hide(WindowEvent event) {
-				System.out.println("Failure - did not expect VisibilityEvent.hide");
+				if (verbose) System.out.println("Failure - did not expect VisibilityEvent.hide");
 				passed = false;
 				shell.close();
 			}
 			public void show(WindowEvent event) {
 				if (!openWindow) {
-					System.out.println("Failure - VisibilityEvent.show received at wrong time");
+					if (verbose) System.out.println("Failure - VisibilityEvent.show received at wrong time");
 					passed = false;
 					shell.close();
 					return;					
@@ -93,17 +94,17 @@ public class Browser3 {
 			public void completed(ProgressEvent event) {
 				new Thread() {
 					public void run() {
-						System.out.println("timer start");
+						if (verbose) System.out.println("timer start");
 						try { sleep(2000); } catch (Exception e) {};
 						passed = true;
 						if (!display.isDisposed())
 							display.asyncExec(new Runnable(){
 								public void run() {
-									System.out.println("timer asyncexec shell.close");
+									if (verbose) System.out.println("timer asyncexec shell.close");
 									if (!shell.isDisposed()) shell.close();							
 								}
 							});
-						System.out.println("timer over");
+						if (verbose) System.out.println("timer over");
 					};
 				}.start();
 			}
@@ -148,13 +149,13 @@ public class Browser3 {
 		int fail = 0;		
 		String url;
 		String pluginPath = System.getProperty("PLUGIN_PATH");
-		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+		if (verbose) System.out.println("PLUGIN_PATH <"+pluginPath+">");
 		if (pluginPath == null) url = Browser3.class.getClassLoader().getResource("browser3.html").toString();
 		else url = pluginPath + "/data/browser3.html";
 		String[] urls = {url};
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test1(urls[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser4.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser4.java
index 36f294d197..b5480cab59 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser4.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser4.java
@@ -16,11 +16,12 @@ import org.eclipse.swt.browser.*;
 import org.eclipse.swt.*;
 
 public class Browser4 {
+	public static boolean verbose = false;
 	public static boolean passed = false;	
 	public static boolean openWindow, locationChanging, locationChanged, visibilityShow, progressCompleted, closeWindow;
 	
 	public static boolean test1(String url) {
-		System.out.println("javascript window.open - args: "+url+" Expected Event Sequence: Browser1:OpenWindow.open > { Browser2:Location.changing, Browser2:Visibility.show, Browser2:Location.changed } > Browser2:Progress.completed > Browser2.CloseWindow.close");
+		if (verbose) System.out.println("javascript window.open - args: "+url+" Expected Event Sequence: Browser1:OpenWindow.open > { Browser2:Location.changing, Browser2:Visibility.show, Browser2:Location.changed } > Browser2:Progress.completed > Browser2.CloseWindow.close");
 		passed = false;
 		locationChanging = locationChanged = progressCompleted = false;
 				
@@ -36,13 +37,13 @@ public class Browser4 {
 				openWindow = true;
 				Browser src = (Browser)event.widget;
 				if (src != browser1) {
-					System.out.println("Failure - expected "+browser1+", got "+src);
+					if (verbose) System.out.println("Failure - expected "+browser1+", got "+src);
 					passed = false;
 					shell.close();
 					return;
 				}
 				if (event.browser != null) {
-					System.out.println("Failure - expected null, got "+event.browser);
+					if (verbose) System.out.println("Failure - expected null, got "+event.browser);
 					passed = false;
 					shell.close();
 					return;
@@ -53,7 +54,7 @@ public class Browser4 {
 		browser2.addLocationListener(new LocationListener() {
 			public void changed(LocationEvent event) {
 				if (!openWindow || !locationChanging) {
-					System.out.println("Failure - Location.changing received at wrong time");
+					if (verbose) System.out.println("Failure - Location.changing received at wrong time");
 					passed = false;
 					shell.close();
 					return;
@@ -62,7 +63,7 @@ public class Browser4 {
 			}
 			public void changing(LocationEvent event) {
 				if (!openWindow) {
-					System.out.println("Failure - Location.changing received at wrong time");
+					if (verbose) System.out.println("Failure - Location.changing received at wrong time");
 					passed = false;
 					shell.close();
 					return;
@@ -72,13 +73,13 @@ public class Browser4 {
 		});
 		browser2.addVisibilityWindowListener(new VisibilityWindowListener() {
 			public void hide(WindowEvent event) {
-				System.out.println("Failure - did not expect VisibilityEvent.hide");
+				if (verbose) System.out.println("Failure - did not expect VisibilityEvent.hide");
 				passed = false;
 				shell.close();
 			}
 			public void show(WindowEvent event) {
 				if (!openWindow) {
-					System.out.println("Failure - Visibility.show received at wrong time");
+					if (verbose) System.out.println("Failure - Visibility.show received at wrong time");
 					passed = false;
 					shell.close();
 					return;					
@@ -93,7 +94,7 @@ public class Browser4 {
 
 			public void completed(ProgressEvent event) {
 				if (!locationChanging || !locationChanged || !visibilityShow) {
-					System.out.println("Failure - Progress.completed received at wrong time");
+					if (verbose) System.out.println("Failure - Progress.completed received at wrong time");
 					passed = false;
 					shell.close();
 					return;
@@ -104,7 +105,7 @@ public class Browser4 {
 		browser2.addCloseWindowListener(new CloseWindowListener() {
 			public void close(WindowEvent event) {
 				if (!progressCompleted) {
-					System.out.println("Failure - CloseWindow.close received at wrong time");
+					if (verbose) System.out.println("Failure - CloseWindow.close received at wrong time");
 					passed = false;
 					shell.close();
 					return;
@@ -116,17 +117,17 @@ public class Browser4 {
 				
 				new Thread() {
 					public void run() {
-						System.out.println("timer start");
+						if (verbose) System.out.println("timer start");
 						try { sleep(2000); } catch (Exception e) {};
 						passed = true;
 						if (!display.isDisposed())
 							display.asyncExec(new Runnable(){
 								public void run() {
-									System.out.println("timer asyncexec shell.close");
+									if (verbose) System.out.println("timer asyncexec shell.close");
 									if (!shell.isDisposed()) shell.close();							
 								}
 							});
-						System.out.println("timer over");
+						if (verbose) System.out.println("timer over");
 					};
 				}.start();
 			}
@@ -171,13 +172,13 @@ public class Browser4 {
 		int fail = 0;		
 		String url;
 		String pluginPath = System.getProperty("PLUGIN_PATH");
-		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+		if (verbose) System.out.println("PLUGIN_PATH <"+pluginPath+">");
 		if (pluginPath == null) url = Browser4.class.getClassLoader().getResource("browser4.html").toString();
 		else url = pluginPath + "/data/browser4.html";
 		String[] urls = {url};
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test1(urls[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5.java
index 7250a6cac3..09d85b5d66 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser5.java
@@ -17,6 +17,7 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 
 public class Browser5 {
+	public static boolean verbose = false;
 	public static boolean passed = false;
 	static Point[][] regressionBounds = {
 				{new Point(10,200), new Point(300,100)},
@@ -28,7 +29,7 @@ public class Browser5 {
 	static int cntClosed = 0;
 	
 	public static boolean test1(String url) {
-		System.out.println("javascript window.open with location and size parameters - args: "+url+" Expected Event Sequence: Visibility.open");
+		if (verbose) System.out.println("javascript window.open with location and size parameters - args: "+url+" Expected Event Sequence: Visibility.open");
 		passed = false;
 				
 		final Display display = new Display();
@@ -37,7 +38,7 @@ public class Browser5 {
 		final Browser browser = new Browser(shell, SWT.NONE);
 		browser.addOpenWindowListener(new OpenWindowListener() {
 			public void open(WindowEvent event) {
-				System.out.println("OpenWindow "+index);
+				if (verbose) System.out.println("OpenWindow "+index);
 				Shell newShell = new Shell(display);
 				newShell.setLayout(new FillLayout());
 				Browser browser = new Browser(newShell, SWT.NONE);
@@ -58,15 +59,15 @@ public class Browser5 {
 							 * are considered 'legal' as long as they don't contain size and location information.
 							 */
 							if (event.location != null || event.size != null) {
-								System.out.println("Failure - Browser "+index+" is receiving multiple show events");
+								if (verbose) System.out.println("Failure - Browser "+index+" is receiving multiple show events");
 								passed = false;
 								shell.close();
 							} else {
-								System.out.println("Unnecessary (but harmless) visibility.show event Browser "+index);
+								if (verbose) System.out.println("Unnecessary (but harmless) visibility.show event Browser "+index);
 							}
 						} else {
 							browser.setData("index", new Integer(-100-index));
-							System.out.println("Visibility.show browser "+index+" location "+event.location+" size "+event.size);
+							if (verbose) System.out.println("Visibility.show browser "+index+" location "+event.location+" size "+event.size);
 							/* Certain browsers include decorations to the expected size. Accept size that are larger or equal than
 							 * expected. Certain browsers invent size or location when some parameters are missing. If we expect
 							 * null for one of size or location, also accept non null answers.
@@ -78,9 +79,9 @@ public class Browser5 {
 							(event.size != null && event.size.equals(regressionBounds[index][1])) ||
 							(event.size != null && regressionBounds[index][1] == null) ||
 							(event.size != null && event.size.x >= regressionBounds[index][1].x && event.size.y >= regressionBounds[index][1].y));
-							System.out.println("Expected location "+regressionBounds[index][0]+" size "+regressionBounds[index][1]);
+							if (verbose) System.out.println("Expected location "+regressionBounds[index][0]+" size "+regressionBounds[index][1]);
 							if (!checkSize || !checkLocation || ((event.size != null || event.location != null) && regressionBounds[index][0] == null && regressionBounds[index][1] == null)) {
-								System.out.println("	Failure ");
+								if (verbose) System.out.println("	Failure ");
 								passed = false;
 								shell.close();
 								return;
@@ -91,7 +92,7 @@ public class Browser5 {
 				browser.addCloseWindowListener(new CloseWindowListener() {
 					public void close(WindowEvent event) {
 						cntClosed++;
-						System.out.println("Close");
+						if (verbose) System.out.println("Close");
 						Browser browser = (Browser)event.widget;
 						browser.getShell().close();
 						if (cntPassed == regressionBounds.length) passed = true;
@@ -144,13 +145,13 @@ public class Browser5 {
 		int fail = 0;		
 		String url;
 		String pluginPath = System.getProperty("PLUGIN_PATH");
-		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+		if (verbose) System.out.println("PLUGIN_PATH <"+pluginPath+">");
 		if (pluginPath == null) url = Browser5.class.getClassLoader().getResource("browser5.html").toString();
 		else url = pluginPath + "/data/browser5.html";
 		String[] urls = {url};
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test1(urls[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
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 415087dcf4..240d3f27b1 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
@@ -16,10 +16,11 @@ import org.eclipse.swt.browser.*;
 import org.eclipse.swt.*;
 
 public class Browser6 {
+	public static boolean verbose = false;
 	public static boolean passed = false;	
 	
 	public static boolean test1(String url) {
-		System.out.println("URL Loading, verify get title event - args: "+url+" Expected Event Sequence: Title.changed");
+		if (verbose) System.out.println("URL Loading, verify get title event - args: "+url+" Expected Event Sequence: Title.changed");
 		passed = false;
 				
 		final Display display = new Display();
@@ -30,7 +31,7 @@ public class Browser6 {
 			public void changed(TitleEvent event) {
 				Browser browser = (Browser)event.widget;
 				String url = browser.getUrl();
-				System.out.println("Title changed <"+event.title+"> for location <"+url+">");
+				if (verbose) System.out.println("Title changed <"+event.title+"> for location <"+url+">");
 				passed = true;
 				shell.close();
 			}
@@ -46,7 +47,7 @@ public class Browser6 {
 	}
 	
 	public static boolean test2(String url, final String expectedTitle) {
-		System.out.println("URL Loading, verify get title event - args: "+url+" Expected Event Sequence: Title.changed");
+		if (verbose) System.out.println("URL Loading, verify get title event - args: "+url+" Expected Event Sequence: Title.changed");
 		passed = false;
 		
 		final Display display = new Display();
@@ -57,7 +58,7 @@ public class Browser6 {
 			public void changed(TitleEvent event) {
 				Browser browser = (Browser)event.widget;
 				String url = browser.getUrl();
-				System.out.println("Title changed <"+event.title+"> for location <"+url+">");
+				if (verbose) System.out.println("Title changed <"+event.title+"> for location <"+url+">");
 				if (event.title.equals(expectedTitle)) {
 					passed = true;
 					shell.close();
@@ -112,12 +113,12 @@ public class Browser6 {
 		String[] urls = {"http://www.google.com"};
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test1(urls[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		
 		String pluginPath = System.getProperty("PLUGIN_PATH");
-		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+		if (verbose) System.out.println("PLUGIN_PATH <"+pluginPath+">");
 		String url;
 		if (pluginPath == null) url = Browser6.class.getClassLoader().getResource("browser6.html").toString();
 		else url = pluginPath + "/data/browser6.html";
@@ -125,7 +126,7 @@ public class Browser6 {
 		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++) {
 			boolean result = test2(urls[i], titles[i]); 
-			System.out.print(result ? "." : "E");
+			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/Browser7.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser7.java
index e9fb662e05..290c1c0080 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser7.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser7.java
@@ -17,13 +17,14 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 
 public class Browser7 {
+	public static boolean verbose = false;
 	public static boolean passed = false;	
 	
 	static int cntOpen = 0;
 	static int cntShow = 0;
 	
 	public static boolean test(String url) {
-		System.out.println("window.open, verify get Window.open and Window.show events - args: "+url+" Expected Event Sequence: Window.open, Window.show multiple times");
+		if (verbose) System.out.println("window.open, verify get Window.open and Window.show events - args: "+url+" Expected Event Sequence: Window.open, Window.show multiple times");
 		passed = false;
 		
 		cntOpen = 0;
@@ -39,7 +40,7 @@ public class Browser7 {
 		browser.setUrl(url);
 		
 		boolean timeout = runLoopTimer(display, shell, 10);
-		System.out.println("Window opened: "+cntOpen+" Window shown: "+cntShow);
+		if (verbose) System.out.println("Window opened: "+cntOpen+" Window shown: "+cntShow);
 		/*
 		 * Bug in Mozilla. Multiple show events are fired by Mozilla.
 		 */
@@ -51,7 +52,7 @@ public class Browser7 {
 	static void initialize(final Display display, Browser browser) {
 		browser.addOpenWindowListener(new OpenWindowListener() {
 			public void open(WindowEvent event) {
-				System.out.println("VisibilityWindowListener.open");
+				if (verbose) System.out.println("VisibilityWindowListener.open");
 				Shell shell = new Shell(display);
 				shell.setText("New Window");
 				shell.setLayout(new FillLayout());
@@ -68,7 +69,7 @@ public class Browser7 {
 				shell.setVisible(false);
 			}
 			public void show(WindowEvent event) {
-				System.out.println("VisibilityWindowListener.show location="+event.location+" size="+event.size+" addressBar="+event.addressBar+" menuBar="+event.menuBar+" statusBar="+event.statusBar+" toolBar="+event.toolBar);
+				if (verbose) System.out.println("VisibilityWindowListener.show location="+event.location+" size="+event.size+" addressBar="+event.addressBar+" menuBar="+event.menuBar+" statusBar="+event.statusBar+" toolBar="+event.toolBar);
 				Browser browser = (Browser)event.widget;
 				Shell shell = browser.getShell();
 				if (event.location != null) shell.setLocation(event.location);
@@ -119,14 +120,14 @@ public class Browser7 {
 		int fail = 0;
 				
 		String pluginPath = System.getProperty("PLUGIN_PATH");
-		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+		if (verbose) System.out.println("PLUGIN_PATH <"+pluginPath+">");
 		String url;
 		if (pluginPath == null) url = Browser7.class.getClassLoader().getResource("browser7.html").toString();
 		else url = pluginPath + "/data/browser7.html";
 		String[] urls = new String[] {url};
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test(urls[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser8.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser8.java
index 856ae6be4d..c9f9f708cb 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser8.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser8.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.browser.*;
 import org.eclipse.swt.*;
 
 public class Browser8 {
+	public static boolean verbose = false;
 	public static boolean passed = false;	
 	
 	static String html[] = {"<html><title>Snippet</title><body><p id='myid'>Best Friends</p><p id='myid2'>Cat and Dog</p></body></html>"};
@@ -28,7 +29,7 @@ public class Browser8 {
 		"document.bgColor='yellow';"};
 	
 	public static boolean test(final int index) {
-		System.out.println("Javascript - verify execute() works on HTML rendered from memory with getText - script index "+index);
+		if (verbose) System.out.println("Javascript - verify execute() works on HTML rendered from memory with getText - script index "+index);
 		passed = false;
 		
 		final Display display = new Display();
@@ -81,14 +82,14 @@ public class Browser8 {
 		int fail = 0;
 				
 		String pluginPath = System.getProperty("PLUGIN_PATH");
-		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+		if (verbose) System.out.println("PLUGIN_PATH <"+pluginPath+">");
 		String url;
 		if (pluginPath == null) url = Browser8.class.getClassLoader().getResource("browser7.html").toString();
 		else url = pluginPath + "/data/browser7.html";
 		String[] urls = new String[] {url};
 		for (int i = 0; i < urls.length; i++) {
 			boolean result = test(i); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser9.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser9.java
index c50f8205cd..2be4b0fbb0 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser9.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/browser/Browser9.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.browser.*;
 import org.eclipse.swt.*;
 
 public class Browser9 {
+	public static boolean verbose = false;
 	public static boolean passed = false;	
 	
 	static String html[] = {"browser9.html"};
@@ -24,7 +25,7 @@ public class Browser9 {
 	static String status[] = {"new title"};
 	
 	public static boolean test(String url, final String script, final String status) {
-		System.out.println("Javascript - verify execute("+script+") works on a static HTML file "+url);
+		if (verbose) System.out.println("Javascript - verify execute("+script+") works on a static HTML file "+url);
 		passed = false;
 		final Display display = new Display();
 		final Shell shell = new Shell(display);
@@ -40,17 +41,17 @@ public class Browser9 {
 			public void completed(ProgressEvent event) {
 				boolean result = browser.execute(script);
 				if (!result) {
-					System.out.println("execute failed for "+script);
+					if (verbose) System.out.println("execute failed for "+script);
 					passed = false;
 					return;
 				}
 				/* Script may additionally set the Status value */
 				String value = (String)browser.getData("query");
-				System.out.println("window.status after script: "+value);
+				if (verbose) System.out.println("window.status after script: "+value);
 				if (status != null) {
 					passed = status.equals(value);
 				} else {
-					System.out.println("Failure - expected "+script+", not "+value);
+					if (verbose) System.out.println("Failure - expected "+script+", not "+value);
 				}
 			}
 		});
@@ -92,13 +93,13 @@ public class Browser9 {
 		int fail = 0;
 				
 		String pluginPath = System.getProperty("PLUGIN_PATH");
-		System.out.println("PLUGIN_PATH <"+pluginPath+">");
+		if (verbose) System.out.println("PLUGIN_PATH <"+pluginPath+">");
 		String url;
 		for (int i = 0; i < html.length; i++) {
 			if (pluginPath == null) url = Browser9.class.getClassLoader().getResource(html[i]).toString();
 			else url = pluginPath + "/data/"+html[i];
 			boolean result = test(url, script[i], status[i]); 
-			System.out.print(result ? "." : "E");
+			if (verbose) System.out.print(result ? "." : "E");
 			if (!result) fail++; 
 		}
 		return fail == 0;
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 eca8677cd5..95663b138b 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,6 +21,7 @@ import org.eclipse.swt.widgets.*;
  * @see org.eclipse.swt.browser.StatusTextListener
  */
 public class Test_BrowserSuite extends SwtTestCase {
+	public static boolean verbose = false;
 
 public Test_BrowserSuite(String name) {
 	super(name);
@@ -37,55 +38,55 @@ protected void tearDown() {
 }
 
 public void Browser1() {
-	System.out.println("** Browser1 **");
+	if (verbose) System.out.println("** Browser1 **");
 	boolean result = Browser1.test();
 	assertTrue(result);
 }
 
 public void Browser2() {
-	System.out.println("** Browser2 **");
+	if (verbose) System.out.println("** Browser2 **");
 	boolean result = Browser2.test();
 	assertTrue(result);
 }
 
 public void Browser3() {
-	System.out.println("** Browser3 **");
+	if (verbose) System.out.println("** Browser3 **");
 	boolean result = Browser3.test();
 	assertTrue(result);
 }
 
 public void Browser4() {
-	System.out.println("** Browser4 **");
+	if (verbose) System.out.println("** Browser4 **");
 	boolean result = Browser4.test();
 	assertTrue(result);
 }
 
 public void Browser5() {
-	System.out.println("** Browser5 **");
+	if (verbose) System.out.println("** Browser5 **");
 	boolean result = Browser5.test();
 	assertTrue(result);
 }
 
 public void Browser6() {
-	System.out.println("** Browser6 **");
+	if (verbose) System.out.println("** Browser6 **");
 	boolean result = Browser6.test();
 	assertTrue(result);
 }
 
 public void Browser7() {
-	System.out.println("** Browser7 **");
+	if (verbose) System.out.println("** Browser7 **");
 	boolean result = Browser7.test();
 	assertTrue(result);
 }
 
 public void Browser8() {
-	System.out.println("** Browser8 **");
+	if (verbose) System.out.println("** Browser8 **");
 	boolean result = Browser8.test();
 	assertTrue(result);
 }
 
 public void Browser9() {
-	System.out.println("** Browser9 **");
+	if (verbose) System.out.println("** Browser9 **");
 	boolean result = Browser9.test();
 	assertTrue(result);
 }