testjoltjni: refactor

stephengold · Nov 5, 2024 · 79ba3d1 · 79ba3d1
1 parent 6c05099
commit 79ba3d1
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 12 deletions.
diff --git a/src/test/java/testjoltjni/TestUtils.java b/src/test/java/testjoltjni/TestUtils.java
@@ -266,11 +266,9 @@ static public void cleanupPhysicsSystem(PhysicsSystem physicsSystem) {
     }
 
     /**
-     * Load and initialize some flavor of native library.
+     * Initialize the loaded native library.
      */
-    public static void loadAndInitializeNativeLibrary() {
-        loadNativeLibrary();
-
+    public static void initializeNativeLibrary() {
         String buildType = Jolt.buildType();
         if (!buildType.equals("Release")) {
             System.out.print(buildType + "-");

diff --git a/src/test/java/testjoltjni/junit/Test001.java b/src/test/java/testjoltjni/junit/Test001.java
@@ -77,7 +77,8 @@ public class Test001 {
      */
     @Test
     public void test001() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         // object layers:
         final int objLayerNonMoving = 0;

diff --git a/src/test/java/testjoltjni/junit/Test002.java b/src/test/java/testjoltjni/junit/Test002.java
@@ -78,7 +78,8 @@ public class Test002 {
      */
     @Test
     public void test002() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         int maxBodies = 1_800;
         PhysicsSystem physicsSystem = TestUtils.newPhysicsSystem(maxBodies);

diff --git a/src/test/java/testjoltjni/junit/Test003.java b/src/test/java/testjoltjni/junit/Test003.java
@@ -77,7 +77,8 @@ public class Test003 {
      */
     @Test
     public void test003() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         doAaBox();
         doBodyCreationSettings();

diff --git a/src/test/java/testjoltjni/junit/Test004.java b/src/test/java/testjoltjni/junit/Test004.java
@@ -52,7 +52,8 @@ public class Test004 {
      */
     @Test
     public void test004() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         int numBpLayers = 2;
         int numObjLayers = 3;

diff --git a/src/test/java/testjoltjni/junit/Test005.java b/src/test/java/testjoltjni/junit/Test005.java
@@ -54,7 +54,8 @@ public class Test005 {
      */
     @Test
     public void test005() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         doConeConstraintSettings();
         doDistanceConstraintSettings();

diff --git a/src/test/java/testjoltjni/junit/Test006.java b/src/test/java/testjoltjni/junit/Test006.java
@@ -73,7 +73,8 @@ public class Test006 {
      */
     @Test
     public void test006() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         doBoxShapeSettings();
         doCapsuleShapeSettings();

diff --git a/src/test/java/testjoltjni/junit/Test007.java b/src/test/java/testjoltjni/junit/Test007.java
@@ -89,7 +89,8 @@ public class Test007 {
      */
     @Test
     public void test007() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         doBoxShape();
         doCapsuleShape();

diff --git a/src/test/java/testjoltjni/junit/Test008.java b/src/test/java/testjoltjni/junit/Test008.java
@@ -43,7 +43,8 @@ public class Test008 {
      */
     @Test
     public void test008() {
-        TestUtils.loadAndInitializeNativeLibrary();
+        TestUtils.loadNativeLibrary();
+        TestUtils.initializeNativeLibrary();
 
         testMat44();
         testRMat44();