ProgressBar improved with help of asynchronous JUnit tests.

jossonsmith · jossonsmith · commit edf413087a18 · 2006-08-02T17:39:42.000Z
diff --git a/tests/net.sf.j2s.test.swt/ajaxjunit/net/sf/j2s/ajax/junit/AsyncSWT.java b/tests/net.sf.j2s.test.swt/ajaxjunit/net/sf/j2s/ajax/junit/AsyncSWT.java
@@ -14,6 +14,9 @@
 package net.sf.j2s.ajax.junit;
 
 import junit.framework.AssertionFailedError;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -23,6 +26,16 @@
  */
 public class AsyncSWT {
 	
+	private static boolean shellAutoClose = true;
+	
+	public static void setShellAutoClose(boolean close) {
+		shellAutoClose = close;
+	}
+	
+	public static boolean isShellAutoClose() {
+		return shellAutoClose;
+	}
+	
 	/**
 	 * @param shell
 	 * @param runnable
@@ -48,22 +61,17 @@ public class AsyncSWT {
 }
 			}
 		} finally {
-			shell.close ();
-			//if (f.next != null) {
-			//	f.next ();
-			//}
+			if (net.sf.j2s.ajax.junit.AsyncSWT.isShellAutoClose ()) {
+				shell.close ();
+			}
 		}
 	} else {
-		shell.close ();
-		//if (f.next != null) {
-		//	f.next ();
-		//}
+		if (net.sf.j2s.ajax.junit.AsyncSWT.isShellAutoClose ()) {
+			shell.close ();
+		}
 	}
 };
 var key = "j2s.swt.shell.finish.layout";
-//if (window[key] != null) {
-//	f.next = window[key];
-//} 
 window[key] = f;
 var closeFun = closeCleanUp;
 if (Clazz.instanceOf (runnable, net.sf.j2s.ajax.junit.AsyncTestRunnable)) {
@@ -95,15 +103,19 @@ public static void waitLayout(Shell shell, Runnable runnable) {
 					}
 				}
 			} finally {
-				shell.close();
+				if (isShellAutoClose()) {
+					shell.close();
+				}
 			}
 		} else {
-			shell.close();
+			if (isShellAutoClose()) {
+				shell.close();
+			}
 		}
 		if (runnable instanceof AsyncTestRunnable) {
 			final AsyncTestRunnable aTest = (AsyncTestRunnable) runnable;
 			//aTest.callback();
-			new Thread(new Runnable() {
+			final Runnable callback = new Runnable() {
 				public void run() {
 					try {
 						Thread.sleep(100);
@@ -112,7 +124,20 @@ public void run() {
 					}
 					aTest.callback();
 				}
-			}).start();
+			};
+			if (isShellAutoClose()) {
+				new Thread(callback).start();
+			} else {
+				shell.addDisposeListener(new DisposeListener() {
+					public void widgetDisposed(DisposeEvent e) {
+						new Thread(callback).start();
+					}
+				});
+				Display display = shell.getDisplay();
+				while (!shell.isDisposed ()) {
+					if (!display.readAndDispatch ()) display.sleep ();
+				}
+			}
 		}
 	}
 }
