From 05a931d587feb3116892f5b146b3a4bb2867e923 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 5 Aug 2023 03:21:37 +0200 Subject: Cleanup unit test class names (pt3): Try to start w/ 'Test', remove intermediate 'Test' for supporting, non-test classes --- make/scripts/runtest.sh | 14 +++++++------- .../jogamp/gluegen/test/junit/generation/test2-common.cfg | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index ef5a879..7c6a957 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -106,9 +106,9 @@ function onetest() { #onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG -#onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG -#onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG -#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestIntIntHashMap 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestIntObjectHashMap 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestLongIntHashMap 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG @@ -129,10 +129,10 @@ function onetest() { #onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG -#onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG -#onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG +#onetest com.jogamp.common.net.TestAssetURLConnectionUnregistered 2>&1 | tee -a $LOG +#onetest com.jogamp.common.net.TestAssetURLConnectionRegistered 2>&1 | tee -a $LOG #onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG -#onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG +#onetest com.jogamp.common.nio.TestBuffers 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG @@ -142,7 +142,7 @@ function onetest() { #onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG -#onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.generation.TestPCPP 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test2-common.cfg b/src/junit/com/jogamp/gluegen/test/junit/generation/test2-common.cfg index 79663b1..512176d 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/test2-common.cfg +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test2-common.cfg @@ -106,7 +106,7 @@ JavaCallbackKey alBufferCallback0 0 ALBUFFERCALLBACKTYPESOFT 0 # - `boolean isAlBufferCallback1Mapped(int buffer)` queries whether `alBufferCallback1` is mapped to `buffer`. # - `ALBUFFERCALLBACKTYPESOFT getAlBufferCallback1(int buffer)` returns the `buffer` mapped ALEVENTPROCSOFT, null if not mapped # - `ALCcontext getAlBufferCallback1UserParam(int buffer)` returns the `buffer` mapped `userptr` object, null if not mapped -JavaCallbackDef alBufferCallback1 0 ALBUFFERCALLBACKTYPESOFT 1 ALCcontext com.jogamp.gluegen.test.junit.generation.BaseTest4JavaCallback.CustomAlBufferCallback1Key +JavaCallbackDef alBufferCallback1 0 ALBUFFERCALLBACKTYPESOFT 1 ALCcontext com.jogamp.gluegen.test.junit.generation.BaseClass4JavaCallback.CustomAlBufferCallback1Key JavaCallbackKey alBufferCallback1 1 ALBUFFERCALLBACKTYPESOFT 0 # # End JavaCallback @@ -148,7 +148,7 @@ IncludeAs CustomJavaCode Bindingtest2p2Impl test2-CustomJavaImplCode.java.stub # typedef void ( * T2_CallbackFunc11)(size_t id, const T2_Callback11UserType* usrParam); # void MessageCallback11a(size_t id /* key */, T2_CallbackFunc11 cbFunc, const T2_Callback11UserType* usrParam); # void MessageCallback11aInject(size_t id); -#JavaCallbackDef MessageCallback11a T2_CallbackFunc11 1 Object com.jogamp.gluegen.test.junit.generation.BaseTest4JavaCallback.CustomMessageCallback11Key +#JavaCallbackDef MessageCallback11a T2_CallbackFunc11 1 Object com.jogamp.gluegen.test.junit.generation.BaseClass4JavaCallback.CustomMessageCallback11Key JavaCallbackDef MessageCallback11a 2 T2_CallbackFunc11 1 JavaCallbackKey MessageCallback11a 0 T2_CallbackFunc11 0 # @@ -207,5 +207,5 @@ Import com.jogamp.gluegen.test.junit.generation.T2_Callback11UserType Import com.jogamp.gluegen.test.junit.generation.T2_Callback12LogMessage Import com.jogamp.gluegen.test.junit.generation.T2_Callback13UserType Import com.jogamp.gluegen.test.junit.generation.T2_Callback13UserKey1 -Import com.jogamp.gluegen.test.junit.generation.BaseTest4JavaCallback.ALCcontext +Import com.jogamp.gluegen.test.junit.generation.BaseClass4JavaCallback.ALCcontext -- cgit v1.2.3