Testing - Removing direct DCAF loading #147

DCAF require VISUALIZATION for correct work.
  In some scenario DRAWEXE can generate a dublicates 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 DCAF plugin
  mechanism. This will ensure that the DCAF 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/bugs/caf/begin b/tests/bugs/caf/begin
index ce171e2f782aee3145de07594099eabd9c38f98a..8d197a2e2256c66fbd746f41132215f35e788575 100755 (executable)
--- a/tests/bugs/caf/begin
+++ b/tests/bugs/caf/begin
@@ -1,4 +1,4 @@
-pload DCAF
+pload OCAF
 
 set subgroup caf
 

diff --git a/tests/bugs/caf/bug24164_1 b/tests/bugs/caf/bug24164_1
index cbd09f97dcf9c40788ee2dc5b61370cf70f95782..4df67dc8a793901f747a8f81a4cf973e00476775 100644 (file)
--- a/tests/bugs/caf/bug24164_1
+++ b/tests/bugs/caf/bug24164_1
@@ -1,4 +1,4 @@
-pload DCAF
+pload OCAF
 
 if { [info exists imagedir] == 0 } {
     set imagedir .

diff --git a/tests/bugs/caf/bug24164_2 b/tests/bugs/caf/bug24164_2
index f56a05e21b790789a4f2d4d95a16f6aab44acb5c..055643e55337fdefbe36a704e6cad82f653fef9d 100644 (file)
--- a/tests/bugs/caf/bug24164_2
+++ b/tests/bugs/caf/bug24164_2
@@ -1,4 +1,4 @@
-pload DCAF
+pload OCAF
 
 set BugNumber OCC24164
 if { [info exists imagedir] == 0 } {

diff --git a/tests/bugs/caf/bug26229_1 b/tests/bugs/caf/bug26229_1
index 18a99a5ae4fd73aa09b7304bdfb1724a862e802b..bc4fe584ee804b42dcbb8fc8c53b5a1780972789 100644 (file)
--- a/tests/bugs/caf/bug26229_1
+++ b/tests/bugs/caf/bug26229_1
@@ -6,7 +6,7 @@ puts ""
 # Add the possibility in OCAF to open/save a document from/to a stream object (BinOcaf format)
 ###################################################################################################
 
-pload DCAF
+pload OCAF
 
 NewDocument D BinOcaf
 

diff --git a/tests/bugs/caf/bug26229_2 b/tests/bugs/caf/bug26229_2
index c206695e9c788c6747bcb9ac17fde9ba82797011..50a0379203fecafea6c01e5a9ac3007b3839dfea 100644 (file)
--- a/tests/bugs/caf/bug26229_2
+++ b/tests/bugs/caf/bug26229_2
@@ -6,7 +6,7 @@ puts ""
 # Add the possibility in OCAF to open/save a document from/to a stream object (XmlOcaf format)
 ###################################################################################################
 
-pload DCAF
+pload OCAF
 
 NewDocument D XmlOcaf
 

diff --git a/tests/bugs/fclasses/bug23852 b/tests/bugs/fclasses/bug23852
index 075f8ca9eb7602efcc9101f6136b28eebfec5833..5318da4f1f5eaa2f344b882c152ee63e5eab1bb1 100755 (executable)
--- a/tests/bugs/fclasses/bug23852
+++ b/tests/bugs/fclasses/bug23852
@@ -6,7 +6,7 @@ puts ""
 # OSD_Path interprets unc paths incorrectly
 #######################################################################
 
-pload DCAF
+pload OCAF
 
 set BugNumber OCC23852
 

diff --git a/tests/bugs/fclasses/bug984_1 b/tests/bugs/fclasses/bug984_1
index c139beb8952afd2b8bf91e7824cb08d07e65b68a..483cd2cf65c94da38ba05cefc48427a74e91b140 100755 (executable)
--- a/tests/bugs/fclasses/bug984_1
+++ b/tests/bugs/fclasses/bug984_1
@@ -6,7 +6,7 @@ puts ""
 ## LDOM hangs-up attempting to read a file which contains a reference to "*dtd"file
 ####################################################
 
-pload DCAF
+pload OCAF
 set BugNumber OCC984
 cpulimit 60
 

diff --git a/tests/bugs/iges/bug33327 b/tests/bugs/iges/bug33327
index 5a17a77bf4cdc5197cd4e4a1e0c6be60cc1f48e4..1ed3c2ae7c9058bcb45ce93b0c0e2d7c048bde38 100644 (file)
--- a/tests/bugs/iges/bug33327
+++ b/tests/bugs/iges/bug33327
@@ -2,7 +2,7 @@ puts "============"
 puts "0033327: Data Exchange, IGES Import - SubfigureDef can't read string"
 puts "============"
 
-pload DCAF
+pload OCAF
 
 Close D -silent
 

diff --git a/tests/bugs/modalg_4/bug8228 b/tests/bugs/modalg_4/bug8228
index 833129373f3958c42c1b2dda828e50e8a619a0de..86e6728a5556caf0b4aecf310159045859f5a15d 100755 (executable)
--- a/tests/bugs/modalg_4/bug8228
+++ b/tests/bugs/modalg_4/bug8228
@@ -9,7 +9,7 @@ puts ""
 set BugNumber OCC8228
 
 catch {pload XDE}
-catch {pload DCAF}
+catch {pload OCAF}
 
 # Create a new document and set UndoLimit
 

diff --git a/tests/bugs/modalg_5/bug24849_1 b/tests/bugs/modalg_5/bug24849_1
index 90b4e61e9f3bc4ded0be3d2c42b54ff72d8cb619..06e9536e30804fb067d02e1432e715ad26a2bfd1 100644 (file)
--- a/tests/bugs/modalg_5/bug24849_1
+++ b/tests/bugs/modalg_5/bug24849_1
@@ -6,7 +6,7 @@ puts ""
 ## Crash on Pipe creation
 ###############################################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug24849_Study1_GEOM.cbf] D
 

diff --git a/tests/bugs/modalg_5/bug24849_1_std b/tests/bugs/modalg_5/bug24849_1_std
index d80d339b2eea968ef04c2e7dfabc7c6536cd3d56..dc2278e830c1265197c63f2867fe31a7c08ae2bd 100644 (file)
--- a/tests/bugs/modalg_5/bug24849_1_std
+++ b/tests/bugs/modalg_5/bug24849_1_std
@@ -6,7 +6,7 @@ puts ""
 ## Crash on Pipe creation
 ###############################################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug24849_Study1_GEOM.sgd] D
 

diff --git a/tests/bugs/modalg_5/bug24849_2 b/tests/bugs/modalg_5/bug24849_2
index 7796adaee71a5e36801cd661c8685ecf1173e35a..c7882f1ac9cdfa7a602010dce9bc11a3786ce8b4 100644 (file)
--- a/tests/bugs/modalg_5/bug24849_2
+++ b/tests/bugs/modalg_5/bug24849_2
@@ -6,7 +6,7 @@ puts ""
 ## Crash on Pipe creation
 ###############################################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug24849_Study1_GEOM.cbf] D
 

diff --git a/tests/bugs/modalg_5/bug24849_2_std b/tests/bugs/modalg_5/bug24849_2_std
index 4f25d48b3714d2f1798839ebf890be6913150f03..363f3ea21eab488cd10238297753b4356d3443ca 100644 (file)
--- a/tests/bugs/modalg_5/bug24849_2_std
+++ b/tests/bugs/modalg_5/bug24849_2_std
@@ -6,7 +6,7 @@ puts ""
 ## Crash on Pipe creation
 ###############################################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug24849_Study1_GEOM.sgd] D
 

diff --git a/tests/bugs/modalg_6/bug26576_2 b/tests/bugs/modalg_6/bug26576_2
index 900f0538ff4a3def14f473de9e43be31a83aa53d..9c8189267287de9a8b7e9d86d54625492a70b5de 100644 (file)
--- a/tests/bugs/modalg_6/bug26576_2
+++ b/tests/bugs/modalg_6/bug26576_2
@@ -6,7 +6,7 @@ puts ""
 ## Wrong result obtained by intersection algorithm.
 ###############################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug26576_study1_new_geom.cbf] D
 

diff --git a/tests/bugs/modalg_6/bug26588 b/tests/bugs/modalg_6/bug26588
index 38ba860edfd60319be79ad66422e72d471ad1ec1..26f4c75d9cdc04e9bdb187ca68e099e465734c98 100644 (file)
--- a/tests/bugs/modalg_6/bug26588
+++ b/tests/bugs/modalg_6/bug26588
@@ -6,7 +6,7 @@ puts ""
 ## SIGSEGV in BRepFeat_MakeDPrism::Perform()
 ###############################################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug26588_Study1_new_GEOM.cbf] D
 

diff --git a/tests/bugs/moddata_1/bug22694 b/tests/bugs/moddata_1/bug22694
index a44e79fdadef6809bba608f27d2f8227de9ad28e..ff07e207904d36730fe14075e15cfd588dbdbaa0 100755 (executable)
--- a/tests/bugs/moddata_1/bug22694
+++ b/tests/bugs/moddata_1/bug22694
@@ -7,7 +7,7 @@ puts "==========="
 
 set BugNumber OCC22694
 
-catch {pload DCAF}
+catch {pload OCAF}
 catch {pload XDE}
 
 # Create a new document and set UndoLimit

diff --git a/tests/bugs/moddata_3/bug23733 b/tests/bugs/moddata_3/bug23733
index 53b2c07f582b83d4d887e8ea05724b5cd493aece..eca5b6409d0d08a26fe93897b38dc36a8825c959 100644 (file)
--- a/tests/bugs/moddata_3/bug23733
+++ b/tests/bugs/moddata_3/bug23733
@@ -6,7 +6,7 @@ puts ""
 ## PCurve for edge on face creation failure
 ###############################################
 
-pload DCAF TOPTEST
+pload OCAF TOPTEST
 
 Open [locate_data_file bug_glue_edges_GEOM.cbf] D
 

diff --git a/tests/bugs/moddata_3/bug23733_std b/tests/bugs/moddata_3/bug23733_std
index e80fd46c2c41758f2b6f71a54d3635936dc099a3..def3ef31b034d8353c0fb2f4f7ca750c98836abc 100644 (file)
--- a/tests/bugs/moddata_3/bug23733_std
+++ b/tests/bugs/moddata_3/bug23733_std
@@ -6,7 +6,7 @@ puts ""
 ## PCurve for edge on face creation failure
 ###############################################
 
-pload DCAF TOPTEST
+pload OCAF TOPTEST
 
 Open [locate_data_file bug_glue_edges_GEOM.sgd] D
 

diff --git a/tests/bugs/step/bug26342 b/tests/bugs/step/bug26342
index d7b513d384de29ead850912085b8525f175b31ff..e802fe587490c8e49178c5bcbe6215008a905e7e 100755 (executable)
--- a/tests/bugs/step/bug26342
+++ b/tests/bugs/step/bug26342
@@ -7,7 +7,7 @@ puts ""
 # No materials are read from STEP
 #######################################################################
 
-pload DCAF
+pload OCAF
 
 ReadStep D [locate_data_file OCC23251-dm1-oc-214.stp]
 

diff --git a/tests/bugs/step/bug26657 b/tests/bugs/step/bug26657
index 3c2cca6b3310175ee905632ffab296573a1f14e1..04f99f6553806066125bfe98e737f56846a76300 100644 (file)
--- a/tests/bugs/step/bug26657
+++ b/tests/bugs/step/bug26657
@@ -3,7 +3,7 @@ puts "OCC26657: STEP OCAF writers should keep hierarchy and colors when saving n
 puts "========"
 puts ""
 
-pload DCAF TOPTEST XDE XDEDRAW
+pload OCAF TOPTEST XDE XDEDRAW
 ReadStep D1 [locate_data_file bug26657.stp]
 
 set aTmpFile ${imagedir}/${casename}_temp.stp

diff --git a/tests/bugs/step/bug26925 b/tests/bugs/step/bug26925
index dd8556f3859aea6b0fbbbd3a01375255e8998fcf..6ac66a968745d81b4ea26a67addd3a536c7b350d 100644 (file)
--- a/tests/bugs/step/bug26925
+++ b/tests/bugs/step/bug26925
@@ -3,7 +3,7 @@ puts "# 0026925: Data Exchange - Exceptions can be raised if assembly is empty"
 puts "# ====================================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 XNewDoc D
 XNewShape D
 box a 0 0 0 10 10 10

diff --git a/tests/bugs/step/bug27313 b/tests/bugs/step/bug27313
index 8c353520fa787091827aa98ced971c60f591368f..05177a8630b3a7b9e6d1d7e10bd7ff2b55a51b20 100644 (file)
--- a/tests/bugs/step/bug27313
+++ b/tests/bugs/step/bug27313
@@ -6,7 +6,7 @@ puts ""
 # Exception during WriteStep with PMI
 ##########################################################################
 
-pload DCAF
+pload OCAF
 
 box b 10 10 10
 explode b

diff --git a/tests/bugs/step/bug28345 b/tests/bugs/step/bug28345
index ff9be0c3436206cfe6b7454267940c6ae0b93e38..4f303b404980bb8c706f671ff5ac287906cd15b2 100644 (file)
--- a/tests/bugs/step/bug28345
+++ b/tests/bugs/step/bug28345
@@ -3,7 +3,7 @@ puts "# 0028345: Data Exchange - Reading STEP model using STEPCAF crashes"
 puts "# ====================================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 ReadStep D_1 [locate_data_file bug28345_30338.stp]
 
 # Check imported names

diff --git a/tests/bugs/step/bug29240 b/tests/bugs/step/bug29240
index 40656f8cccbf07679f6699098e29f7b7d84a9579..bd12ff02627c9c9c86509a8c09dc61371a2d102d 100644 (file)
--- a/tests/bugs/step/bug29240
+++ b/tests/bugs/step/bug29240
@@ -3,7 +3,7 @@ puts "  0029240: Data Exchange - Crash during reading STEP file"
 puts "=========="
 puts ""
 
-pload DCAF
+pload OCAF
 
 ReadStep D_First [locate_data_file nist_ctc_05_asme1_ap242-1.stp]
 XGetOneShape result D_First 

diff --git a/tests/bugs/step/bug29403 b/tests/bugs/step/bug29403
index 856c31d1452610ad35d786f99f9807809f9b7dfe..c99e04b0be59afca211c683ad6f4a672ea2cd07e 100644 (file)
--- a/tests/bugs/step/bug29403
+++ b/tests/bugs/step/bug29403
@@ -6,7 +6,7 @@ puts ""
 param read.stepcaf.subshapes.name 1
 param write.stepcaf.subshapes.name 1
 
-pload DCAF
+pload OCAF
 
 ReadStep doc [locate_data_file bug29403_ECOR030312.stp]
 set info1 [XStat doc]

diff --git a/tests/bugs/step/bug30053 b/tests/bugs/step/bug30053
index 67e042bed16b172fff33a61eb2684cdffe91ef5b..c1f6754d8da82a415cbd2cb2ed21483bec92b118 100644 (file)
--- a/tests/bugs/step/bug30053
+++ b/tests/bugs/step/bug30053
@@ -3,7 +3,7 @@ puts " 0030533: STEP read fails due to comment string "
 puts "==================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 ReadStep D [locate_data_file bug30053.stp] 
 

diff --git a/tests/bugs/step/bug30362 b/tests/bugs/step/bug30362
index c707e5e10c15ed0cf247777b88f8c1ef349699c1..7c75650b8b329be688c5a68b7e2e34e122d3e2f4 100644 (file)
--- a/tests/bugs/step/bug30362
+++ b/tests/bugs/step/bug30362
@@ -6,7 +6,7 @@ puts ""
 # Writing dimensions with inches produced invalid file
 #########################################################
 
-pload DCAF
+pload OCAF
 
 ReadStep D [locate_data_file bug26689_nist_ctc_01_asme1_ap242.stp]
 param write.step.unit 1

diff --git a/tests/bugs/step/bug30533 b/tests/bugs/step/bug30533
index e2f02266a7567b6fcbef7d1a271d680d34fdf158..bfc49328fc455aa7e028f6c5c77a551b17d103a1 100644 (file)
--- a/tests/bugs/step/bug30533
+++ b/tests/bugs/step/bug30533
@@ -3,7 +3,7 @@ puts " 0030533: Data Exchange - Crash during STEP import."
 puts "==================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 param read.stepcaf.subshapes.name On
 

diff --git a/tests/bugs/step/bug30789 b/tests/bugs/step/bug30789
index 263c49d40b4501ec03d1a17bb1c27c1f95462201..8b3626af1e75c2f6d4599b3e088553434214d1cf 100644 (file)
--- a/tests/bugs/step/bug30789
+++ b/tests/bugs/step/bug30789
@@ -5,7 +5,7 @@ puts ""
 
 # Load file
 
-pload DCAF
+pload OCAF
 ReadStep D [locate_data_file bug30789.stp]
 
 # Check several names came from problematic entities

diff --git a/tests/bugs/step/bug30856 b/tests/bugs/step/bug30856
index ee745e2abdae6c00a74fe92721d858800a9f3fe3..58dfdaf7b284d423948d32ae7c3856e481aa2b2f 100644 (file)
--- a/tests/bugs/step/bug30856
+++ b/tests/bugs/step/bug30856
@@ -2,7 +2,7 @@ puts "========================"
 puts "0030856: Wrong colors after STEP file import"
 puts "========================"
 
-pload DCAF
+pload OCAF
 
 ReadStep D1 [locate_data_file bug30856_SOT223-4P230_700X190L65X72.step]
 WriteStep D1 $imagedir/${casename}.stp

diff --git a/tests/bugs/step/bug31489 b/tests/bugs/step/bug31489
index 619936bd52c3e10159b0af527d355e0d6a65716f..1fa95104e3ceaccd377ed61bb28a27d0f2191619 100644 (file)
--- a/tests/bugs/step/bug31489
+++ b/tests/bugs/step/bug31489
@@ -3,7 +3,7 @@ puts "0031489: Data Exchange - STEP Reader can't read a big file"
 puts "===================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 # Read file
 ReadStep D [locate_data_file bug31489.stp]

diff --git a/tests/bugs/step/bug31568 b/tests/bugs/step/bug31568
index 67eb6a7a14f3f937c081b40f387821b284feafb5..839edac6e00c802b6614a716c78b831c142a4b53 100644 (file)
--- a/tests/bugs/step/bug31568
+++ b/tests/bugs/step/bug31568
@@ -2,7 +2,7 @@ puts "================================================================="
 puts "0031568: Data Exchange - invalid model produced after STEP import"
 puts "================================================================="
 
-pload DCAF
+pload OCAF
 
 ReadStep D [locate_data_file bug31568_Konecranes_Sample_3D.stp]
 set ref [XGetReferredShape D 0:1:1:41:11]

diff --git a/tests/bugs/step/bug31675 b/tests/bugs/step/bug31675
index 294564d600f29a2bc6b23e6a7d687b330995d23f..709460feefe877ff5ab6cfc4b6048a7dcce85998 100644 (file)
--- a/tests/bugs/step/bug31675
+++ b/tests/bugs/step/bug31675
@@ -3,7 +3,7 @@ puts "0031675: Er-ror opening the STEP-file"
 puts "===================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 # Read file
 ReadStep D [locate_data_file bug31675.stp]

diff --git a/tests/bugs/step/bug31685_1 b/tests/bugs/step/bug31685_1
index 58734ecb7f7078d01c1d52c4bb19d18ac0087676..fe7722a3a2e7b3fc141a21d286c185dc1d0dd988 100644 (file)
--- a/tests/bugs/step/bug31685_1
+++ b/tests/bugs/step/bug31685_1
@@ -3,7 +3,7 @@ puts " 0031685: Data Exchange, STEPCAFControl_Reader - NULL dereference on trans
 puts "==================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 # Read file
 ReadStep D [locate_data_file bug31685_1.stp]

diff --git a/tests/bugs/step/bug31685_2 b/tests/bugs/step/bug31685_2
index a36efa93c1dce5c2e8de987f046d0e2cc2c22cf3..bc34adac6324e5af7ead459323e9b374c69194ed 100644 (file)
--- a/tests/bugs/step/bug31685_2
+++ b/tests/bugs/step/bug31685_2
@@ -3,7 +3,7 @@ puts " 0031685: Data Exchange, STEPCAFControl_Reader - NULL dereference on trans
 puts "==================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 # Read file
 ReadStep D [locate_data_file bug31685_2.stp] 

diff --git a/tests/bugs/step/bug31685_3 b/tests/bugs/step/bug31685_3
index 97ed381c8f1413e2cf9d86395c430bebc1129310..c51c8cfc8f4f57f9b4ff2ad54637c803ce02c13c 100644 (file)
--- a/tests/bugs/step/bug31685_3
+++ b/tests/bugs/step/bug31685_3
@@ -3,7 +3,7 @@ puts " 0031685: Data Exchange, STEPCAFControl_Reader - NULL dereference on trans
 puts "==================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 # Read file
 ReadStep D [locate_data_file bug31685_3.stp] 

diff --git a/tests/bugs/step/bug32310 b/tests/bugs/step/bug32310
index 93dafda023ae739dafd1555c22589e89a08b3b35..083b5a36c10e1722fa1ce5a1d0589e7efbfe8d62 100644 (file)
--- a/tests/bugs/step/bug32310
+++ b/tests/bugs/step/bug32310
@@ -3,7 +3,7 @@ puts "0032310: Data Exchange - Invalid STEP export/import of backslashes in name
 puts "===================================="
 puts ""
 
-pload DCAF
+pload OCAF
 Close D -silent
 
 XNewDoc D

diff --git a/tests/bugs/step/bug32681 b/tests/bugs/step/bug32681
index 2f3e7a8bd477ab502b01df6d050e936d97422f06..d76eef39098974e908de6ad6d44fe9d4a0f69a5d 100644 (file)
--- a/tests/bugs/step/bug32681
+++ b/tests/bugs/step/bug32681
@@ -3,7 +3,7 @@ puts "0032681: Data Exchange - Missed dimension after STEP export"
 puts "Check adding of dimension"
 puts "=================================="
 
-pload DCAF
+pload OCAF
 
 ReadStep D [locate_data_file bug32681.stp]
 XGetOneShape s D

diff --git a/tests/bugs/step/bug33331 b/tests/bugs/step/bug33331
index 73cc77d3285fa2c738269cb0c0fab2ad74d940cf..5efbbdbbca89378272ad65dba4da7a9cb449d082 100644 (file)
--- a/tests/bugs/step/bug33331
+++ b/tests/bugs/step/bug33331
@@ -3,7 +3,7 @@ puts "0033331: Data Exchange, Step Import - Unsupported Representation Items"
 puts "===================================="
 puts ""
 
-pload DCAF
+pload OCAF
 catch {Close D}
 
 param "read.stepcaf.subshapes.name" 1

diff --git a/tests/bugs/xde/bug1669 b/tests/bugs/xde/bug1669
index d58da1f9c42d96b0989426a10c773d1a298f3472..444d68cf16da388a1b6107edb37e935c71ee6524 100755 (executable)
--- a/tests/bugs/xde/bug1669
+++ b/tests/bugs/xde/bug1669
@@ -8,7 +8,7 @@ puts ""
 
 set BugNumber OCC1669
 
-catch {pload DCAF}
+catch {pload OCAF}
 
 XNewDoc SA
 

diff --git a/tests/bugs/xde/bug16740 b/tests/bugs/xde/bug16740
index 9680d8cc2b4f0181834080927c728bfec37c431b..0d5cf02308f3cdcac4f5f61dc9d57add161d2812 100644 (file)
--- a/tests/bugs/xde/bug16740
+++ b/tests/bugs/xde/bug16740
@@ -8,7 +8,7 @@ puts ""
 # XCAFDoc_ShapeMapTool is not restored
 ########################################
 
-pload DCAF
+pload OCAF
 
 # Check the output file and delete it if necessary
 set anOutputFile ${imagedir}/${casename}.xbf

diff --git a/tests/bugs/xde/bug1747 b/tests/bugs/xde/bug1747
index e9d6bfcd4f05be33268b7d4e981b2dcde1168b34..00fbc0c5d98af02387b75469f30e62faae6b3323 100755 (executable)
--- a/tests/bugs/xde/bug1747
+++ b/tests/bugs/xde/bug1747
@@ -10,7 +10,7 @@ puts ""
 
 set BugNumber OCC1747
 
-catch {pload DCAF}
+catch {pload OCAF}
 
 XNewDoc SA
 

diff --git a/tests/bugs/xde/bug21046 b/tests/bugs/xde/bug21046
index 17d5e039660ec0646e37cdc2b38a3aa37184df5a..c5aa63da52dcc1b28a62371a2224b7ae891310fe 100755 (executable)
--- a/tests/bugs/xde/bug21046
+++ b/tests/bugs/xde/bug21046
@@ -6,7 +6,7 @@ puts ""
 # XShow raises an exception
 #######################################################################
 
-pload DCAF
+pload OCAF
 
 set BugNumber OCC21046
 

diff --git a/tests/bugs/xde/bug22776 b/tests/bugs/xde/bug22776
index d0b71947ee77a7e5de2156883a66bb2642e1d3c2..3e1449af5ae8c7b0bd9a8f1e694d778516910033 100755 (executable)
--- a/tests/bugs/xde/bug22776
+++ b/tests/bugs/xde/bug22776
@@ -6,7 +6,7 @@ puts ""
 # XCAFPrs_AISObject does not support transparency
 ######################################################################################
 
-catch {pload DCAF}
+catch {pload OCAF}
 pload QAcommands
 
 NewDocument D BinXCAF

diff --git a/tests/bugs/xde/bug22962 b/tests/bugs/xde/bug22962
index 97d19c6f58273a7f268e7f74895f7395779b2d00..83e8569925fb9914f83fdfd925a488d06a142643 100755 (executable)
--- a/tests/bugs/xde/bug22962
+++ b/tests/bugs/xde/bug22962
@@ -8,7 +8,7 @@ puts ""
 
 set BugNumber OCC22962
 set check_value 97
-pload DCAF
+pload OCAF
 
 ReadStep D1 [locate_data_file OCC22962-dm1-oc-214.stp]
 set dump_info [ XDumpDF D1 ]

diff --git a/tests/bugs/xde/bug22982 b/tests/bugs/xde/bug22982
index d5a5135aac10163a25a34c3e7c562e16f4546ff6..260f80e64af786e5982dc7d6346340092c7fd469 100755 (executable)
--- a/tests/bugs/xde/bug22982
+++ b/tests/bugs/xde/bug22982
@@ -9,7 +9,7 @@ puts ""
 ##################################################################
 
 set BugNumber OCC22982
-pload DCAF
+pload OCAF
 
 NewDocument D11 BinXCAF
 UndoLimit D11 100

diff --git a/tests/bugs/xde/bug23384 b/tests/bugs/xde/bug23384
index e59641b9e6f8c4ed15706c65f1a735e7bb650d6c..0134d4514e2181467a36f0a32c23e4bf58d33ced 100755 (executable)
--- a/tests/bugs/xde/bug23384
+++ b/tests/bugs/xde/bug23384
@@ -1,6 +1,6 @@
 # Original bug : 23384
 # Date : 16 Aug 2012
-pload DCAF
+pload OCAF
 XOpen [locate_data_file bug23384-doc_subshapes_plain.xbf] doc
 set info1 [XStat doc]
 regexp {level N 0 +: +([-0-9.+eE]+)} $info1 full l0

diff --git a/tests/bugs/xde/bug23736 b/tests/bugs/xde/bug23736
index d9f05bf11d41093b36966c71649f0b58a495f884..b1b975fb83627d7af2ba98dfb3f4e718dfcdc661 100644 (file)
--- a/tests/bugs/xde/bug23736
+++ b/tests/bugs/xde/bug23736
@@ -6,7 +6,7 @@ puts ""
 # Exception during reading STEP file in Test Harness
 ######################################################
 
-pload DCAF
+pload OCAF
 
 NewDocument D BinXCAF
 UndoLimit D 100

diff --git a/tests/bugs/xde/bug23773 b/tests/bugs/xde/bug23773
index 55541db4b10f689e1116374ecedbad01f3825f9f..a09df0a7a748ff2a4fa161b8acb2e3077544eb84 100644 (file)
--- a/tests/bugs/xde/bug23773
+++ b/tests/bugs/xde/bug23773
@@ -5,7 +5,7 @@ puts ""
 ######################################################################################
 # Can not read names in STEP file
 ######################################################################################
-pload DCAF
+pload OCAF
 
 ReadStep d1 [locate_data_file bug23773_2012-or-136-004-014-izzi-asm_PCAM.stp]
 set info1 [GetName d1 0:1:1:1:9]

diff --git a/tests/bugs/xde/bug23921 b/tests/bugs/xde/bug23921
index 21763237b5d9de4505660f2dfd7440af32758214..8f81de791c27419d060f88f00ef99e44901f1c0e 100644 (file)
--- a/tests/bugs/xde/bug23921
+++ b/tests/bugs/xde/bug23921
@@ -6,7 +6,7 @@ puts ""
 # IGES reader cannot map subshapes colors inside nested assemblies
 #################################################################
 
-pload DCAF
+pload OCAF
 
 NewDocument D XmlXCAF
 

diff --git a/tests/bugs/xde/bug24430 b/tests/bugs/xde/bug24430
index 4c531a313b6247668cef350a435bb926bbcbda17..de30163938f9e42482fe2a9c0dd88efd52c77aa1 100644 (file)
--- a/tests/bugs/xde/bug24430
+++ b/tests/bugs/xde/bug24430
@@ -6,7 +6,7 @@ puts ""
 # vviewlist draw command does not added name of viewer created by XShow draw command
 #######################################################################################
 
-pload DCAF
+pload OCAF
 NewDocument D XmlXCAF
 ReadIges D [locate_data_file bug23921_case2.igs]
 

diff --git a/tests/bugs/xde/bug25910 b/tests/bugs/xde/bug25910
index 8511cb21063956f1a65dd58577364cc307efd196..2e03c9478a9ab3bfa13b78090084a6b552c87038 100644 (file)
--- a/tests/bugs/xde/bug25910
+++ b/tests/bugs/xde/bug25910
@@ -3,7 +3,7 @@ puts "OCC25910: The material with 0-density causes e r r o r s during writing ST
 puts "========"
 puts ""
 
-pload DCAF
+pload OCAF
 
 NewDocument D
 box b 10 10 10

diff --git a/tests/bugs/xde/bug27169 b/tests/bugs/xde/bug27169
index 3c704aaa0b62b307cffeca8df3a8ad375be195bb..fe3ddbdeb9125fc16b3d7de6505ca2c71048f597 100644 (file)
--- a/tests/bugs/xde/bug27169
+++ b/tests/bugs/xde/bug27169
@@ -6,7 +6,7 @@ puts ""
 # Suspitious behavior of importing names during STEP import
 ########################################################################
 
-pload DCAF
+pload OCAF
 
 ReadStep D [locate_data_file bug27169_robot01.step]
 

diff --git a/tests/bugs/xde/bug27701 b/tests/bugs/xde/bug27701
index 0a6fe5176d54b873edafe6ff0f9279963feddcc7..3f6e4429e7aa87f3603aae7fbf5ac6cc61a7ac7e 100644 (file)
--- a/tests/bugs/xde/bug27701
+++ b/tests/bugs/xde/bug27701
@@ -3,7 +3,7 @@ puts "OCC27701: C r a s h when export empty solid to STEP"
 puts "========"
 puts ""
 
-pload DCAF
+pload OCAF
 
 restore [locate_data_file bug27701.brep] s
 

diff --git a/tests/bugs/xde/bug28104 b/tests/bugs/xde/bug28104
index fc1d42321c76aedea97ec61222a92c062dcbd67a..84c4f5cc87d26d0a797e2124c45438f695b0637d 100644 (file)
--- a/tests/bugs/xde/bug28104
+++ b/tests/bugs/xde/bug28104
@@ -3,7 +3,7 @@ puts "0028104: Data Exchange - Extract sub-assembly (XDE)"
 puts "============================================================================"
 puts ""
 
-pload DCAF
+pload OCAF
 
 Close D0 -silent
 Close D1 -silent

diff --git a/tests/bugs/xde/bug28104_1 b/tests/bugs/xde/bug28104_1
index b6f524778d35c58528be27d800017bbc41d15372..2de21306150b096e6643812255c4ce7b15d9ed5a 100644 (file)
--- a/tests/bugs/xde/bug28104_1
+++ b/tests/bugs/xde/bug28104_1
@@ -3,7 +3,7 @@ puts "0028104: Data Exchange - Extract sub-assembly (XDE)"
 puts "============================================================================"
 puts ""
 
-pload DCAF
+pload OCAF
 
 Close D0 -silent
 Close D1 -silent

diff --git a/tests/bugs/xde/bug28748 b/tests/bugs/xde/bug28748
index 2aa5d9cd57d3b2f9aef378a040c75d57fc8ae200..8808fa90e1435e23f0b3d150db7452e197582e0b 100644 (file)
--- a/tests/bugs/xde/bug28748
+++ b/tests/bugs/xde/bug28748
@@ -6,7 +6,7 @@ puts ""
 # XCAFDoc_GraphNode does not restore child on Undo
 ###########################################################
 
-pload DCAF
+pload OCAF
 
 ReadStep d [locate_data_file bug21802_as1-oc-214.stp]
 UndoLimit d 1

diff --git a/tests/bugs/xde/bug29282 b/tests/bugs/xde/bug29282
index 0e7819276f60e811fcc8ec34210c25e1c1ae2851..f128f8bd96663e39c24330ff4b80bd2df2b55cda 100644 (file)
--- a/tests/bugs/xde/bug29282
+++ b/tests/bugs/xde/bug29282
@@ -6,7 +6,7 @@ puts ""
 # UpdateAssemblies is not worked for located root assemblies
 ###########################################################
 
-pload DCAF
+pload OCAF
 
 # create test Document
 box b 1 1 1

diff --git a/tests/bugs/xde/bug29854 b/tests/bugs/xde/bug29854
index 2e32414f066e36ad3a197b8e9757b9440ab12111..4ee14d838ac246c121b207236091f33534ca3d4f 100644 (file)
--- a/tests/bugs/xde/bug29854
+++ b/tests/bugs/xde/bug29854
@@ -3,7 +3,7 @@ puts "0029854: XCAF GD&T: Clear contents of reserved labels only"
 puts "============"
 puts ""
 
-pload DCAF
+pload OCAF
 
 box b 10 10 10
 

diff --git a/tests/bugs/xde/bug30727 b/tests/bugs/xde/bug30727
index 169a6f892f97e75d3117b7e44f9224e83b76e1bd..5141d82a589c76f00298f078fdd4352c4e717eda 100644 (file)
--- a/tests/bugs/xde/bug30727
+++ b/tests/bugs/xde/bug30727
@@ -3,7 +3,7 @@ puts "0030727: Data Exchange - Problems in Shape Tool"
 puts "==============================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 box b 1 1 1
 copy b bb

diff --git a/tests/bugs/xde/bug30779 b/tests/bugs/xde/bug30779
index 99f7d7b58912529535a84864b80b6370b24b07ce..e1f2bd6ecfab2d3e6da1c5801c0f17e5866ebaad 100644 (file)
--- a/tests/bugs/xde/bug30779
+++ b/tests/bugs/xde/bug30779
@@ -3,7 +3,7 @@ puts "0030779: Data Exchange - Problems with located subshapes in expand compoun
 puts "============================================================================"
 puts ""
 
-pload DCAF
+pload OCAF
 
 XOpen [locate_data_file bug30779.xbf] D
 XExpand D 1

diff --git a/tests/bugs/xde/bug31382 b/tests/bugs/xde/bug31382
index cc6773e3a763efa35725e28431561907e6d84deb..ef9759e41bd9760af6800d172d89d8b2ecf134c5 100644 (file)
--- a/tests/bugs/xde/bug31382
+++ b/tests/bugs/xde/bug31382
@@ -2,7 +2,7 @@ puts "# ========================================================================
 puts "# 0031382: Data Exchange - BinXCAF should preserve length unit information"
 puts "# =============================================================================="
 
-pload DCAF
+pload OCAF
 
 box b 10 20 30
 

diff --git a/tests/bugs/xde/bug31466 b/tests/bugs/xde/bug31466
index 1bfd6d6359ff6634ff77af9c4643347806bed9ed..11151c1c38535d5b109e8eb9b91d5a044b4590c9 100644 (file)
--- a/tests/bugs/xde/bug31466
+++ b/tests/bugs/xde/bug31466
@@ -3,7 +3,7 @@ puts "  0031466: Data Exchange - Cannot import layers from STeP file (7.4.0 regre
 puts "================================================================================="
 puts ""
 
-pload DCAF
+pload OCAF
 
 XNewDoc D
 box b 1 1 1

diff --git a/tests/bugs/xde/bug31517 b/tests/bugs/xde/bug31517
index f482937677ffe6b26208ac48d6b3e503a1288895..9f01f236f6959a611365028225d8fdf5c5739549 100644 (file)
--- a/tests/bugs/xde/bug31517
+++ b/tests/bugs/xde/bug31517
@@ -3,7 +3,7 @@ puts "0031517: Data Exchange - wrong result of ShapeTool::UpdateAssemblies()"
 puts "======================================================================"
 puts ""
 
-pload DCAF
+pload OCAF
 
 # make structure with two assemblies linked to one original assembly (2 * 3 boxes)
 box b1 1 1 1

diff --git a/tests/bugs/xde/bug33100 b/tests/bugs/xde/bug33100
index ea11cf3411a1a2968047762ebc8a7822413bfc91..6f09c3992de7f94efe414df55fcb390bb2d3bff7 100644 (file)
--- a/tests/bugs/xde/bug33100
+++ b/tests/bugs/xde/bug33100
@@ -1,6 +1,6 @@
 puts "0033100: Modeling Algorithms - XCAFDoc_Editor::RescaleGeometry does not rescale triangulations"
 
-pload DCAF
+pload OCAF
 Close d -silent
 ReadStep d [locate_data_file "bug33100_window.step"]
 

diff --git a/tests/bugs/xde/bug3926 b/tests/bugs/xde/bug3926
index 6625ef01248ecc7a98b91ca35e60b795f19cf4c3..b03e9ccc8a34e70fa3798d044d98785407a2d1ce 100644 (file)
--- a/tests/bugs/xde/bug3926
+++ b/tests/bugs/xde/bug3926
@@ -6,7 +6,7 @@ puts ""
 # Exception during reading file using XDEDRAWEXE
 ######################################################
 
-pload DCAF
+pload OCAF
 
 NewDocument D BinXCAF
 UndoLimit D 100

diff --git a/tests/bugs/xde/bug6307 b/tests/bugs/xde/bug6307
index f665657f41ce6f8c8e8b3e43d9ed198592437419..3b4e9367acb1af121410ae07be95e5af78ab17d6 100755 (executable)
--- a/tests/bugs/xde/bug6307
+++ b/tests/bugs/xde/bug6307
@@ -7,7 +7,7 @@ puts "==========="
 
 set BugNumber OCC6307
 
-catch {pload DCAF}
+catch {pload OCAF}
 
 # Create a new document and set UndoLimit
 NewDocument D

diff --git a/tests/caf/begin b/tests/caf/begin
index 08a134c46b7733125a529946aadeee261d05fc75..f801bf0ce4156526a0ab57bc6a9114f19b993eb7 100755 (executable)
--- a/tests/caf/begin
+++ b/tests/caf/begin
@@ -1,7 +1,7 @@
 # File : begin
 
 if { [array get Draw_Groups "DF basic commands"] == "" } {
-       pload DCAF
+       pload OCAF
 }
 
 chrono qat start

diff --git a/tests/caf/presentation/A2 b/tests/caf/presentation/A2
index a7f5d9c329900aa4a3b82ff734b1c6d6e56e8181..3bd1640a296f29f5e7995eae6039c4546914b522 100755 (executable)
--- a/tests/caf/presentation/A2
+++ b/tests/caf/presentation/A2
@@ -41,4 +41,3 @@ Undo D
 AISRepaint D
 
 puts "There is the empty 3D viewer"
-

diff --git a/tests/de/begin b/tests/de/begin
index 66bf8d35266ea9aa5f1dba918d659b9df65ceca9..efe02a2bfb7e7ebbfb91dadc0ad61c64e18339b6 100644 (file)
--- a/tests/de/begin
+++ b/tests/de/begin
@@ -1,4 +1,4 @@
-pload DCAF
+pload OCAF
 pload TOPTEST
 pload XDE
 

diff --git a/tests/lowalgos/classifier/bug25969 b/tests/lowalgos/classifier/bug25969
index 4c190fff001c9a8ca77f1778530b58e8a018e23e..de383828b7672488b88299d77dbf15dbfb578643 100644 (file)
--- a/tests/lowalgos/classifier/bug25969
+++ b/tests/lowalgos/classifier/bug25969
@@ -6,7 +6,7 @@ puts ""
 ## Wrong result obtained by 2d classifier algorithm.
 ###############################################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug25969_pal22851.cbf] D
 

diff --git a/tests/lowalgos/classifier/bug25969_std b/tests/lowalgos/classifier/bug25969_std
index a67278601f4789a1dd49b6eae5f62d0ce3f76d10..b255ba6dad4870945c830908f179281664163cbd 100644 (file)
--- a/tests/lowalgos/classifier/bug25969_std
+++ b/tests/lowalgos/classifier/bug25969_std
@@ -6,7 +6,7 @@ puts ""
 ## Wrong result obtained by 2d classifier algorithm.
 ###############################################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug25969_pal22851.sgd] D
 

diff --git a/tests/lowalgos/intss/bug26576_1 b/tests/lowalgos/intss/bug26576_1
index 0320d17ada96b6e4275a34252eca1396916a6aa3..1d84b66f68e73ab568c065b82516faed8c04b9e2 100644 (file)
--- a/tests/lowalgos/intss/bug26576_1
+++ b/tests/lowalgos/intss/bug26576_1
@@ -6,7 +6,7 @@ puts ""
 ## Wrong result obtained by intersection algorithm.
 ###############################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug26576_study1_new_geom.cbf] D
 

diff --git a/tests/lowalgos/intss/bug26576_3 b/tests/lowalgos/intss/bug26576_3
index 51473c8642ffe9765dde920a6e53da4ad9ea16e6..f16504c7b59a42c677ddfdc6eb960691f652a5cb 100644 (file)
--- a/tests/lowalgos/intss/bug26576_3
+++ b/tests/lowalgos/intss/bug26576_3
@@ -6,7 +6,7 @@ puts ""
 ## Wrong result obtained by intersection algorithm.
 ###############################
 
-pload DCAF
+pload OCAF
 
 Open [locate_data_file bug26576_study1_new_geom.cbf] D
 

diff --git a/tests/metadata/begin b/tests/metadata/begin
index 4acc59bb42a74a91226a818a72ad33635c3e9a4b..10f873169a2fee4df4d15e577724faf359f68abe 100644 (file)
--- a/tests/metadata/begin
+++ b/tests/metadata/begin
@@ -1,4 +1,4 @@
-pload DCAF
+pload OCAF
 pload XDE
 
 cpulimit 1000

diff --git a/tests/perf/caf/begin b/tests/perf/caf/begin
index 322282c6de7c005fcce2e6648710bb3bde1541df..922865299424cf4177bd84bb2d2046a2743fd70e 100644 (file)
--- a/tests/perf/caf/begin
+++ b/tests/perf/caf/begin
@@ -1,3 +1,3 @@
-pload DCAF
+pload OCAF
 
 set subgroup caf

diff --git a/tests/xcaf/begin b/tests/xcaf/begin
index 72f8b86b13853875f3bf804dbffe3556d9ff2d31..294bac829de4872ceb0f728ff3efc290f672a4e8 100644 (file)
--- a/tests/xcaf/begin
+++ b/tests/xcaf/begin
@@ -2,7 +2,7 @@
 # and expression "set AddToDocument COLORS_LAYERS" means initializing colors and layers
 #
 if { [array get Draw_Groups "TOPOLOGY Feature commands"] == "" } {
-    pload DCAF
+    pload OCAF
     pload TOPTEST
     pload XDE
 }