Index: src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java =================================================================== --- src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java (revision 524103) +++ src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java (working copy) @@ -175,15 +175,18 @@ f.add(container); f.setSize(100, 300); f.show(); + + try { + assertSame(c2, aContainer.getAccessibleAt(p)); + p.translate(cont1.getX(), cont1.getY()); - assertSame(c2, aContainer.getAccessibleAt(p)); -// container.remove(c2); // why ??? last assert should pass without this? - p.translate(cont1.getX(), cont1.getY()); - - assertSame(cont1, aContainer.getAccessibleAt(p)); - p = new Point(); - assertSame(c3, cont1.getAccessibleContext().getAccessibleComponent().getAccessibleAt(p)); - + assertSame(cont1, aContainer.getAccessibleAt(p)); + p = new Point(); + assertSame(c3, cont1.getAccessibleContext() + .getAccessibleComponent().getAccessibleAt(p)); + } finally { + f.dispose(); + } } public final void testAccessibleAWTContainer() { Index: src/test/api/java/windows/java/awt/WinWindowRTest.java =================================================================== --- src/test/api/java/windows/java/awt/WinWindowRTest.java (revision 524103) +++ src/test/api/java/windows/java/awt/WinWindowRTest.java (working copy) @@ -40,29 +40,34 @@ public final void testSetVisible() throws Throwable { Frame frame = new Frame(); - frame.addWindowListener(new WindowAdapter() { - @Override - public void windowOpened(WindowEvent e) { - try { - assertTrue("window is focused before opened", - e.getWindow().isFocused()); - } catch (Throwable err) { - error = err; + + try { + frame.addWindowListener(new WindowAdapter() { + @Override + public void windowOpened(WindowEvent e) { + try { + assertTrue("window is focused before opened", e + .getWindow().isFocused()); + } catch (Throwable err) { + error = err; + } } + }); + + frame.pack(); + frame.setVisible(true); + + try { + Thread.sleep(1000); + } catch (InterruptedException e1) { + // ignore } - }); - frame.pack(); - frame.setVisible(true); - try { - Thread.sleep(1000); - } catch (InterruptedException e1) { - e1.printStackTrace(); + + if (error != null) { + throw error; + } + } finally { + frame.dispose(); } - if (error != null) { - throw error; - } - frame.dispose(); - } - }