Testing - Update tests with direct VIS loading #148

XShow and XDisplay XDE require VISUALIZATION for correct work.
In some scenario DRAWEXE can generate a duplicates of the internal static singletons.
This means each dynamic library will have their own instance of the static singleton.
Update all direct library loading to use the XDE plugin mechanism.
This will ensure that the XDE plugin is loaded only once and that the correct instance is used.
Originally issue is reproduced only Linux with dlopen with "RTLD_LAZY".
Can be resolved additionally adding "RTLD_LAZY | RTLD_GLOBAL" for dlopen

diff --git a/tests/de_mesh/gltf_lateload/begin b/tests/de_mesh/gltf_lateload/begin
index a6de429d5c7a006e472d06770271fc4e0e89b4e4..3dd651892ad13274f99d2f76b6d521299657f21e 100644 (file)
--- a/tests/de_mesh/gltf_lateload/begin
+++ b/tests/de_mesh/gltf_lateload/begin
@@ -1,2 +1,2 @@
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 catch { Close D }

diff --git a/tests/de_mesh/gltf_read/begin b/tests/de_mesh/gltf_read/begin
index 41994beb7687c6b92be7adb5a65a5ed47e708f65..57b610735042e02cc57bd329ff5bbc54132a7b3d 100644 (file)
--- a/tests/de_mesh/gltf_read/begin
+++ b/tests/de_mesh/gltf_read/begin
@@ -1,4 +1,4 @@
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D -silent
 # PBR requires OpenGL 3.0+ on macOS
 if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

diff --git a/tests/de_mesh/gltf_write/begin b/tests/de_mesh/gltf_write/begin
index 41994beb7687c6b92be7adb5a65a5ed47e708f65..57b610735042e02cc57bd329ff5bbc54132a7b3d 100644 (file)
--- a/tests/de_mesh/gltf_write/begin
+++ b/tests/de_mesh/gltf_write/begin
@@ -1,4 +1,4 @@
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D -silent
 # PBR requires OpenGL 3.0+ on macOS
 if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

diff --git a/tests/de_mesh/obj_read/begin b/tests/de_mesh/obj_read/begin
index 41994beb7687c6b92be7adb5a65a5ed47e708f65..57b610735042e02cc57bd329ff5bbc54132a7b3d 100644 (file)
--- a/tests/de_mesh/obj_read/begin
+++ b/tests/de_mesh/obj_read/begin
@@ -1,4 +1,4 @@
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D -silent
 # PBR requires OpenGL 3.0+ on macOS
 if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

diff --git a/tests/de_mesh/obj_write/as1 b/tests/de_mesh/obj_write/as1
index 4490648010f86c5284f6964fb1cfc6a53593b24d..40d1a61eee26cbd6598f0676e3b02ce2073a9a48 100644 (file)
--- a/tests/de_mesh/obj_write/as1
+++ b/tests/de_mesh/obj_write/as1
@@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
 puts "Write as1 STEP model into OBJ file"
 puts "========"
 
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D  -silent
 Close D1 -silent
 ReadStep D1 [locate_data_file as1-oc-214-mat.stp]

diff --git a/tests/de_mesh/obj_write/ball b/tests/de_mesh/obj_write/ball
index 81d586a202953ab8c4a120ed9ad3cad4ee4994a6..2fa9e0a47f8901a8f410933420693bb212fca4ab 100644 (file)
--- a/tests/de_mesh/obj_write/ball
+++ b/tests/de_mesh/obj_write/ball
@@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
 puts "Write B-Rep model into OBJ file"
 puts "========"
 
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D -silent
 
 restore [locate_data_file Ball.brep] b

diff --git a/tests/de_mesh/obj_write/lantern b/tests/de_mesh/obj_write/lantern
index d8b737cadb24e369e3acd520e3d3098e5c270f6d..612ba968f4626a82180a2211f406fa832236ed98 100644 (file)
--- a/tests/de_mesh/obj_write/lantern
+++ b/tests/de_mesh/obj_write/lantern
@@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
 puts "Write textured lantern glTF model into OBJ file"
 puts "========"
 
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D  -silent
 Close D1 -silent
 ReadGltf D1 [locate_data_file bug30691_Lantern.glb]

diff --git a/tests/de_mesh/obj_write/mustang b/tests/de_mesh/obj_write/mustang
index 45ffd014d894e6880fc9bbb718cdcf781ac14c55..792bee321a49706f5b30214e5bd2cb94ac691b72 100644 (file)
--- a/tests/de_mesh/obj_write/mustang
+++ b/tests/de_mesh/obj_write/mustang
@@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
 puts "Write textured plane OBJ model into OBJ file"
 puts "========"
 
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D  -silent
 Close D1 -silent
 

diff --git a/tests/de_mesh/obj_write/ship_boat b/tests/de_mesh/obj_write/ship_boat
index efce97c5dac976e4dee7a3fcb5a90900549581ae..f298cea061b75d82984c0e2d70375abed35b6b6a 100644 (file)
--- a/tests/de_mesh/obj_write/ship_boat
+++ b/tests/de_mesh/obj_write/ship_boat
@@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
 puts "Write textured boat OBJ model into OBJ file"
 puts "========"
 
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 Close D  -silent
 Close D1 -silent
 ReadObj D1 [locate_data_file ship_boat.obj]

diff --git a/tests/de_mesh/step_read/begin b/tests/de_mesh/step_read/begin
index 3e8a24792d7ba6aceb74c73d650361a78a05c46e..7687cda488e30ac90b353ab7f96175308819d43a 100644 (file)
--- a/tests/de_mesh/step_read/begin
+++ b/tests/de_mesh/step_read/begin
@@ -1,4 +1,4 @@
-pload XDE OCAF MODELING
+pload VISUALIZATION XDE OCAF MODELING
 
 # enable reading/writing tessellated STEP geometry
 param write.step.schema AP242DIS

diff --git a/tests/de_mesh/step_write/begin b/tests/de_mesh/step_write/begin
index 3e8a24792d7ba6aceb74c73d650361a78a05c46e..7687cda488e30ac90b353ab7f96175308819d43a 100644 (file)
--- a/tests/de_mesh/step_write/begin
+++ b/tests/de_mesh/step_write/begin
@@ -1,4 +1,4 @@
-pload XDE OCAF MODELING
+pload VISUALIZATION XDE OCAF MODELING
 
 # enable reading/writing tessellated STEP geometry
 param write.step.schema AP242DIS

diff --git a/tests/de_mesh/vrml_read/begin b/tests/de_mesh/vrml_read/begin
index 23c0924765e441df79fc76c6f051e764f00a331a..5558728f4f5d8cdef8f89177406e4166a6e86a51 100644 (file)
--- a/tests/de_mesh/vrml_read/begin
+++ b/tests/de_mesh/vrml_read/begin
@@ -1,5 +1,6 @@
 # File: begin
 
+pload VISUALIZATION
 pload XDE
 pload OCAF
 pload TOPTEST

diff --git a/tests/v3d/bugs/bug23123 b/tests/v3d/bugs/bug23123
index 76a25f9104c7d900c079056aa11bac9427823551..b5a29a37768f5ce7cfe5e7f15c41d7ea99315c6b 100644 (file)
--- a/tests/v3d/bugs/bug23123
+++ b/tests/v3d/bugs/bug23123
@@ -3,7 +3,7 @@ puts "OCC23123: Bug/Regression in visualization of XDE documents in shaded mode"
 puts "============"
 puts ""
 
-pload XDE VISUALIZATION
+pload VISUALIZATION XDE
 
 ReadStep D [locate_data_file OCC23123-test.step]
 XShow D

diff --git a/tests/v3d/bugs/bug23407_1 b/tests/v3d/bugs/bug23407_1
index 45b61a375186c52e1c1005be95791a559a41fbbe..0ee1d8eee591a048c689a733959dbe7319e471a1 100644 (file)
--- a/tests/v3d/bugs/bug23407_1
+++ b/tests/v3d/bugs/bug23407_1
@@ -3,7 +3,7 @@ puts "CR23407: Draw face outlines for XDE objects"
 puts "============"
 puts ""
 
-pload XDEDRAW VISUALIZATION STEP
+pload VISUALIZATION XDEDRAW STEP
 
 XNewDoc Doc1
 ReadStep Doc1 [locate_data_file screw.step]

diff --git a/tests/v3d/materials/bug27818_2 b/tests/v3d/materials/bug27818_2
index f39796e952b17dc44212840dba5d6e786fb5e32d..4259457ed29ef11c1d7e0503d7e8c1745c1c4eb3 100644 (file)
--- a/tests/v3d/materials/bug27818_2
+++ b/tests/v3d/materials/bug27818_2
@@ -7,7 +7,7 @@ puts ""
 # test change of highlight and selection properties for particular objects
 ####################################################################################
 
-pload QAcommands VISUALIZATION
+pload VISUALIZATION QAcommands
 
 vinit View1
 OCC27818

diff --git a/tests/v3d/materials/materials b/tests/v3d/materials/materials
index 4b9821884943f7cfc329b2e2f52cd7d8ff68339b..81138859da743f65c8f0feea9ef04e083bf0e484 100644 (file)
--- a/tests/v3d/materials/materials
+++ b/tests/v3d/materials/materials
@@ -3,7 +3,7 @@ puts "0030930: Draw Harness, ViewerTest - add commands vlistcolors and vlistmate
 puts "Generate a table of predefined Materials (Graphic3d_NameOfMaterial enumeration)"
 puts "========"
 
-pload XDE OCAF MODELING VISUALIZATION
+pload VISUALIZATION XDE OCAF MODELING
 
 Close D -silent
 vclear