Adds test cases for uncaught exception handling in GWTTestCase.

This patch also includes refactoring to share code in GWTTestCaseXXXTests.

Change-Id: I5dc3d37d0f49cce94cfe5494b0631a3f1ae463db
Review-Link: https://gwt-review.googlesource.com/#/c/1940/


git-svn-id: http://google-web-toolkit.googlecode.com/svn/trunk@11520 8db76d5a-ed1c-0410-87a9-c151d255dfc7

Author: [email protected]

user/test/com/google/gwt/junit/JUnitSuite.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2009 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -19,6 +19,7 @@
 import com.google.gwt.junit.client.GWTTestCaseAsyncTest;
 import com.google.gwt.junit.client.GWTTestCaseSetupTearDownTest;
 import com.google.gwt.junit.client.GWTTestCaseTest;
+import com.google.gwt.junit.client.GWTTestCaseUncaughtExceptionHandlerTest;
 import com.google.gwt.junit.client.PropertyDefiningGWTTest;
 
 import junit.framework.Test;
@@ -36,6 +37,7 @@ public static Test suite() {
     // suite.addTestSuite(BenchmarkTest.class);
 
     suite.addTestSuite(GWTTestCaseTest.class);
+    suite.addTestSuite(GWTTestCaseUncaughtExceptionHandlerTest.class);
     suite.addTest(new TestSuiteWithOrder(GWTTestCaseAsyncTest.class));
     suite.addTest(new TestSuiteWithOrder(GWTTestCaseSetupTearDownTest.class));
 

user/test/com/google/gwt/junit/TestResultWithExpectedFailures.java

@@ -75,7 +75,7 @@ private boolean isAnExpectedException(Test test, Throwable t) {
     ExpectedFailure annotation = getExpectedFailureAnnotation(test);
     if (annotation != null) {
       t = normalizeGwtTestException(t);
-      return t.getClass().isAssignableFrom(annotation.withType())
+      return annotation.withType().isAssignableFrom(t.getClass())
           && getExceptionMessage(t).contains(annotation.withMessage());
     }
     return false;

user/test/com/google/gwt/junit/client/GWTTestCaseAsyncTest.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,24 +15,15 @@
  */
 package com.google.gwt.junit.client;
 
-import com.google.gwt.dom.client.ButtonElement;
-import com.google.gwt.dom.client.Document;
 import com.google.gwt.junit.ExpectedFailure;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Event;
-import com.google.gwt.user.client.EventListener;
 import com.google.gwt.user.client.Timer;
 
 /**
  * This class tests GwtTestCase in async mode.
  *
  * Note: This test requires some test methods to be executed in a specific order.
  */
-public class GWTTestCaseAsyncTest extends GWTTestCase {
-
-  public String getModuleName() {
-    return "com.google.gwt.junit.JUnit";
-  }
+public class GWTTestCaseAsyncTest extends GWTTestCaseTestBase {
 
   // The following tests (all prefixed with test_) are intended to test the
   // interaction of synchronous failures (within event handlers) with various
@@ -41,86 +32,75 @@ public String getModuleName() {
   //
   // Nomenclature for these tests:
   // DTF => delayTestFinish()
-  // SF => synchronous failure (from event handler)
+  // SF => synchronous failure (from event handler using failViaUncaughtException)
   // FT => finishTest()
   // F => fail()
   // R => return;
 
   @ExpectedFailure(withMessage = "test_dtf_sf")
   public void test_dtf_sf() {
     delayTestFinish();
-    synchronousFailure("test_dtf_sf");
+    failViaUncaughtException("test_dtf_sf");
   }
 
   @ExpectedFailure(withMessage = "test_dtf_sf_f")
   public void test_dtf_sf_f() {
     delayTestFinish();
-    synchronousFailure("test_dtf_sf_f");
+    failViaUncaughtException("test_dtf_sf_f");
     failNow("test_dtf_sf_f");
   }
 
   @ExpectedFailure(withMessage = "test_dtf_sf_ft")
   public void test_dtf_sf_ft() {
     delayTestFinish();
-    synchronousFailure("test_dtf_sf_ft");
+    failViaUncaughtException("test_dtf_sf_ft");
     finishTest();
   }
 
   // Issue: http://code.google.com/p/google-web-toolkit/issues/detail?id=7846
   @ExpectedFailure(withMessage = "test_dtf_sf_r_f")
   public void _suppressed_test_dtf_sf_r_f() {
     delayTestFinish();
-    synchronousFailure("test_dtf_sf_r_f");
+    failViaUncaughtException("test_dtf_sf_r_f");
     failLater("test_dtf_sf_r_f");
   }
 
   @ExpectedFailure(withMessage = "test_dtf_sf_r_ft")
   public void test_dtf_sf_r_ft() {
     delayTestFinish();
-    synchronousFailure("test_dtf_sf_r_ft");
+    failViaUncaughtException("test_dtf_sf_r_ft");
     finishTestLater();
   }
 
-  @ExpectedFailure(withMessage = "test_sf")
-  public void test_sf() {
-    synchronousFailure("test_sf");
-  }
-
   @ExpectedFailure(withMessage = "test_sf_dtf_f")
   public void test_sf_dtf_f() {
-    synchronousFailure("test_sf_dtf_f");
+    failViaUncaughtException("test_sf_dtf_f");
     delayTestFinish();
     failNow("test_sf_dtf_f");
   }
 
   @ExpectedFailure(withMessage = "test_sf_dtf_ft")
   public void test_sf_dtf_ft() {
-    synchronousFailure("test_sf_dtf_ft");
+    failViaUncaughtException("test_sf_dtf_ft");
     delayTestFinish();
     finishTest();
   }
 
   // Issue: http://code.google.com/p/google-web-toolkit/issues/detail?id=7846
   @ExpectedFailure(withMessage = "test_sf_dtf_r_f")
   public void _suppressed_test_sf_dtf_r_f() {
-    synchronousFailure("test_sf_dtf_r_f");
+    failViaUncaughtException("test_sf_dtf_r_f");
     delayTestFinish();
     failLater("test_sf_dtf_r_f");
   }
 
   @ExpectedFailure(withMessage = "test_sf_dtf_r_ft")
   public void test_sf_dtf_r_ft() {
-    synchronousFailure("test_sf_dtf_r_ft");
+    failViaUncaughtException("test_sf_dtf_r_ft");
     delayTestFinish();
     finishTestLater();
   }
 
-  @ExpectedFailure(withMessage = "test_sf_f")
-  public void test_sf_f() {
-    synchronousFailure("test_sf_f");
-    failNow("test_sf_f");
-  }
-
   /**
    * Fails normally.
    */
@@ -179,6 +159,7 @@ public void testSpuriousFinishTest() {
       finishTest();
       fail("finishTest should have failed");
     } catch (IllegalStateException e) {
+      // Expected
     }
   }
 
@@ -227,10 +208,6 @@ public void run() {
     }.schedule(delay);
   }
 
-  private void failNow(String failMsg) {
-    fail("Expected failure (" + failMsg + ")");
-  }
-
   private void finishTestLater() {
     finishTestLater(1);
   }
@@ -243,21 +220,4 @@ public void run() {
       }
     }.schedule(delay);
   }
-
-  // Trigger a test failure synchronously, but from within an event handler.
-  // (The exception thrown from fail() will get caught by the GWT UncaughtExceptionHandler).
-  private void synchronousFailure(final String failMsg) {
-    ButtonElement btn = Document.get().createPushButtonElement();
-    Document.get().getBody().appendChild(btn);
-    Event.sinkEvents(btn, Event.ONCLICK);
-
-    EventListener listener = new EventListener() {
-      public void onBrowserEvent(Event event) {
-        failNow(failMsg);
-      }
-    };
-
-    DOM.setEventListener(btn.<com.google.gwt.user.client.Element>cast(), listener);
-    btn.click();
-  }
 }

user/test/com/google/gwt/junit/client/GWTTestCaseTest.java

@@ -34,7 +34,7 @@
  * This class tests our implementation of the GWTTestCase class which provides the behavior of
  * TestCase that is necessary in GWT.
  */
-public class GWTTestCaseTest extends GWTTestCase {
+public class GWTTestCaseTest extends GWTTestCaseTestBase {
 
   private static void assertNotEquals(double a, double b, double delta) {
     boolean failed = false;
@@ -68,10 +68,6 @@ private static void assertNotEquals(float a, float b, float delta) {
   private Object obj2 = Collections.nCopies(2, "data");
   private Object obj1Equal = Collections.nCopies(1, "data");
 
-  public String getModuleName() {
-    return "com.google.gwt.junit.JUnit";
-  }
-
   @ExpectedFailure(withMessage = "testFail")
   public void testFail() {
     fail("testFail");
@@ -82,7 +78,7 @@ public void testThrowsException() throws Exception {
     throw new Exception();
   }
 
-  @ExpectedFailure(withType = JavaScriptException.class)
+  @ExpectedFailure(withType = Exception.class)
   public void testThrowsNonSerializableException() {
     throw new JavaScriptException("name", "desc");
   }

user/test/com/google/gwt/junit/client/GWTTestCaseTestBase.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.junit.client;
+
+
+import com.google.gwt.core.client.JavaScriptException;
+import com.google.gwt.dom.client.ButtonElement;
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.EventListener;
+
+/**
+ * A base class for tests GWTTestCase.
+ */
+abstract class GWTTestCaseTestBase extends GWTTestCase {
+
+  public String getModuleName() {
+    return "com.google.gwt.junit.JUnit";
+  }
+
+  protected void failNow(String failMsg) {
+    fail("Expected failure (" + failMsg + ")");
+  }
+
+  protected void failViaUncaughtException(final String failMsg) {
+    ButtonElement btn = Document.get().createPushButtonElement();
+    Document.get().getBody().appendChild(btn);
+    Event.sinkEvents(btn, Event.ONCLICK);
+
+    EventListener listener = new EventListener() {
+      public void onBrowserEvent(Event event) {
+        failNow(failMsg);
+      }
+    };
+
+    DOM.setEventListener(btn.<com.google.gwt.user.client.Element>cast(), listener);
+    try {
+      btn.click();
+    } catch (JavaScriptException ignored) {
+      // In HtmlUnit exception thrown by event handlers are propagated to #click() call.
+    }
+  }
+}