From ea86bfe2fa131a92b95f237be45ca0ac419ad09a Mon Sep 17 00:00:00 2001 From: dpasukhi Date: Tue, 5 Nov 2024 16:56:11 +0000 Subject: [PATCH] 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 --- tests/bugs/caf/begin | 2 +- tests/bugs/caf/bug24164_1 | 2 +- tests/bugs/caf/bug24164_2 | 2 +- tests/bugs/caf/bug26229_1 | 2 +- tests/bugs/caf/bug26229_2 | 2 +- tests/bugs/fclasses/bug23852 | 2 +- tests/bugs/fclasses/bug984_1 | 2 +- tests/bugs/iges/bug33327 | 2 +- tests/bugs/modalg_4/bug8228 | 2 +- tests/bugs/modalg_5/bug24849_1 | 2 +- tests/bugs/modalg_5/bug24849_1_std | 2 +- tests/bugs/modalg_5/bug24849_2 | 2 +- tests/bugs/modalg_5/bug24849_2_std | 2 +- tests/bugs/modalg_6/bug26576_2 | 2 +- tests/bugs/modalg_6/bug26588 | 2 +- tests/bugs/moddata_1/bug22694 | 2 +- tests/bugs/moddata_3/bug23733 | 2 +- tests/bugs/moddata_3/bug23733_std | 2 +- tests/bugs/step/bug26342 | 2 +- tests/bugs/step/bug26657 | 2 +- tests/bugs/step/bug26925 | 2 +- tests/bugs/step/bug27313 | 2 +- tests/bugs/step/bug28345 | 2 +- tests/bugs/step/bug29240 | 2 +- tests/bugs/step/bug29403 | 2 +- tests/bugs/step/bug30053 | 2 +- tests/bugs/step/bug30362 | 2 +- tests/bugs/step/bug30533 | 2 +- tests/bugs/step/bug30789 | 2 +- tests/bugs/step/bug30856 | 2 +- tests/bugs/step/bug31489 | 2 +- tests/bugs/step/bug31568 | 2 +- tests/bugs/step/bug31675 | 2 +- tests/bugs/step/bug31685_1 | 2 +- tests/bugs/step/bug31685_2 | 2 +- tests/bugs/step/bug31685_3 | 2 +- tests/bugs/step/bug32310 | 2 +- tests/bugs/step/bug32681 | 2 +- tests/bugs/step/bug33331 | 2 +- tests/bugs/xde/bug1669 | 2 +- tests/bugs/xde/bug16740 | 2 +- tests/bugs/xde/bug1747 | 2 +- tests/bugs/xde/bug21046 | 2 +- tests/bugs/xde/bug22776 | 2 +- tests/bugs/xde/bug22962 | 2 +- tests/bugs/xde/bug22982 | 2 +- tests/bugs/xde/bug23384 | 2 +- tests/bugs/xde/bug23736 | 2 +- tests/bugs/xde/bug23773 | 2 +- tests/bugs/xde/bug23921 | 2 +- tests/bugs/xde/bug24430 | 2 +- tests/bugs/xde/bug25910 | 2 +- tests/bugs/xde/bug27169 | 2 +- tests/bugs/xde/bug27701 | 2 +- tests/bugs/xde/bug28104 | 2 +- tests/bugs/xde/bug28104_1 | 2 +- tests/bugs/xde/bug28748 | 2 +- tests/bugs/xde/bug29282 | 2 +- tests/bugs/xde/bug29854 | 2 +- tests/bugs/xde/bug30727 | 2 +- tests/bugs/xde/bug30779 | 2 +- tests/bugs/xde/bug31382 | 2 +- tests/bugs/xde/bug31466 | 2 +- tests/bugs/xde/bug31517 | 2 +- tests/bugs/xde/bug33100 | 2 +- tests/bugs/xde/bug3926 | 2 +- tests/bugs/xde/bug6307 | 2 +- tests/caf/begin | 2 +- tests/caf/presentation/A2 | 1 - tests/de/begin | 2 +- tests/lowalgos/classifier/bug25969 | 2 +- tests/lowalgos/classifier/bug25969_std | 2 +- tests/lowalgos/intss/bug26576_1 | 2 +- tests/lowalgos/intss/bug26576_3 | 2 +- tests/metadata/begin | 2 +- tests/perf/caf/begin | 2 +- tests/xcaf/begin | 2 +- 77 files changed, 76 insertions(+), 77 deletions(-) diff --git a/tests/bugs/caf/begin b/tests/bugs/caf/begin index ce171e2f78..8d197a2e22 100755 --- 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 cbd09f97dc..4df67dc8a7 100644 --- 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 f56a05e21b..055643e553 100644 --- 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 18a99a5ae4..bc4fe584ee 100644 --- 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 c206695e9c..50a0379203 100644 --- 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 075f8ca9eb..5318da4f1f 100755 --- 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 c139beb895..483cd2cf65 100755 --- 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 5a17a77bf4..1ed3c2ae7c 100644 --- 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 833129373f..86e6728a55 100755 --- 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 90b4e61e9f..06e9536e30 100644 --- 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 d80d339b2e..dc2278e830 100644 --- 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 7796adaee7..c7882f1ac9 100644 --- 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 4f25d48b37..363f3ea21e 100644 --- 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 900f0538ff..9c81892672 100644 --- 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 38ba860edf..26f4c75d9c 100644 --- 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 a44e79fdad..ff07e20790 100755 --- 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 53b2c07f58..eca5b6409d 100644 --- 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 e80fd46c2c..def3ef31b0 100644 --- 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 d7b513d384..e802fe5874 100755 --- 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 3c2cca6b33..04f99f6553 100644 --- 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 dd8556f385..6ac66a9687 100644 --- 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 8c353520fa..05177a8630 100644 --- 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 ff9be0c343..4f303b4049 100644 --- 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 40656f8ccc..bd12ff0262 100644 --- 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 856c31d145..c99e04b0be 100644 --- 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 67e042bed1..c1f6754d8d 100644 --- 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 c707e5e10c..7c75650b8b 100644 --- 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 e2f02266a7..bfc49328fc 100644 --- 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 263c49d40b..8b3626af1e 100644 --- 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 ee745e2abd..58dfdaf7b2 100644 --- 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 619936bd52..1fa95104e3 100644 --- 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 67eb6a7a14..839edac6e0 100644 --- 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 294564d600..709460feef 100644 --- 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 58734ecb7f..fe7722a3a2 100644 --- 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 a36efa93c1..bc34adac63 100644 --- 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 97ed381c8f..c51c8cfc8f 100644 --- 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 93dafda023..083b5a36c1 100644 --- 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 2f3e7a8bd4..d76eef3909 100644 --- 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 73cc77d328..5efbbdbbca 100644 --- 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 d58da1f9c4..444d68cf16 100755 --- 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 9680d8cc2b..0d5cf02308 100644 --- 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 e9d6bfcd4f..00fbc0c5d9 100755 --- 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 17d5e03966..c5aa63da52 100755 --- 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 d0b71947ee..3e1449af5a 100755 --- 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 97d19c6f58..83e8569925 100755 --- 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 d5a5135aac..260f80e64a 100755 --- 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 e59641b9e6..0134d4514e 100755 --- 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 d9f05bf11d..b1b975fb83 100644 --- 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 55541db4b1..a09df0a7a7 100644 --- 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 21763237b5..8f81de791c 100644 --- 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 4c531a313b..de30163938 100644 --- 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 8511cb2106..2e03c9478a 100644 --- 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 3c704aaa0b..fe3ddbdeb9 100644 --- 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 0a6fe5176d..3f6e4429e7 100644 --- 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 fc1d42321c..84c4f5cc87 100644 --- 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 b6f524778d..2de2130615 100644 --- 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 2aa5d9cd57..8808fa90e1 100644 --- 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 0e7819276f..f128f8bd96 100644 --- 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 2e32414f06..4ee14d838a 100644 --- 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 169a6f892f..5141d82a58 100644 --- 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 99f7d7b589..e1f2bd6ecf 100644 --- 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 cc6773e3a7..ef9759e41b 100644 --- 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 1bfd6d6359..11151c1c38 100644 --- 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 f482937677..9f01f236f6 100644 --- 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 ea11cf3411..6f09c3992d 100644 --- 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 6625ef0124..b03e9ccc8a 100644 --- 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 f665657f41..3b4e9367ac 100755 --- 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 08a134c46b..f801bf0ce4 100755 --- 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 a7f5d9c329..3bd1640a29 100755 --- 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 66bf8d3526..efe02a2bfb 100644 --- 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 4c190fff00..de383828b7 100644 --- 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 a67278601f..b255ba6dad 100644 --- 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 0320d17ada..1d84b66f68 100644 --- 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 51473c8642..f16504c7b5 100644 --- 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 4acc59bb42..10f873169a 100644 --- 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 322282c6de..9228652994 100644 --- 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 72f8b86b13..294bac829d 100644 --- 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 }