Index: modules/awt/src/test/api/java/common/java/awt/EventDispatchThreadR2Test.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/EventDispatchThreadR2Test.java (revision 0) +++ modules/awt/src/test/api/java/common/java/awt/EventDispatchThreadR2Test.java (revision 0) @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 java.awt; + +import junit.framework.TestCase; + +/* + * Regression test 2 for JIRA issue HARMONY-2818 + */ +public class EventDispatchThreadR2Test extends TestCase { + + private static final String MSG = "expected from EDT"; + + public EventDispatchThreadR2Test(String name) { + super(name); + } + + public final void test2() throws Throwable { + try { + EventQueue.invokeAndWait( + new Runnable() { + public void run() { + System.out.println(getName() + ": 1"); + throw new RuntimeException(MSG); + } + } + ); + } catch (java.lang.reflect.InvocationTargetException ok) { + System.out.println(getName() + ": " + ok); + assertTrue(MSG.equals(ok.getCause().getMessage())); + } + EventQueue.invokeAndWait( + new Runnable() { + public void run() { + System.out.println(getName() + ": 2"); + } + } + ); + } + + public static void main(String[] args) { + junit.textui.TestRunner.run(EventDispatchThreadR2Test.class); + } +} Index: modules/awt/src/test/api/java/common/java/awt/EventDispatchThreadRTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/EventDispatchThreadRTest.java (revision 0) +++ modules/awt/src/test/api/java/common/java/awt/EventDispatchThreadRTest.java (revision 0) @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 java.awt; + +import junit.framework.TestCase; + +/* + * Regression test 1 for JIRA issue HARMONY-2818 + */ +public class EventDispatchThreadRTest extends TestCase { + + public EventDispatchThreadRTest(String name) { + super(name); + } + + public final void test() throws Throwable { + EventQueue.invokeLater( + new Runnable() { + public void run() { + System.out.println(getName() + ": 1"); + throw new RuntimeException("expected from EDT"); + } + } + ); + EventQueue.invokeAndWait( + new Runnable() { + public void run() { + System.out.println(getName() + ": 2"); + } + } + ); + } + + public static void main(String[] args) { + junit.textui.TestRunner.run(EventDispatchThreadRTest.class); + } +}