From fb60db3a633d82a0323f066a98a8a9fadf3ecff5 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 3 Oct 2014 04:43:51 +0200
Subject: SingletonTestCase: Move singleton test impl. from JOGL's UITestCase,
inherit from JunitTracer and use it for all tests.
- Certain performance tests don't make sense utilizing several jenkins unit tests on one machine,
hence singleton test execution is desired.
- JOGL's UITestCase also will derive from this SingletonTestCase
---
src/junit/com/jogamp/common/net/AssetURLConnectionBase.java | 4 ++--
src/junit/com/jogamp/common/net/TestUri01.java | 4 ++--
src/junit/com/jogamp/common/net/TestUri02Composing.java | 4 ++--
src/junit/com/jogamp/common/net/TestUri03Resolving.java | 4 ++--
.../jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java | 4 ++--
src/junit/com/jogamp/common/net/TestUriQueryProps.java | 4 ++--
src/junit/com/jogamp/common/net/TestUrisWithAssetHandler.java | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'src/junit/com/jogamp/common/net')
diff --git a/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java b/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java
index 40acec9..c6b90b5 100644
--- a/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java
+++ b/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java
@@ -10,9 +10,9 @@ import org.junit.Assert;
import com.jogamp.common.os.AndroidVersion;
import com.jogamp.common.util.IOUtil;
-import com.jogamp.junit.util.JunitTracer;
+import com.jogamp.junit.util.SingletonTestCase;
-public abstract class AssetURLConnectionBase extends JunitTracer {
+public abstract class AssetURLConnectionBase extends SingletonTestCase {
/** In gluegen-rt.jar */
protected static final String test_asset_rt_url = "asset:gluegen/info.txt";
diff --git a/src/junit/com/jogamp/common/net/TestUri01.java b/src/junit/com/jogamp/common/net/TestUri01.java
index a59409f..0ec5bfe 100644
--- a/src/junit/com/jogamp/common/net/TestUri01.java
+++ b/src/junit/com/jogamp/common/net/TestUri01.java
@@ -10,13 +10,13 @@ import org.junit.Test;
import com.jogamp.common.net.URIDumpUtil;
import com.jogamp.common.util.IOUtil;
-import com.jogamp.junit.util.JunitTracer;
+import com.jogamp.junit.util.SingletonTestCase;
import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestUri01 extends JunitTracer {
+public class TestUri01 extends SingletonTestCase {
@Test
public void test00BasicCoding() throws IOException, URISyntaxException {
diff --git a/src/junit/com/jogamp/common/net/TestUri02Composing.java b/src/junit/com/jogamp/common/net/TestUri02Composing.java
index 50e8e07..ff7e9bb 100644
--- a/src/junit/com/jogamp/common/net/TestUri02Composing.java
+++ b/src/junit/com/jogamp/common/net/TestUri02Composing.java
@@ -9,13 +9,13 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.jogamp.junit.util.JunitTracer;
+import com.jogamp.junit.util.SingletonTestCase;
import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestUri02Composing extends JunitTracer {
+public class TestUri02Composing extends SingletonTestCase {
@BeforeClass
public static void assetRegistration() throws Exception {
diff --git a/src/junit/com/jogamp/common/net/TestUri03Resolving.java b/src/junit/com/jogamp/common/net/TestUri03Resolving.java
index 54e2976..f7fe842 100644
--- a/src/junit/com/jogamp/common/net/TestUri03Resolving.java
+++ b/src/junit/com/jogamp/common/net/TestUri03Resolving.java
@@ -14,13 +14,13 @@ import org.junit.Test;
import com.jogamp.common.net.Uri;
import com.jogamp.common.os.Platform;
-import com.jogamp.junit.util.JunitTracer;
+import com.jogamp.junit.util.SingletonTestCase;
import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestUri03Resolving extends JunitTracer {
+public class TestUri03Resolving extends SingletonTestCase {
// Bug 908, issues w/ windows file path char: $ ^ ~ # [ ]
diff --git a/src/junit/com/jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java b/src/junit/com/jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java
index 09748a1..78ecb93 100644
--- a/src/junit/com/jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java
+++ b/src/junit/com/jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java
@@ -44,7 +44,7 @@ import com.jogamp.common.os.AndroidVersion;
import com.jogamp.common.os.Platform;
import com.jogamp.common.util.JarUtil;
import com.jogamp.common.util.ReflectionUtil;
-import com.jogamp.junit.util.JunitTracer;
+import com.jogamp.junit.util.SingletonTestCase;
import com.jogamp.junit.util.MiscUtils;
/**
@@ -70,7 +70,7 @@ import com.jogamp.junit.util.MiscUtils;
* </p>
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestUri99LaunchOnReservedCharPathBug908 extends JunitTracer {
+public class TestUri99LaunchOnReservedCharPathBug908 extends SingletonTestCase {
static class TestClassLoader extends URLClassLoader {
public TestClassLoader(final URL[] urls) {
super(urls);
diff --git a/src/junit/com/jogamp/common/net/TestUriQueryProps.java b/src/junit/com/jogamp/common/net/TestUriQueryProps.java
index 471cae2..847c6e3 100644
--- a/src/junit/com/jogamp/common/net/TestUriQueryProps.java
+++ b/src/junit/com/jogamp/common/net/TestUriQueryProps.java
@@ -8,13 +8,13 @@ import java.net.URISyntaxException;
import org.junit.Assert;
import org.junit.Test;
-import com.jogamp.junit.util.JunitTracer;
+import com.jogamp.junit.util.SingletonTestCase;
import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestUriQueryProps extends JunitTracer {
+public class TestUriQueryProps extends SingletonTestCase {
@Test
public void test() throws IOException, URISyntaxException {
diff --git a/src/junit/com/jogamp/common/net/TestUrisWithAssetHandler.java b/src/junit/com/jogamp/common/net/TestUrisWithAssetHandler.java
index d2bfaf7..55b81a3 100644
--- a/src/junit/com/jogamp/common/net/TestUrisWithAssetHandler.java
+++ b/src/junit/com/jogamp/common/net/TestUrisWithAssetHandler.java
@@ -11,10 +11,10 @@ import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
-import com.jogamp.junit.util.JunitTracer;
+import com.jogamp.junit.util.SingletonTestCase;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestUrisWithAssetHandler extends JunitTracer {
+public class TestUrisWithAssetHandler extends SingletonTestCase {
@BeforeClass
public static void assetRegistration() throws Exception {
--
cgit v1.2.3