From b8a0b3ffdcb76a2c3a1cfac91b3229c3e3929b5d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 29 Jun 2013 11:36:00 +0200
Subject: Tests: Fix enumeration of monitor/screen mode tests, add tests
 description to class header.

---
 .../opengl/test/junit/newt/ManualScreenMode03aNEWT.java       |  4 ++--
 .../jogamp/opengl/test/junit/newt/TestScreenMode00aNEWT.java  |  8 ++++++--
 .../jogamp/opengl/test/junit/newt/TestScreenMode00bNEWT.java  |  4 ++++
 .../jogamp/opengl/test/junit/newt/TestScreenMode01aNEWT.java  |  8 +++++++-
 .../jogamp/opengl/test/junit/newt/TestScreenMode01cNEWT.java  |  2 +-
 .../jogamp/opengl/test/junit/newt/TestScreenMode01dNEWT.java  | 10 +++++-----
 .../jogamp/opengl/test/junit/newt/TestScreenMode02aNEWT.java  | 11 +++++++++--
 7 files changed, 34 insertions(+), 13 deletions(-)

(limited to 'src/test/com')

diff --git a/src/test/com/jogamp/opengl/test/junit/newt/ManualScreenMode03aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/ManualScreenMode03aNEWT.java
index 875e4fe86..1b67f1fe5 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/ManualScreenMode03aNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/ManualScreenMode03aNEWT.java
@@ -51,7 +51,7 @@ import javax.media.nativewindow.util.Dimension;
  * which shall reset the ScreenMode to it's original state
  * when the application exists (normal or ctrl-c).
  */
-public class ManualScreenMode03NEWT extends UITestCase {
+public class ManualScreenMode03aNEWT extends UITestCase {
     static int waitTime = 7000; // 1 sec
     
     static GLWindow createWindow(Screen screen, GLCapabilities caps, int width, int height, boolean onscreen, boolean undecorated) {
@@ -108,7 +108,7 @@ public class ManualScreenMode03NEWT extends UITestCase {
     }
 
     public static void main(String args[]) throws IOException {
-        ManualScreenMode03NEWT t = new ManualScreenMode03NEWT();
+        ManualScreenMode03aNEWT t = new ManualScreenMode03aNEWT();
         t.run();
     }
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00aNEWT.java
index f64cf2eb8..353377292 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00aNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00aNEWT.java
@@ -53,7 +53,11 @@ import javax.media.opengl.GLProfile;
 import jogamp.newt.MonitorDeviceImpl;
 import jogamp.newt.MonitorModeProps;
 
-public class TestScreenMode00NEWT extends UITestCase {
+/**
+ * Validating consistency of MonitorMode data from Screen (all modes)
+ * and from a particular MonitorDevice.
+ */
+public class TestScreenMode00aNEWT extends UITestCase {
     static int screenIdx = 0;
     static int width, height;
     
@@ -173,7 +177,7 @@ public class TestScreenMode00NEWT extends UITestCase {
                 screenIdx = atoi(args[i]);
             }
         }
-        String tstname = TestScreenMode00NEWT.class.getName();
+        String tstname = TestScreenMode00aNEWT.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00bNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00bNEWT.java
index fe5dd93cb..dfd1ec47e 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00bNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode00bNEWT.java
@@ -51,6 +51,10 @@ import java.util.List;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLCapabilitiesImmutable;
 
+/**
+ * Queries the current MonitorMode 50 times,
+ * stressing a possible race condition. 
+ */
 public class TestScreenMode00bNEWT extends UITestCase {
     static int width, height;
     
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01aNEWT.java
index c638058f4..482a0cf34 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01aNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01aNEWT.java
@@ -52,9 +52,15 @@ import java.util.List;
 import javax.media.nativewindow.util.Dimension;
 
 /**
+ * <p>
+ * Tests MonitorMode reset, by destroying the last Screen (reference),
+ * i.e. the original MonitorMode should get reinstated!
+ * </p>
+ * <p>
  * Documents remedy B) for NV RANDR/GL bug
+ * </p>
  * 
- * @see TestScreenMode01NEWT#cleanupGL()
+ * @see TestScreenMode01dNEWT#cleanupGL()
  */
 public class TestScreenMode01aNEWT extends UITestCase {
     static GLProfile glp;
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01cNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01cNEWT.java
index 30c06e932..2a9db11c2 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01cNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01cNEWT.java
@@ -55,7 +55,7 @@ import javax.media.nativewindow.util.Rectangle;
 import javax.media.nativewindow.util.RectangleImmutable;
 
 /**
- * Fullscreen on separate monitors ..
+ * Fullscreen on separate monitors, incl. spanning across multiple monitors.
  */
 public class TestScreenMode01cNEWT extends UITestCase {
     static GLProfile glp;
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01dNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01dNEWT.java
index a2ce7cec0..65293317e 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01dNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode01dNEWT.java
@@ -55,12 +55,12 @@ import java.util.List;
 import javax.media.nativewindow.util.Dimension;
 
 /**
- * Demonstrates fullscreen with and without ScreenMode change.
- * 
+ * Demonstrates fullscreen without MonitorMode change
+ * and fullscreen before and after MonitorMode change.
  * <p>
- * Also documents NV RANDR/GL bug, see {@link TestScreenMode01NEWT#cleanupGL()}.</p> 
+ * Also documents NV RANDR/GL bug, see {@link TestScreenMode01dNEWT#cleanupGL()}.</p> 
  */
-public class TestScreenMode01NEWT extends UITestCase {
+public class TestScreenMode01dNEWT extends UITestCase {
     static GLProfile glp;
     static int width, height;
     
@@ -386,7 +386,7 @@ public class TestScreenMode01NEWT extends UITestCase {
     }
 
     public static void main(String args[]) throws IOException {
-        String tstname = TestScreenMode01NEWT.class.getName();
+        String tstname = TestScreenMode01dNEWT.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02aNEWT.java
index 58bce4cc9..6b12a6bed 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02aNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestScreenMode02aNEWT.java
@@ -54,7 +54,14 @@ import com.jogamp.opengl.test.junit.util.UITestCase;
 import java.util.List;
 import javax.media.nativewindow.util.Dimension;
 
-public class TestScreenMode02NEWT extends UITestCase {
+/**
+ * Tests MonitorMode change w/ changed rotation.
+ * <p>
+ * Also tests MonitorMode reset after last Screen is dereferenced,
+ * i.e. MonitorMode should be reinstated.
+ * </p>
+ */
+public class TestScreenMode02aNEWT extends UITestCase {
     static GLProfile glp;
     static int width, height;
     
@@ -190,7 +197,7 @@ public class TestScreenMode02NEWT extends UITestCase {
     }
 
     public static void main(String args[]) throws IOException {
-        String tstname = TestScreenMode02NEWT.class.getName();
+        String tstname = TestScreenMode02aNEWT.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }
 
-- 
cgit v1.2.3