diff options
author | Sven Gothel <[email protected]> | 2013-06-25 09:33:42 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-06-25 09:33:42 +0200 |
commit | d3e5d510e30c207654301f60e2f7261e289d9e63 (patch) | |
tree | 58ddc6b9c8de8d6bcb06550c3e8e322267e22a97 | |
parent | 7e0e2ea04e619b2731c55fa86f1af42df920de65 (diff) |
TestFocus02SwingAWTRobot: Fix Java7 'changed behavior': Relax focus traversal validation checks.
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java b/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java index a1f4221db..646dc711b 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java @@ -202,7 +202,13 @@ public class TestFocus02SwingAWTRobot extends UITestCase { System.err.println("FOCUS NEWT Canvas/GLWindow request"); EventCountAdapterUtil.reset(eventCountAdapters); AWTRobotUtil.assertRequestFocusAndWait(robot, newtCanvasAWT, newtCanvasAWT.getNEWTChild(), glWindow1FA, buttonNorthOuterFA); - Assert.assertEquals(false, newtCanvasAWTFA.focusGained()); + // Manually tested on Java7/[Linux,Windows] (where this assertion failed), + // Should be OK to have the AWT component assume it also has the focus. + // Assert.assertTrue("Focus prev. gained, but NewtCanvasAWT didn't loose it. Gainer: "+glWindow1FA+"; Looser "+newtCanvasAWTFA, + // AWTRobotUtil.waitForFocus(glWindow1FA, newtCanvasAWTFA)); + if( !AWTRobotUtil.waitForFocus(glWindow1FA, newtCanvasAWTFA) ) { + System.err.println("Info: Focus prev. gained, but NewtCanvasAWT didn't loose it. Gainer: "+glWindow1FA+"; Looser "+newtCanvasAWTFA); + } Assert.assertEquals(false, buttonNorthInnerFA.focusGained()); System.err.println("FOCUS NEWT Canvas/GLWindow sync"); AWTRobotUtil.assertKeyType(robot, java.awt.event.KeyEvent.VK_A, 2, glWindow1, glWindow1KA); |