diff options
| author | Sven Gothel <[email protected]> | 2012-05-02 01:18:06 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-05-02 01:18:06 +0200 |
| commit | 969567663c08597c2c2effe6128f4810ec252513 (patch) | |
| tree | 2e745a46aa7db638f98b05f85f3096ead2f578a7 | |
| parent | c9faebb8f8f6be4c0de4919a516b4692742bc13c (diff) | |
Complete commit c9faebb8f8f6be4c0de4919a516b4692742bc13c: Use 'enum ReparentOperation' in test.
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java index 256868c6c..6b7b155c5 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java @@ -368,7 +368,7 @@ public class TestParenting01NEWT extends UITestCase { animator2.start(); int state = 0; - int reparentAction; + Window.ReparentOperation reparentAction; while(animator1.isAnimating() && animator1.getTotalFPSDuration()<3*durationPerTest) { Thread.sleep(durationPerTest); switch(state) { @@ -378,7 +378,7 @@ public class TestParenting01NEWT extends UITestCase { System.err.println("Frames(1) "+glWindow2.getTotalFPSFrames()); reparentAction = glWindow2.reparentWindow(glWindow1, reparentRecreate); System.err.println("Frames(2) "+glWindow2.getTotalFPSFrames()); - Assert.assertTrue(Window.ReparentAction.ACTION_INVALID < reparentAction); + Assert.assertTrue(Window.ReparentOperation.ACTION_INVALID != reparentAction); Assert.assertEquals(true, glWindow2.isVisible()); Assert.assertEquals(true, glWindow2.isNativeValid()); Assert.assertSame(glWindow1,glWindow2.getParent()); @@ -402,7 +402,7 @@ public class TestParenting01NEWT extends UITestCase { Assert.assertEquals(true, glWindow2.isVisible()); reparentAction = glWindow2.reparentWindow(null, reparentRecreate); - Assert.assertTrue(Window.ReparentAction.ACTION_INVALID < reparentAction); + Assert.assertTrue(Window.ReparentOperation.ACTION_INVALID != reparentAction); Assert.assertEquals(true, glWindow2.isVisible()); Assert.assertEquals(true, glWindow2.isNativeValid()); Assert.assertNull(glWindow2.getParent()); @@ -556,14 +556,14 @@ public class TestParenting01NEWT extends UITestCase { animator2.start(); int state = 0; - int reparentAction; + Window.ReparentOperation reparentAction; while(animator1.isAnimating() && animator1.getTotalFPSDuration()<3*durationPerTest) { Thread.sleep(durationPerTest); switch(state) { case 0: Assert.assertEquals(true, glWindow2.isVisible()); reparentAction = glWindow2.reparentWindow(null, reparentRecreate); - Assert.assertTrue(Window.ReparentAction.ACTION_INVALID < reparentAction); + Assert.assertTrue(Window.ReparentOperation.ACTION_INVALID != reparentAction); Assert.assertEquals(true, glWindow2.isVisible()); Assert.assertEquals(true, glWindow2.isNativeValid()); System.err.println("Frames for reparentWindow(parent, "+reparentRecreate+"): "+reparentAction+", B2: "+glWindow2.getTotalFPSFrames()); @@ -576,7 +576,7 @@ public class TestParenting01NEWT extends UITestCase { case 1: Assert.assertEquals(true, glWindow2.isVisible()); reparentAction = glWindow2.reparentWindow(glWindow1, reparentRecreate); - Assert.assertTrue(Window.ReparentAction.ACTION_INVALID < reparentAction); + Assert.assertTrue(Window.ReparentOperation.ACTION_INVALID != reparentAction); Assert.assertEquals(true, glWindow2.isVisible()); Assert.assertEquals(true, glWindow2.isNativeValid()); System.err.println("Frames for reparentWindow(parent, "+reparentRecreate+"): "+reparentAction+", B3 "+glWindow2.getTotalFPSFrames()); |