summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-10-10 15:43:43 +0200
committerSven Gothel <[email protected]>2014-10-10 15:43:43 +0200
commitc795290af0cb30c36760b739c9e6ebcfa3357fc8 (patch)
treeeb4d03fe8dce6ae6613c8ebfce54b59c9ce777b8
parentb24687d46b2374967ea874f54707610138cad477 (diff)
Fix minor compile errors introduced while backporting from master branch
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
index eb2536639..40c943f30 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
@@ -162,7 +162,7 @@ public class TestGearsES2NEWT extends UITestCase {
public void display(final GLAutoDrawable drawable) {
final GLAnimatorControl actrl = drawable.getAnimator();
if(waitForKey && actrl.getTotalFPSFrames() == 60*3) {
- JunitTracer.waitForKey("3s mark");
+ UITestCase.waitForKey("3s mark");
actrl.resetFPSCounter();
waitForKey = false;
}
@@ -726,7 +726,7 @@ public class TestGearsES2NEWT extends UITestCase {
System.err.println("mappedBuffers "+useMappedBuffers);
if(waitForKey) {
- JunitTracer.waitForKey("Start");
+ UITestCase.waitForKey("Start");
}
org.junit.runner.JUnitCore.main(TestGearsES2NEWT.class.getName());
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java
index 75e63f7a7..868d897b8 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java
@@ -41,7 +41,6 @@ import org.junit.Test;
import org.junit.runners.MethodSorters;
import com.jogamp.common.util.IOUtil;
-import com.jogamp.junit.util.SingletonJunitCase;
import com.jogamp.newt.Display;
import com.jogamp.newt.Display.PointerIcon;
import com.jogamp.newt.opengl.GLWindow;
@@ -49,11 +48,12 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
import com.jogamp.opengl.test.junit.util.QuitAdapter;
+import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.AnimatorBase;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestWindowAndPointerIconNEWT extends SingletonJunitCase {
+public class TestWindowAndPointerIconNEWT extends UITestCase {
static long duration = 1000; // ms