diff options
author | Sven Gothel <[email protected]> | 2010-11-25 20:19:15 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-25 20:19:15 +0100 |
commit | 237ab306f4dba00316b8e09f571cf7cb5612d0c3 (patch) | |
tree | ea920798e822ce00a9573e0b4bc330d6ff9426a2 | |
parent | 2aa90676e4954269f86ec23b39e638b12e178e92 (diff) |
Reduce the use of xml brackets to reduce potential hudson/junit xml parser exceptions
8 files changed, 16 insertions, 16 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index 2536d56ab..c7e2d558b 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -125,7 +125,7 @@ </chainedmapper> </pathconvert> <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.xml"/> - <echo message="Testing ${test.class.fqn} -> ${test.class.result.file}"/> + <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/> <apply dir="." executable="${java.home}/bin/java" parallel="false" timeout="${batchtest.timeout}" diff --git a/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java index fc48ac39f..742c0174c 100644 --- a/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java +++ b/src/junit/com/jogamp/test/junit/jogl/acore/TestGLProfile01NEWT.java @@ -73,7 +73,7 @@ public class TestGLProfile01NEWT extends UITestCase { @Test public void test01GLProfileDefault() { - System.out.println("GLProfile <static> "+GLProfile.glAvailabilityToString()); + System.out.println("GLProfile "+GLProfile.glAvailabilityToString()); GLProfile glp = GLProfile.getDefault(); dumpVersion(glp); } @@ -82,7 +82,7 @@ public class TestGLProfile01NEWT extends UITestCase { public void test02GLProfileMaxFixedFunc() { // Assuming at least one fixed profile is available GLProfile glp = GLProfile.getMaxFixedFunc(); - System.out.println("GLProfile <static> getMaxFixedFunc(): "+glp); + System.out.println("GLProfile getMaxFixedFunc(): "+glp); if(glp.getName().equals(GLProfile.GL4bc)) { Assert.assertTrue(GLProfile.isGL4bcAvailable()); Assert.assertTrue(GLProfile.isGL3bcAvailable()); @@ -108,7 +108,7 @@ public class TestGLProfile01NEWT extends UITestCase { public void test03GLProfileMaxProgrammable() { // Assuming at least one programmable profile is available GLProfile glp = GLProfile.getMaxProgrammable(); - System.out.println("GLProfile <static> getMaxProgrammable(): "+glp); + System.out.println("GLProfile getMaxProgrammable(): "+glp); if(glp.getName().equals(GLProfile.GL4)) { Assert.assertTrue(GLProfile.isGL4Available()); Assert.assertTrue(GLProfile.isGL3Available()); @@ -137,7 +137,7 @@ public class TestGLProfile01NEWT extends UITestCase { return; } GLProfile glp = GLProfile.getGL2ES1(); - System.out.println("GLProfile <static> GL2ES1: "+glp); + System.out.println("GLProfile GL2ES1: "+glp); dumpVersion(glp); } @@ -148,7 +148,7 @@ public class TestGLProfile01NEWT extends UITestCase { return; } GLProfile glp = GLProfile.getGL2ES2(); - System.out.println("GLProfile <static> GL2ES2: "+glp); + System.out.println("GLProfile GL2ES2: "+glp); dumpVersion(glp); } diff --git a/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java b/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java index 09dfc856d..88551bdb4 100644 --- a/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java +++ b/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT01GLn.java @@ -53,7 +53,7 @@ public class TestAWT01GLn extends UITestCase { @BeforeClass public static void startup() { GLProfile.initSingleton(true); - System.out.println("GLProfile <static> "+GLProfile.glAvailabilityToString()); + System.out.println("GLProfile "+GLProfile.glAvailabilityToString()); } @Before diff --git a/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java b/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java index 7678f60e1..a2f66859f 100644 --- a/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java +++ b/src/junit/com/jogamp/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java @@ -59,7 +59,7 @@ public class TestAWT03GLCanvasRecreate01 extends UITestCase { @BeforeClass public static void startup() { GLProfile.initSingleton(true); - System.out.println("GLProfile <static> "+GLProfile.glAvailabilityToString()); + System.out.println("GLProfile "+GLProfile.glAvailabilityToString()); } @Before diff --git a/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java b/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java index a32dc90dc..661f61d37 100644 --- a/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java +++ b/src/junit/com/jogamp/test/junit/jogl/awt/TestSwingAWT01GLn.java @@ -59,7 +59,7 @@ public class TestSwingAWT01GLn extends UITestCase { @BeforeClass public static void startup() { GLProfile.initSingleton(true); - System.out.println("GLProfile <static> "+GLProfile.glAvailabilityToString()); + System.out.println("GLProfile "+GLProfile.glAvailabilityToString()); } @Before diff --git a/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03AWT.java b/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03AWT.java index 61086099c..00a78a14f 100644 --- a/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03AWT.java +++ b/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03AWT.java @@ -108,10 +108,10 @@ public class TestParenting03AWT extends UITestCase { f_glWindow1.setFullscreen(!f_glWindow1.isFullscreen()); } else if(e.getKeyChar()=='r') { if(f_glWindow1.getParent()==null) { - System.err.println("XXX glWin1 -> home"); + System.err.println("XXX glWin1 to home"); f_glWindow1.reparentWindow(f_newtCanvasAWT1.getNativeWindow()); } else { - System.err.println("XXX glWin1 -> TOP"); + System.err.println("XXX glWin1 to TOP"); f_glWindow1.reparentWindow(null); } } diff --git a/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03bAWT.java b/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03bAWT.java index a31e49b45..5f42d9f7e 100644 --- a/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03bAWT.java +++ b/src/junit/com/jogamp/test/junit/newt/parenting/TestParenting03bAWT.java @@ -106,10 +106,10 @@ public class TestParenting03bAWT extends UITestCase { f_glWindow1.setFullscreen(!f_glWindow1.isFullscreen()); } else if(e.getKeyChar()=='r') { if(f_glWindow1.getParent()==null) { - System.err.println("XXX glWin1 -> home"); + System.err.println("XXX glWin1 to home"); f_glWindow1.reparentWindow(f_newtCanvasAWT1.getNativeWindow()); } else { - System.err.println("XXX glWin1 -> TOP"); + System.err.println("XXX glWin1 to TOP"); f_glWindow1.reparentWindow(null); } } @@ -137,10 +137,10 @@ public class TestParenting03bAWT extends UITestCase { f_glWindow2.setFullscreen(!f_glWindow2.isFullscreen()); } else if(e.getKeyChar()=='r') { if(f_glWindow2.getParent()==null) { - System.err.println("XXX glWin2 -> home"); + System.err.println("XXX glWin2 to home"); f_glWindow2.reparentWindow(f_newtCanvasAWT2.getNativeWindow()); } else { - System.err.println("XXX glWin2 -> TOP"); + System.err.println("XXX glWin2 to TOP"); f_glWindow2.reparentWindow(null); } } diff --git a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java index 852f77fcb..2c3fd9cb2 100644 --- a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java +++ b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java @@ -51,7 +51,7 @@ public class KeyEvent extends InputEvent public String toString() { return "KeyEvent["+getEventTypeString(getEventType())+ - ", code "+keyCode+"("+toHexString(keyCode)+"), char <"+keyChar+"> ("+toHexString((int)keyChar)+"), isActionKey "+isActionKey()+", "+super.toString()+"]"; + ", code "+keyCode+"("+toHexString(keyCode)+"), char '"+keyChar+"' ("+toHexString((int)keyChar)+"), isActionKey "+isActionKey()+", "+super.toString()+"]"; } public static String getEventTypeString(int type) { |