Fixup GWT Test runner

Add some logging, and enable the log console.
Only set dispose flag on ESC if a test is active.
Disable NetAPITest (it won't even compile because it abuses FileHandles).

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/GdxTests.gwt.xml b/tests/gdx-tests/src/com/badlogic/gdx/GdxTests.gwt.xml
index 8f34583..66adb59 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/GdxTests.gwt.xml
+++ b/tests/gdx-tests/src/com/badlogic/gdx/GdxTests.gwt.xml
@@ -26,11 +26,12 @@
                <exclude name="**/VorbisTest.java"/> <!-- native -->\r
                <exclude name="**/WavTest.java"/> <!-- naive -->\r
                <exclude name="**/AssetsFileGenerator.java"/> <!-- utility -->\r
-               <exclude name="**/GdxTests.java"/> <!-- utilty -->\r
-               <exclude name="**/InternationalFontsTest.java"/> <!-- utilty -->\r
+               <exclude name="**/GdxTests.java"/> <!-- utility -->\r
+               <exclude name="**/InternationalFontsTest.java"/> <!-- utility -->\r
                <exclude name="**/BulletTestCollection.java"/> <!-- native -->\r
                <exclude name="**/bullet/"/> <!-- native -->\r
                <exclude name="**/FloatTextureTest.java"/> <!-- GLES 2.0 extension -->\r
                <exclude name="**/GLEEDTest.java"/>\r
+               <exclude name="**/NetAPITest.java"/> <!-- abuses FileHandle() -->\r
        </source>\r
 </module>
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtTestWrapper.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtTestWrapper.java
index ce25b41..526e810 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtTestWrapper.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtTestWrapper.java
@@ -16,6 +16,7 @@
 \r
 package com.badlogic.gdx.tests.gwt;\r
 \r
+import com.badlogic.gdx.Application;\r
 import com.badlogic.gdx.Gdx;\r
 import com.badlogic.gdx.Input;\r
 import com.badlogic.gdx.InputAdapter;\r
@@ -77,6 +78,7 @@ import com.badlogic.gdx.tests.ParticleEmitterTest;
 import com.badlogic.gdx.tests.PixelsPerInchTest;\r
 import com.badlogic.gdx.tests.ProjectiveTextureTest;\r
 import com.badlogic.gdx.tests.RotationTest;\r
+import com.badlogic.gdx.tests.RunnablePostTest;\r
 import com.badlogic.gdx.tests.ShadowMappingTest;\r
 import com.badlogic.gdx.tests.ShapeRendererTest;\r
 import com.badlogic.gdx.tests.SimpleAnimationTest;\r
@@ -103,10 +105,13 @@ public class GwtTestWrapper extends GdxTest {
        Skin skin;\r
        BitmapFont font;\r
        GdxTest test;\r
-       boolean dispose;\r
+       boolean dispose = false;\r
 \r
        @Override\r
        public void create () {\r
+               Gdx.app.setLogLevel(Application.LOG_DEBUG);\r
+               Gdx.app.log("GdxTestGwt", "Setting up for " +tests.length+ " tests.");\r
+               \r
                ui = new Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), true);\r
                skin = new Skin(Gdx.files.internal("data/uiskin.json"));\r
                font = new BitmapFont(Gdx.files.internal("data/arial-15.fnt"), false);\r
@@ -125,6 +130,7 @@ public class GwtTestWrapper extends GdxTest {
                                public void clicked (InputEvent event, float x, float y) {\r
                                        ((InputWrapper)Gdx.input).multiplexer.removeProcessor(ui);\r
                                        test = instancer.instance();\r
+                                       Gdx.app.log("GdxTestGwt", "Clicked on " + test.getClass().getName());\r
                                        test.create();\r
                                        test.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());\r
                                }\r
@@ -139,14 +145,19 @@ public class GwtTestWrapper extends GdxTest {
                        @Override\r
                        public boolean keyUp (int keycode) {\r
                                if (keycode == Keys.ESCAPE) {\r
-                                       dispose = true;\r
+                                       if (test != null) {\r
+                                               Gdx.app.log("GdxTestGwt", "Exiting current test.");\r
+                                               dispose = true;\r
+                                       }\r
                                }\r
                                return false;\r
                        }\r
                };\r
                ((InputWrapper)Gdx.input).multiplexer.addProcessor(ui);\r
+               \r
+               Gdx.app.log("GdxTestGwt", "Test picker UI setup complete.");\r
        }\r
-\r
+       \r
        public void render () {\r
                if (test == null) {\r
                        Gdx.gl.glViewport(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());\r
@@ -174,6 +185,9 @@ public class GwtTestWrapper extends GdxTest {
        public void resize (int width, int height) {\r
                ui.setViewport(width, height, false);\r
                container.setSize(width, height);\r
+               if (test != null) {\r
+                       test.resize(width, height);\r
+               }\r
        }\r
 \r
        class InputWrapper extends InputAdapter implements Input {\r
@@ -562,7 +576,8 @@ public class GwtTestWrapper extends GdxTest {
                        public GdxTest instance () {\r
                                return new RotationTest();\r
                        }\r
-               },\r
+               }, \r
+// new Instancer() {public GdxTest instance(){return new RunnablePostTest();}}, // Goes into infinite loop\r
 // new Instancer() {public GdxTest instance(){return new ScrollPaneTest();}}, // FIXME this messes up stuff, why?\r
 // new Instancer() {public GdxTest instance(){return new ShaderMultitextureTest();}}, // FIXME fucks up stuff\r
                new Instancer() {\r