0023161: Select publicly accessible data files for OCCT tests

Duplicated data files are removed.
New command testfile added for automation of analysis of the new data files before adding to the data base.

diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl
index 41ed8e3b1cbdb34b448c9a2e2351c445404513ab..7aeaa814286542097f289d1b38ba1eceaa1b7db3 100644 (file)
--- a/src/DrawResources/TestCommands.tcl
+++ b/src/DrawResources/TestCommands.tcl
@@ -18,7 +18,8 @@
 ############################################################################
 # This file defines scripts for execution of OCCT tests.
 # It should be loaded automatically when DRAW is started, and provides
-# three top-level commands: 'test', 'testgrid', and 'testdiff'.
+# top-level commands starting with 'test'. Type 'help test' to get their
+# synopsys.
 # See OCCT Tests User Guide for description of the test system.
 #
 # Note: procedures with names starting with underscore are for internal use 
@@ -560,6 +561,162 @@ proc testdiff {dir1 dir2 args} {
     return
 }
 
+# Procedure to check data file before adding it to repository
+help testfile {
+  Check data file and prepare it for putting to test data files repository.
+  Use: testfile [filelist]
+
+  Will report if:
+  - data file (non-binary) is in DOS encoding (CR/LF)
+  - same data file (with same or another name) already exists in the repository
+  - another file with the same name already exists 
+  Note that names are assumed to be case-insensitive (for Windows).
+
+  Unless the file is already in the repository, tries to load it, reports
+  the recognized file format, file size, number of faces and edges in the 
+  loaded shape (if any), and makes snapshot (in the subdirectory tmp).
+  Finally it advises whether the file should be put to public section of the 
+  repository.
+}
+proc testfile {filelist} {
+    global env
+
+    # check that CSF_TestDataPath is defined
+    if { ! [info exists env(CSF_TestDataPath)] } {
+        error "Environment variable CSF_TestDataPath must be defined!"
+    }
+
+    # build registry of existing data files (name -> path) and (size -> path)
+    puts "Checking available test data files..."
+    foreach dir [_split_path $env(CSF_TestDataPath)] {
+        while {[llength $dir] != 0} {
+            set curr [lindex $dir 0]
+            set dir [lrange $dir 1 end]
+            eval lappend dir [glob -nocomplain -directory $curr -type d *]
+            foreach file [glob -nocomplain -directory $curr -type f *] {
+                set name [file tail $file]
+                set name_lower [string tolower $name]
+
+                # check that the file is not in DOS encoding
+                if { [_check_dos_encoding $file] } {
+                    puts "Warning: file $file is in DOS encoding; was this intended?"
+                }
+                _check_file_format $file
+
+                # check if file with the same name is present twice or more
+                if { [info exists names($name_lower)] } {
+                    puts "Error: more than one file with name $name is present in the repository:"
+                    if { [_diff_files $file $names($name_lower)] } {
+                        puts "(files are different by content)"
+                    } else {
+                        puts "(files are same by content)"
+                    }
+                    puts "--> $file"
+                    puts "--> $names($name_lower)"
+                    continue
+                } 
+                
+                # check if file with the same content exists
+                set size [file size $file]
+                if { [info exists sizes($size)] } {
+                    foreach other $sizes($size) {
+                        if { ! [_diff_files $file $other] } {
+                            puts "Warning: two files with the same content found:"
+                            puts "--> $file"
+                            puts "--> $other"
+                        }
+                    }
+                }
+
+                # add the file to the registry
+                set names($name_lower) $file
+                lappend sizes($size) $file
+           }
+       }
+    }
+    if { [llength $filelist] <= 0 } { return }
+
+    # check the new files
+    set has_images f
+    puts "Checking new file(s)..."
+    foreach file $filelist {
+        # check for DOS encoding
+        if { [_check_dos_encoding $file] } {
+            puts "$file: Warning: DOS encoding detected"
+        }
+
+        set name [file tail $file]
+        set name_lower [string tolower $name]
+
+        # check for presence of the file with same name
+        if { [info exists names($name_lower)] } {
+            if { [_diff_files $file $names($name_lower)] } {
+                puts "$file: Error: name is already used by existing file\n--> $names($name_lower)"
+            } else {
+                puts "$file: OK: already in the repository \n--> $names($name_lower)"
+                continue
+            }
+        }
+                
+        # check if file with the same content exists
+        set size [file size $file]
+        if { [info exists sizes($size)] } {
+            set found f
+            foreach other $sizes($size) {
+                if { ! [_diff_files $file $other] } {
+                     puts "$file: OK: the same file is already present under name [file tail $other]\n--> $other"
+                     set found t
+                     break
+                }
+            }
+            if { $found } { continue }
+        }
+
+        # try to read the file
+        set format [_check_file_format $file]
+        if { [catch {uplevel load_data_file $file $format a}] } {
+            puts "$file: Error: Cannot read as $format file"
+            continue
+        }
+
+        # get number of faces and edges
+        set edges 0
+        set faces 0
+        set nbs [uplevel nbshapes a]
+        regexp {EDGE[ \t:]*([0-9]+)} $nbs res edges
+        regexp {FACE[ \t:]*([0-9]+)} $nbs res faces
+
+        # classify; first check file size and number of faces and edges
+        if { $size < 95000 && $faces < 20 && $edges < 100 } {
+            set dir public
+        } else {
+            set dir private
+            # check if one of names of that file corresponds to typical name for 
+            # MDTV bugs or has extension .rle, this should be old model
+            if { [regexp -nocase {.*(cts|ats|pro|buc|ger|fra|usa|uki)[0-9]+.*} $name] ||
+                 [regexp -nocase {[.]rle\y} $name] } {
+                set dir old
+            }
+        }
+
+        # add stats
+        puts "$file: $format size=[expr $size / 1024] KiB, nbfaces=$faces, nbedges=$edges -> $dir"
+
+        file mkdir tmp/$dir
+
+        # make snapshot
+        pload AISV
+        uplevel vdisplay a
+        uplevel vfit
+        uplevel vzfit
+        uplevel vdump tmp/$dir/[file rootname [file tail $file]].png
+        set has_images t
+    }
+    if { $has_images } {
+        puts "Snapshots are saved in subdirectory tmp"
+    }
+}
+
 # Procedure to locate data file for test given its name.
 # The search is performed assuming that the function is called
 # from the test case script; the search order is:
@@ -1623,3 +1780,101 @@ proc _get_nb_cpus {} {
     # if cannot get good value, return 0 as default
     return 0
 }
+
+# check two files for difference
+proc _diff_files {file1 file2} {
+    set fd1 [open $file1 "r"]
+    set fd2 [open $file2 "r"]
+
+    set differ f
+    while {! $differ} {
+        set nb1 [gets $fd1 line1]
+        set nb2 [gets $fd2 line2]
+        if { $nb1 != $nb2 } { set differ t; break }
+        if { $nb1 < 0 } { break }
+        if { [string compare $line1 $line2] } {
+            set differ t
+        }
+    }
+
+    close $fd1
+    close $fd2
+
+    return $differ
+}
+
+# Check if file is in DOS encoding.
+# This check is done by presence of \r\n combination at the end of the first 
+# line (i.e. prior to any other \n symbol).
+# Note that presence of non-ascii symbols typically used for recognition
+# of binary files is not suitable since some IGES and STEP files contain
+# non-ascii symbols.
+# Special check is added for PNG files which contain \r\n in the beginning.
+proc _check_dos_encoding {file} {
+    set fd [open $file rb]
+    set isdos f
+    if { [gets $fd line] && [regexp {.*\r$} $line] && 
+         ! [regexp {^.PNG} $line] } {
+        set isdos t
+    }
+    close $fd
+    return $isdos
+}
+
+# procedure to recognize format of a data file by its first symbols (for OCCT 
+# BREP and geometry DRAW formats, IGES, and STEP) and extension (all others)
+proc _check_file_format {file} {
+    set fd [open $file rb]
+    set line [read $fd 1024]
+    close $fd
+
+    set warn f
+    set ext [file extension $file]
+    set format unknown
+    if { [regexp {^DBRep_DrawableShape} $line] } {
+        set format BREP
+        if { "$ext" != ".brep" && "$ext" != ".rle" && 
+             "$ext" != ".draw" && "$ext" != "" } {
+            set warn t
+        }
+    } elseif { [regexp {^DrawTrSurf_} $line] } {
+        set format DRAW
+        if { "$ext" != ".rle" && 
+             "$ext" != ".draw" && "$ext" != "" } {
+            set warn t
+        }
+    } elseif { [regexp {^[ \t]*ISO-10303-21} $line] } {
+        set format STEP
+        if { "$ext" != ".step" && "$ext" != ".stp" } {
+            set warn t
+        }
+    } elseif { [regexp {^.\{72\}S[0 ]\{6\}1} $line] } {
+        set format IGES
+        if { "$ext" != ".iges" && "$ext" != ".igs" } {
+            set warn t
+        }
+    } elseif { "$ext" == ".igs" } {
+        set format IGES
+    } elseif { "$ext" == ".stp" } {
+        set format STEP
+    } else {
+        set format [string toupper [string range $ext 1 end]]
+    }
+    
+    if { $warn } {
+        puts "$file: Warning: extension ($ext) does not match format ($format)"
+    }
+
+    return $format
+}
+
+# procedure to load file knowing its format
+proc load_data_file {file format shape} {
+    switch $format {
+    BREP { uplevel restore $file $shape }
+    IGES { pload XSDRAW; uplevel igesbrep $file $shape * }
+    STEP { pload XSDRAW; uplevel stepread $file __a *; uplevel renamevar __a_1 $shape }
+    STL  { pload XSDRAW; uplevel readstl $shape $file }
+    default { error "Cannot read $format file $file" }
+    }
+}

diff --git a/tests/blend/buildevol/G3 b/tests/blend/buildevol/G3
index 909d63d9af5f5b304f67f04305ab4ad1193db132..0735485b59b0ba4e679f428fc83510be61a3c33f 100644 (file)
--- a/tests/blend/buildevol/G3
+++ b/tests/blend/buildevol/G3
@@ -2,9 +2,9 @@
 #box s2 0 0 0 4 4 4
 #ttranslate s2 4 4 10
 #fuse s s1 s2
-#save s A5678.draw 
+#save s CFI_a5678fid.rle 
 
-restore [locate_data_file A5678.draw] s
+restore [locate_data_file CFI_a5678fid.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s

diff --git a/tests/blend/buildevol/H5 b/tests/blend/buildevol/H5
index d661067da01a491ff76a9b6f92f41752f142b921..e443d9640e01e4fbdac1b2b28d5b1be4c4ada612 100644 (file)
--- a/tests/blend/buildevol/H5
+++ b/tests/blend/buildevol/H5
@@ -3,9 +3,9 @@
 #ttranslate s2 3 0 -1
 #ttranslate s1 s2 5 5 0
 #cut s s1 s2
-#save s H1234.draw 
+#save s CFI_h1234fiq.rle 
 
-restore [locate_data_file H1234.draw] s
+restore [locate_data_file CFI_h1234fiq.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s

diff --git a/tests/blend/buildevol/H7 b/tests/blend/buildevol/H7
index f16a089598b1f90ed8bc350b9eccaad8d395e371..7563677ce79d2c2bb4394c2ff04d607c06040662 100644 (file)
--- a/tests/blend/buildevol/H7
+++ b/tests/blend/buildevol/H7
@@ -3,9 +3,9 @@
 #ttranslate s2 3 0 6
 #ttranslate s1 s2 5 5 0
 #cut s s1 s2
-#save s I1234.draw 
+#save s CFI_i1234fis.rle 
 
-restore [locate_data_file I1234.draw] s
+restore [locate_data_file CFI_i1234fis.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 mkevol result s

diff --git a/tests/blend/complex/B2 b/tests/blend/complex/B2
index c98e655a6cfbb59b011cf00ffde6f01e98ea796c..e50efe582809a783564859cd0341e09eb7177f82 100644 (file)
--- a/tests/blend/complex/B2
+++ b/tests/blend/complex/B2
@@ -5,7 +5,7 @@
 ## ====================================
 puts "TODO OCC22817 All:TEST INCOMPLETE"
 
-restore [locate_data_file pro10320.rle] a
+restore [locate_data_file CFI_pro10320.rle] a
 explode a e
 blend result a 15 a_15
 

diff --git a/tests/blend/simple/K8 b/tests/blend/simple/K8
index 2aa78644840cd6339a2dbee58d725eeddaff79ea..7176688ab475c8ae74129e5c6c40a25beb34e8ad 100644 (file)
--- a/tests/blend/simple/K8
+++ b/tests/blend/simple/K8
@@ -2,9 +2,9 @@
 #box s2 0 0 0 4 4 4
 #ttranslate s2 4 4 10
 #fuse s s1 s2
-#save s A5678.draw 
+#save s CFI_a5678fid.rle 
 
-restore [locate_data_file A5678.draw] s
+restore [locate_data_file CFI_a5678fid.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 1*SCALE1 s_16

diff --git a/tests/blend/simple/K9 b/tests/blend/simple/K9
index e05eae4b38d6da1606f6c408a9d978ea0f19ef4c..61977f5cc5bb3d36010c8af5771fb8a959df9c12 100644 (file)
--- a/tests/blend/simple/K9
+++ b/tests/blend/simple/K9
@@ -2,9 +2,9 @@
 #box s2 0 0 0 4 4 4
 #ttranslate s2 4 4 10
 #fuse s s1 s2
-#save s A5678.draw 
+#save s CFI_a5678fid.rle 
 
-restore [locate_data_file A5678.draw] s
+restore [locate_data_file CFI_a5678fid.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_16 0.5*SCALE1 s_15 0.5*SCALE1 s_24

diff --git a/tests/blend/simple/L1 b/tests/blend/simple/L1
index 40ae1893fef64410655d829908e748591b54fa1e..c2713d24549cfd55616133774fab82f2e5bc33f6 100644 (file)
--- a/tests/blend/simple/L1
+++ b/tests/blend/simple/L1
@@ -2,9 +2,9 @@
 #box s2 0 0 0 4 4 4
 #ttranslate s2 4 4 10
 #fuse s s1 s2
-#save s A5678.draw 
+#save s CFI_a5678fid.rle 
 
-restore [locate_data_file A5678.draw] s
+restore [locate_data_file CFI_a5678fid.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_1 0.5*SCALE1 s_20 0.5*SCALE1 s_15 0.5*SCALE1 s_24

diff --git a/tests/blend/simple/L8 b/tests/blend/simple/L8
index a98fc36695c61aead5c0c4e83b10b8408e1ffcff..6e35afabb1501307cc3a2d1d9890149cc9ddd304 100644 (file)
--- a/tests/blend/simple/L8
+++ b/tests/blend/simple/L8
@@ -3,9 +3,9 @@
 #trotate s2 0 0 0 0 0 1 90
 #ttranslate s2 5 -1 0
 #cut s s1 s2
-#save s C1234.draw 
+#save s CFI_c1234fig.rle 
 
-restore [locate_data_file C1234.draw] s
+restore [locate_data_file CFI_c1234fig.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_12 0.5*SCALE1 s_11 0.5*SCALE1 s_15 

diff --git a/tests/blend/simple/L9 b/tests/blend/simple/L9
index bab937c3b8f995f16a45920cbfabb793afca9024..17d0034dfee6bd094e4d06bda5352ad1453f1c6b 100644 (file)
--- a/tests/blend/simple/L9
+++ b/tests/blend/simple/L9
@@ -3,9 +3,9 @@
 #trotate s2 0 0 0 0 0 1 90
 #ttranslate s2 5 -1 0
 #cut s s1 s2
-#save s C1234.draw 
+#save s CFI_c1234fig.rle 
 
-restore [locate_data_file C1234.draw] s
+restore [locate_data_file CFI_c1234fig.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_4 0.5*SCALE1 s_2 0.5*SCALE1 s_12 

diff --git a/tests/blend/simple/O8 b/tests/blend/simple/O8
index b2d0658d624d34b7973fe077c4d846faeaf6d97d..e2ed844104ff2c38ff74aae4df980a74cf0a12cf 100644 (file)
--- a/tests/blend/simple/O8
+++ b/tests/blend/simple/O8
@@ -3,9 +3,9 @@
 #ttranslate s2 3 0 -1
 #ttranslate s1 s2 5 5 0
 #cut s s1 s2
-#save s H1234.draw 
+#save s CFI_h1234fiq.rle 
 
-restore [locate_data_file H1234.draw] s
+restore [locate_data_file CFI_h1234fiq.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3

diff --git a/tests/blend/simple/O9 b/tests/blend/simple/O9
index dfed15ea081e08ac73433d3f32f2a780ea0d4a50..4f11b0dd4825f2ac33524aab036a3572f7884ab8 100644 (file)
--- a/tests/blend/simple/O9
+++ b/tests/blend/simple/O9
@@ -3,9 +3,9 @@
 #ttranslate s2 3 0 -1
 #ttranslate s1 s2 5 5 0
 #cut s s1 s2
-#save s H1234.draw 
+#save s CFI_h1234fiq.rle 
 
-restore [locate_data_file H1234.draw] s
+restore [locate_data_file CFI_h1234fiq.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3 0.5*SCALE1 s_1 0.5*SCALE1 s_5

diff --git a/tests/blend/simple/P4 b/tests/blend/simple/P4
index 9796d37ed684aab16dd3e4cb11064067b90aa9cc..50fdc83646ae8193b4dbd842d41b545131c84545 100644 (file)
--- a/tests/blend/simple/P4
+++ b/tests/blend/simple/P4
@@ -3,9 +3,9 @@
 #ttranslate s2 3 0 6
 #ttranslate s1 s2 5 5 0
 #cut s s1 s2
-#save s I1234.draw 
+#save s CFI_i1234fis.rle 
 
-restore [locate_data_file I1234.draw] s
+restore [locate_data_file CFI_i1234fis.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3

diff --git a/tests/blend/simple/P5 b/tests/blend/simple/P5
index 0a484c97eae4ef372f19172242abc8a7f020fd37..6c257e7422569223e2338a85b531708043d97beb 100644 (file)
--- a/tests/blend/simple/P5
+++ b/tests/blend/simple/P5
@@ -3,9 +3,9 @@
 #ttranslate s2 3 0 6
 #ttranslate s1 s2 5 5 0
 #cut s s1 s2
-#save s I1234.draw 
+#save s CFI_i1234fis.rle 
 
-restore [locate_data_file I1234.draw] s
+restore [locate_data_file CFI_i1234fis.rle] s
 tscale s 0 0 0 SCALE1
 explode s e
 blend result s 0.5*SCALE1 s_3 0.5*SCALE1 s_1

diff --git a/tests/blend/simple/Q3 b/tests/blend/simple/Q3
index be2f0a74f098a2f06822eb4c9904607f46a302f7..41c5bb54c19cf991fdc8542c4ac1119ccadc555d 100644 (file)
--- a/tests/blend/simple/Q3
+++ b/tests/blend/simple/Q3
@@ -1,5 +1,5 @@
 puts "TODO OCC22817 All: TEST INCOMPLETE"
-restore [locate_data_file 4_E1(test16).draw] s
+restore [locate_data_file CFI_4_e1_ffr.rle] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s 1*SCALE s_5

diff --git a/tests/blend/simple/Q6 b/tests/blend/simple/Q6
index ed9744c593f573e20da2a29ce33d66b4b97fcf04..03f132cd90f9bd12b37f5d1c0cb30bb7c302efbb 100644 (file)
--- a/tests/blend/simple/Q6
+++ b/tests/blend/simple/Q6
@@ -1,4 +1,4 @@
-restore [locate_data_file 4_H1(test23).draw] s
+restore [locate_data_file CFI_4_h1_ffu.rle] s
 tscale s 0 0 0 SCALE
 explode s E
 blend result s SCALE*2 s_5

diff --git a/tests/blend/simple/S5 b/tests/blend/simple/S5
index da9fe156c45685cfdf7f22e655773c942e59d115..d7c25ab2b9c13250dad833446d2943d3a14d016d 100644 (file)
--- a/tests/blend/simple/S5
+++ b/tests/blend/simple/S5
@@ -1,7 +1,7 @@
 #box b -15 -15 -15 30 30 15
 #psphere s 13 0 90 
 #fuse s s b
-#save s 6_C1234.draw 
+#save s 6_CFI_c1234fig.rle 
 
 restore [locate_data_file CFI_6_c12fgv.rle] s
 tscale s 0 0 0 SCALE2

diff --git a/tests/blend/simple/U2 b/tests/blend/simple/U2
index d56b5c47e0802c812fb3a9c9341f985ddd7d2993..60fea88b1b631b863675ea2fb736b86fbbf935e7 100644 (file)
--- a/tests/blend/simple/U2
+++ b/tests/blend/simple/U2
@@ -6,7 +6,7 @@
 #mkplane p p
 #pipe s1 w p
 #fuse s s1 b
-#save s 6_H1234.draw
+#save s 6_CFI_h1234fiq.rle
 
 restore [locate_data_file CFI_6_h12fhf.rle] s
 tscale s 0 0 0 SCALE2

diff --git a/tests/blend/simple/U5 b/tests/blend/simple/U5
index 17d49addd12322f8b22943f69088b869462e8c41..1e0fc26c7ca9f1e84e812ac50c012839d2ade883 100644 (file)
--- a/tests/blend/simple/U5
+++ b/tests/blend/simple/U5
@@ -3,7 +3,7 @@
 #trotate s2 0 0 0 1 0 0 90
 #ttranslate s2 0 7 7
 #fuse s s1 s2
-#save s 6_I1234.draw 
+#save s 6_CFI_i1234fis.rle 
 
 restore [locate_data_file CFI_6_i12fhh.rle]  s
 tscale s 0 0 0 SCALE2

diff --git a/tests/blend/tolblend_simple/B7 b/tests/blend/tolblend_simple/B7
index 6b7bb702c9abeddf06636b56cc0e8ef16917ca0b..ad970999c3d27d7485ce745a6dbfd2abc3a1ade0 100644 (file)
--- a/tests/blend/tolblend_simple/B7
+++ b/tests/blend/tolblend_simple/B7
@@ -5,7 +5,7 @@
 #explode p F
 #glue s c p c_3 p_2
 
-restore [locate_data_file 7_A4.draw] s
+restore [locate_data_file CFI_7_a4_fhl.rle] s
 tscale  s 0 0 0 SCALE1 
 explode s e
 blend result s 15*SCALE1 s_2

diff --git a/tests/blend/tolblend_simple/C3 b/tests/blend/tolblend_simple/C3
index 8fb703af1cd28b31f3917104930ce3f7f76ec84f..7d5ae764c895459f96912e20c04b598ddd2c5b13 100644 (file)
--- a/tests/blend/tolblend_simple/C3
+++ b/tests/blend/tolblend_simple/C3
@@ -5,7 +5,7 @@
 #explode p F
 #glue s c p c_3 p_2
 
-restore [locate_data_file 7_F1.draw] s
+restore [locate_data_file CFI_7_f1_fhs.rle] s
 tscale  s 0 0 0 SCALE1 
 explode s e
 blend result s 5*SCALE1 s_2

diff --git a/tests/boolean/bcommon_2d/J2 b/tests/boolean/bcommon_2d/J2
index 8403b9baff859bfce4190a8f769be88a9d9246aa..1e0d992fcd6d6c84e54dba8f9933ebfeb5e59b54 100644 (file)
--- a/tests/boolean/bcommon_2d/J2
+++ b/tests/boolean/bcommon_2d/J2
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bcommon result b a
 set length 411.923
 set nbsh_v 6

diff --git a/tests/boolean/bcommon_2d/J3 b/tests/boolean/bcommon_2d/J3
index 3dc265708bf0a87a1914d6a78e13728b3d4dc5dd..ad6aa95493d8140ab4b0b8d59fb342fa83fbe0c0 100644 (file)
--- a/tests/boolean/bcommon_2d/J3
+++ b/tests/boolean/bcommon_2d/J3
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge2.brep] b
+restore [locate_data_file case_5_edge2.brep] b
 bcommon result b a
 set length 615.235
 set nbsh_v 6

diff --git a/tests/boolean/bcommon_2d/J7 b/tests/boolean/bcommon_2d/J7
index 1a78313a49315338d78dbafe31f5749003493136..622bdb7a060b79d7e4c4450adaa957634b4f3df5 100644 (file)
--- a/tests/boolean/bcommon_2d/J7
+++ b/tests/boolean/bcommon_2d/J7
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bcommon result b a
 set length 629.671
 set nbsh_v 14

diff --git a/tests/boolean/bcommon_2d/J8 b/tests/boolean/bcommon_2d/J8
index 73675f4c71c012a352a42d942fe5c711e5f62452..13f2dc7bdff445bd7932003d53e0129dce5a27d9 100644 (file)
--- a/tests/boolean/bcommon_2d/J8
+++ b/tests/boolean/bcommon_2d/J8
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire4.brep] b
+restore [locate_data_file case_5_wire4.brep] b
 bcommon result b a
 set length 1150.78
 set nbsh_v 15

diff --git a/tests/boolean/bcommon_2d/J9 b/tests/boolean/bcommon_2d/J9
index 296994275929d8ae41d217da5622b2b642674562..e68d2e3ba5534d82cb96b20217588155442cfdab 100644 (file)
--- a/tests/boolean/bcommon_2d/J9
+++ b/tests/boolean/bcommon_2d/J9
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bcommon result b a
 set length 411.923
 set nbsh_v 6

diff --git a/tests/boolean/bcommon_2d/K3 b/tests/boolean/bcommon_2d/K3
index 4890438a8053b2c597caafd5445c2993f309072a..dab5c8e3d9a5e0a514ff36d8b6434aaa29527d36 100644 (file)
--- a/tests/boolean/bcommon_2d/K3
+++ b/tests/boolean/bcommon_2d/K3
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bcommon result b a
 set length 629.671
 set nbsh_v 14

diff --git a/tests/boolean/bcommon_2d/K4 b/tests/boolean/bcommon_2d/K4
index b93fe3c8954e08593a842d64c9849caa2c3a69c8..7b87dd091d9133ebfc2c2827be06df14426baef2 100644 (file)
--- a/tests/boolean/bcommon_2d/K4
+++ b/tests/boolean/bcommon_2d/K4
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bcommon result b a
 set length 411.923
 set nbsh_v 6

diff --git a/tests/boolean/bcommon_2d/K7 b/tests/boolean/bcommon_2d/K7
index 94f5e3ab0d4d7bfb47af28a41ce03cd31f6da70d..75a100c4ef932466c405cfa4cc85455b011e7376 100644 (file)
--- a/tests/boolean/bcommon_2d/K7
+++ b/tests/boolean/bcommon_2d/K7
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bcommon result b a
 set length 629.671
 set nbsh_v 14

diff --git a/tests/boolean/bcut_2d/J6 b/tests/boolean/bcut_2d/J6
index d1b9ab286222367032c435ee1ad052d6dc490076..aa0d703e3d06df9774b3713c1cac9202504274dd 100644 (file)
--- a/tests/boolean/bcut_2d/J6
+++ b/tests/boolean/bcut_2d/J6
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bcut result b a
 set length 819.435
 set nbsh_v 8

diff --git a/tests/boolean/bcut_2d/J7 b/tests/boolean/bcut_2d/J7
index 108b9a6dd569e1a41e9443b3b301d2a25756a5e8..d0e2ae24eb997aceafcb5000c5a5e629138d7ce0 100644 (file)
--- a/tests/boolean/bcut_2d/J7
+++ b/tests/boolean/bcut_2d/J7
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge2.brep] b
+restore [locate_data_file case_5_edge2.brep] b
 bcut result b a
 set length 616.124
 set nbsh_v 8

diff --git a/tests/boolean/bcut_2d/K2 b/tests/boolean/bcut_2d/K2
index 1cc056bab4490d0ac866e59a16047cb8c784481b..bba6879dab4493675d16b3cf34b6d7a94f7e2f94 100644 (file)
--- a/tests/boolean/bcut_2d/K2
+++ b/tests/boolean/bcut_2d/K2
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bcut result b a
 set length 1450.39
 set nbsh_v 17

diff --git a/tests/boolean/bcut_2d/K3 b/tests/boolean/bcut_2d/K3
index 49f6a5f0874f2b005262dc5b252fba26e55e5f38..eef1bbf0c5ac51a46d09c0227b10e59c84790960 100644 (file)
--- a/tests/boolean/bcut_2d/K3
+++ b/tests/boolean/bcut_2d/K3
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire4.brep] b
+restore [locate_data_file case_5_wire4.brep] b
 bcut result b a
 set length 929.278
 set nbsh_v 16

diff --git a/tests/boolean/bcut_2d/K4 b/tests/boolean/bcut_2d/K4
index a1fe59ba9b69ae8b351ae5e85f4679b7af6a8290..40aeff347987ec39acabe3940228b8a6d3df0398 100644 (file)
--- a/tests/boolean/bcut_2d/K4
+++ b/tests/boolean/bcut_2d/K4
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bcut result b a
 set length 819.435
 set nbsh_v 8

diff --git a/tests/boolean/bcut_2d/K7 b/tests/boolean/bcut_2d/K7
index 39be5782fb13e741ec39eff19a63ea1668ed4f56..c2b7c702190f34c6b161be07a13eb1efd1e34f14 100644 (file)
--- a/tests/boolean/bcut_2d/K7
+++ b/tests/boolean/bcut_2d/K7
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bcut result b a
 set length 1450.39
 set nbsh_v 17

diff --git a/tests/boolean/bcut_2d/K8 b/tests/boolean/bcut_2d/K8
index 2e7a5d566dbbe46f418304991f8006a6a87a4063..c39923fa3dedcf9bbb93099378bb77426b0ef7a7 100644 (file)
--- a/tests/boolean/bcut_2d/K8
+++ b/tests/boolean/bcut_2d/K8
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bcut result b a
 set length 819.435
 set nbsh_v 8

diff --git a/tests/boolean/bcut_2d/L2 b/tests/boolean/bcut_2d/L2
index 7d75e9625a874886b135ef1c67f4f1a490572005..fe505231c4c190629680802c31c0968bdb902c98 100644 (file)
--- a/tests/boolean/bcut_2d/L2
+++ b/tests/boolean/bcut_2d/L2
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bcut result b a
 set length 1450.39
 set nbsh_v 17

diff --git a/tests/boolean/bcut_complex/E3 b/tests/boolean/bcut_complex/E3
index 90c99cf43ff299fb2918395af2e956766b769149..04eae527ce7702cee06c5799f2640709040537a8 100644 (file)
--- a/tests/boolean/bcut_complex/E3
+++ b/tests/boolean/bcut_complex/E3
@@ -1,8 +1,8 @@
 # Original bug : pro5557
 # Date : 10mar97
 
-restore [locate_data_file pro5557_revol.shape] revol1
-restore [locate_data_file pro5557_bsurf.shape] bsurf2
+restore [locate_data_file pro5557_revol.brep] revol1
+restore [locate_data_file pro5557_bsurf.brep] bsurf2
 #normals bsurf2 0.27
 point pnt1 0 -0.3 0
 halfspace space2 bsurf2 0 -0.3 0

diff --git a/tests/boolean/bcut_complex/I1 b/tests/boolean/bcut_complex/I1
index db0e381954d9082b2cc35ced5c3bc8100b84a5f2..f1942b91ee216c48a31d1c51738c86bb9aa496f8 100644 (file)
--- a/tests/boolean/bcut_complex/I1
+++ b/tests/boolean/bcut_complex/I1
@@ -2,7 +2,7 @@
 # Date : 13Mai98
  
 restore [locate_data_file CTO901_cts20203_base.rle]  base
-restore [locate_data_file cts20203_outil]  outil
+restore [locate_data_file CTO901_cts20203_outil.rle]  outil
 
 bcut result base outil
 

diff --git a/tests/boolean/bcut_complex/O7 b/tests/boolean/bcut_complex/O7
index f197602c66efa07f6bf22d04ceaccd67aff1dc14..79427906c9e8f674e8cae7bf93cc2cb2f565d2b9 100644 (file)
--- a/tests/boolean/bcut_complex/O7
+++ b/tests/boolean/bcut_complex/O7
@@ -1,7 +1,7 @@
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_4"
 puts "TODO #22911 ALL: Error : The square of result shape is"
 
-restore [locate_data_file topo108-o.brep] obj
+restore [locate_data_file CTO908_topo108-o.brep] obj
 restore [locate_data_file pro12903b.rle] out
 
 bcut result obj out

diff --git a/tests/boolean/bcut_complex/P8 b/tests/boolean/bcut_complex/P8
index fccc7c75c5646e6c57d79e636239c3c643ca9624..e3ab01fec95ee7d9453244c5e3b87093e3a2f56d 100644 (file)
--- a/tests/boolean/bcut_complex/P8
+++ b/tests/boolean/bcut_complex/P8
@@ -1,7 +1,7 @@
 # Original bug : cfe002C5
 # Date : 09 Nov 98
 
-restore [locate_data_file boitecfe002.rle] base
+restore [locate_data_file pro16389a.rle] base
 restore [locate_data_file pro16389b.rle] prism
 
 bcut result base prism

diff --git a/tests/boolean/bfuse_complex/C9 b/tests/boolean/bfuse_complex/C9
index 82300506dc3166633077c51929248569355ca759..b27e30afae81b667e3ef28f06d1a86380f23b7e0 100644 (file)
--- a/tests/boolean/bfuse_complex/C9
+++ b/tests/boolean/bfuse_complex/C9
@@ -2,7 +2,7 @@
 # Date : 11mar98
 
 restore [locate_data_file CTO900_cts16184a.rle] a
-restore [locate_data_file cts16184b.shape] b
+restore [locate_data_file cts16184b.brep] b
 
 bfuse result a b
 

diff --git a/tests/boolean/bfuse_complex/D2 b/tests/boolean/bfuse_complex/D2
index 31775020976739c6cdcc212394ecbd34b40b2996..399382d6bc96da2f009ad715b1931b8696a91a83 100644 (file)
--- a/tests/boolean/bfuse_complex/D2
+++ b/tests/boolean/bfuse_complex/D2
@@ -1,7 +1,7 @@
 # Original bug : ger60039
 # Date : 11mar98
 
-restore [locate_data_file ger60039a.shape] a
+restore [locate_data_file ger60039a.brep] a
 fsameparameter a
 restore [locate_data_file CTO900_ger60039b.rle] b 
 

diff --git a/tests/boolean/bfuse_complex/F3 b/tests/boolean/bfuse_complex/F3
index 82122f2abd2a7e16c3e58bdbb66e58689500a7e5..ff2def11c63fc34e8f2289285f721175548dd062 100644 (file)
--- a/tests/boolean/bfuse_complex/F3
+++ b/tests/boolean/bfuse_complex/F3
@@ -1,7 +1,7 @@
 # Original bug : pro6110
 # Date : 24mar98
 
-restore [locate_data_file pro6110a.rle] a
+restore [locate_data_file CTO900_pro6110a.rle] a
 restore [locate_data_file CTO900_pro6110b.rle] b
 
 bfuse result a b

diff --git a/tests/boolean/bfuse_complex/G4 b/tests/boolean/bfuse_complex/G4
index 626108f512754f78fac2212123c7a69eb39ede26..b2e6592c2da8b321b5e0cf0084e3ac7daa4b60c2 100644 (file)
--- a/tests/boolean/bfuse_complex/G4
+++ b/tests/boolean/bfuse_complex/G4
@@ -1,7 +1,7 @@
 # Original bug : cts20171
 # Date : 13Mai98
 
-restore [locate_data_file cts20171_base]  base
+restore [locate_data_file CTO901_cts20171_base.rle]  base
 restore [locate_data_file CTO901_cts20171_outil.rle]  outil
 
 bfuse result base outil

diff --git a/tests/boolean/bfuse_complex/H7 b/tests/boolean/bfuse_complex/H7
index 6ebf88dfb5885edd109d4d4f0ccdda32e962cf75..e16dc26fd87ca4df117d095d21167a7c0a1ac241 100644 (file)
--- a/tests/boolean/bfuse_complex/H7
+++ b/tests/boolean/bfuse_complex/H7
@@ -2,7 +2,7 @@
 # Date : 13Mai98
 # B6
 
-restore [locate_data_file cts20486a.rle] a
+restore [locate_data_file CTO902_cts20486a.rle] a
 restore [locate_data_file cts20486b.rle] b
 restore [locate_data_file cts20486c.rle] c
 

diff --git a/tests/boolean/bfuse_complex/I7 b/tests/boolean/bfuse_complex/I7
index 51a0c8c7eaa9a06c7c25559830573957f1195f14..0a18f97b9fc4f81909a0f3e0a06d84538e2cc31d 100644 (file)
--- a/tests/boolean/bfuse_complex/I7
+++ b/tests/boolean/bfuse_complex/I7
@@ -2,7 +2,7 @@
 # Date : 13Mai98
 # D4
 
-restore [locate_data_file cts20535a.rle] a
+restore [locate_data_file CTO902_cts20535a.rle] a
 restore [locate_data_file CTO902_cts20535b.rle] b
 
 bfuse result a b

diff --git a/tests/boolean/bfuse_complex/I8 b/tests/boolean/bfuse_complex/I8
index 1ed8fee691f5288c768ebfc8db97fc5275cb252e..d70eac779e37f7cc0d11a6fd25ad54a32f7bb09f 100644 (file)
--- a/tests/boolean/bfuse_complex/I8
+++ b/tests/boolean/bfuse_complex/I8
@@ -2,7 +2,7 @@
 # Date : 13Mai98
 # D5
 
-restore [locate_data_file cts20529a.rle] a
+restore [locate_data_file CTO902_cts20529a.rle] a
 restore [locate_data_file CTO902_cts20529b.rle] b
 
 bfuse result a b

diff --git a/tests/boolean/bfuse_complex/K5 b/tests/boolean/bfuse_complex/K5
index bab2cb1e4e365edcae35113276ccdf925ee8b6de..a8774ed90de5b98f5aaac74b2043e6d909a32738 100644 (file)
--- a/tests/boolean/bfuse_complex/K5
+++ b/tests/boolean/bfuse_complex/K5
@@ -1,7 +1,7 @@
 # Original bug : buc60116
 # Date : 12June98
 
-restore [locate_data_file buc60116a.rle] a 
+restore [locate_data_file CTO904_buc60116a.rle] a 
 restore [locate_data_file buc60116b.rle] b
 
 bfuse result a b

diff --git a/tests/boolean/bfuse_complex/L1 b/tests/boolean/bfuse_complex/L1
index 6f248d43dc4b157da4ab0761960fa0d14b988b0f..70c62af3efd51174b8404d11695e59e1941b1f32 100644 (file)
--- a/tests/boolean/bfuse_complex/L1
+++ b/tests/boolean/bfuse_complex/L1
@@ -1,8 +1,8 @@
 # Original bug : cts20525
 # Date : 24June98
 
-restore [locate_data_file cts20525a.rle] a 
-restore [locate_data_file cts200525b.rle] b
+restore [locate_data_file CTO902_cts20525-part.rle] a 
+restore [locate_data_file CTO902_cts20525-tool.rle] b
 
 bfuse result a b
 

diff --git a/tests/boolean/bfuse_complex/P2 b/tests/boolean/bfuse_complex/P2
index 1971eae44dba9de7f3f7764c503512eb127c18e6..21d68271e9363ca231e159ea817ae0dec04e24dd 100644 (file)
--- a/tests/boolean/bfuse_complex/P2
+++ b/tests/boolean/bfuse_complex/P2
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore [locate_data_file cq12.brep] c1
+restore [locate_data_file pro15203b.rle] c1
 explode c1 f
 copy c1_1 c1
-restore [locate_data_file cq21.brep] c2
+restore [locate_data_file pro15203c.rle] c2
 explode c2 f
 copy c2_1 c2
 

diff --git a/tests/boolean/bfuse_complex/P3 b/tests/boolean/bfuse_complex/P3
index 982466457062e00c2c3a9c81e751ec9601199089..4e6e372ead5a22715723a60878e8424f35551f7c 100644 (file)
--- a/tests/boolean/bfuse_complex/P3
+++ b/tests/boolean/bfuse_complex/P3
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore [locate_data_file cq12.brep] c1
+restore [locate_data_file pro15203b.rle] c1
 explode c1 f
 copy c1_1 c1
-restore [locate_data_file cq22.brep] c2
+restore [locate_data_file pro15203d.rle] c2
 explode c2 f
 copy c2_1 c2
 

diff --git a/tests/boolean/bfuse_complex/S3 b/tests/boolean/bfuse_complex/S3
index 2d3f9d4691111d6f78cb33702eba6a4d9cabe121..7a638448912b8f082e69a526230cc98dcb22e401 100644 (file)
--- a/tests/boolean/bfuse_complex/S3
+++ b/tests/boolean/bfuse_complex/S3
@@ -3,8 +3,8 @@ puts "Fuse"
 puts ""
 
 
-restore [locate_data_file pro15203_12.brep] c1
-restore [locate_data_file pro15203_21.brep] c2
+restore [locate_data_file pro15203b.rle] c1
+restore [locate_data_file pro15203c.rle] c2
 ########################mod by pkv f
 explode c1 f
 copy c1_1 c1

diff --git a/tests/boolean/bfuse_complex/S4 b/tests/boolean/bfuse_complex/S4
index 95efd655c96edd72991a9680f883b95cb92c5252..105b00246d96d3f1be12f5a964ea2b6959b1589c 100644 (file)
--- a/tests/boolean/bfuse_complex/S4
+++ b/tests/boolean/bfuse_complex/S4
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore [locate_data_file pro15203_12.brep] c1
-restore [locate_data_file pro15203_22.brep] c2
+restore [locate_data_file pro15203b.rle] c1
+restore [locate_data_file pro15203d.rle] c2
 
 ########################mod by pkv f
 explode c1 f

diff --git a/tests/boolean/bopcommon_2d/J2 b/tests/boolean/bopcommon_2d/J2
index 167e387c8137c1c131a6648570d8bf00cdfef0e4..aa594e6a41087dcd43fa1066c8de3785a12e7527 100644 (file)
--- a/tests/boolean/bopcommon_2d/J2
+++ b/tests/boolean/bopcommon_2d/J2
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 bopcommon result
 set length 411.923

diff --git a/tests/boolean/bopcommon_2d/J3 b/tests/boolean/bopcommon_2d/J3
index e221b6c2987de9ce1adffb931636c9fe0909e300..fd85ae8453a6089906c5ae510ce88e6617b0317d 100644 (file)
--- a/tests/boolean/bopcommon_2d/J3
+++ b/tests/boolean/bopcommon_2d/J3
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge2.brep] b
+restore [locate_data_file case_5_edge2.brep] b
 bop a b
 bopcommon result
 set length 615.235

diff --git a/tests/boolean/bopcommon_2d/J7 b/tests/boolean/bopcommon_2d/J7
index 285ddae1d176c49e6060e4ed6b029348264693c9..c0ef61a18c6b9e07cd857fa3b8a49f75dbf09520 100644 (file)
--- a/tests/boolean/bopcommon_2d/J7
+++ b/tests/boolean/bopcommon_2d/J7
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 set length 629.671

diff --git a/tests/boolean/bopcommon_2d/J8 b/tests/boolean/bopcommon_2d/J8
index 1be572ec10f7e04556e0fa33cd28881f9df5309c..fb2efa8afdbffd78299945f1f8025f5759b9ff7f 100644 (file)
--- a/tests/boolean/bopcommon_2d/J8
+++ b/tests/boolean/bopcommon_2d/J8
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire4.brep] b
+restore [locate_data_file case_5_wire4.brep] b
 bop a b
 bopcommon result
 set length 1150.78

diff --git a/tests/boolean/bopcommon_2d/J9 b/tests/boolean/bopcommon_2d/J9
index 9d565287182a8f72a81e816dfcdd23f5a9ff7762..f3f0fbbe8934b6214f6717392b915fd6a54ff39f 100644 (file)
--- a/tests/boolean/bopcommon_2d/J9
+++ b/tests/boolean/bopcommon_2d/J9
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 bopcommon result
 set length 411.923

diff --git a/tests/boolean/bopcommon_2d/K3 b/tests/boolean/bopcommon_2d/K3
index b5254a621ecb8d927d6af8db7e3c159578381a10..3793c2b463adf5f7a88cebcdcdc0cf12af39a730 100644 (file)
--- a/tests/boolean/bopcommon_2d/K3
+++ b/tests/boolean/bopcommon_2d/K3
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 set length 629.671

diff --git a/tests/boolean/bopcommon_2d/K4 b/tests/boolean/bopcommon_2d/K4
index 4bed6e236f8fc5869fb6704870b9e61ff835e0f6..51888d2ebfef6f3b3cd4c09a9187f3547feffcdb 100644 (file)
--- a/tests/boolean/bopcommon_2d/K4
+++ b/tests/boolean/bopcommon_2d/K4
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 bopcommon result
 set length 411.923

diff --git a/tests/boolean/bopcommon_2d/K7 b/tests/boolean/bopcommon_2d/K7
index d699e9e20a3ba13f8af3d37c135f266558e8ea64..0311ff8e0f789112f6d920dadf7cd7eaa1cbe4f4 100644 (file)
--- a/tests/boolean/bopcommon_2d/K7
+++ b/tests/boolean/bopcommon_2d/K7
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 set length 629.671

diff --git a/tests/boolean/bopcut_complex/M2 b/tests/boolean/bopcut_complex/M2
index 75357e36a5dabf22b1c2f5a2bfdd3ca671ce078d..488057337a1dc693a7be1ebd6f3cf127733da46e 100644 (file)
--- a/tests/boolean/bopcut_complex/M2
+++ b/tests/boolean/bopcut_complex/M2
@@ -2,7 +2,7 @@
 # Date : 19Mai98
 
 restore [locate_data_file CTO904_cts20148a.rle] a
-restore [locate_data_file cts20148b.rle] b
+restore [locate_data_file CTO904_cts20148b.rle] b
 
 bop a b
 bopcut result

diff --git a/tests/boolean/bopfuse_complex/K1 b/tests/boolean/bopfuse_complex/K1
index 707340321e616c4c3bf6df393e81316039f0980f..a29e0459f31050937be66f27613a0b2987185651 100644 (file)
--- a/tests/boolean/bopfuse_complex/K1
+++ b/tests/boolean/bopfuse_complex/K1
@@ -1,7 +1,7 @@
 # Original bug : buc60093
 # Date : 25Mai98
 
-restore [locate_data_file buc60093a.rle] a
+restore [locate_data_file CTO904_buc60093a.rle] a
 restore [locate_data_file buc60093b.rle] b
 
 bop a b

diff --git a/tests/boolean/bopfuse_complex/L5 b/tests/boolean/bopfuse_complex/L5
index dd0dea0602c43b6b9291c38fe2ac37214a58c97c..6e4f7966fd77eb93132b9c3bbb3150848835fd1a 100644 (file)
--- a/tests/boolean/bopfuse_complex/L5
+++ b/tests/boolean/bopfuse_complex/L5
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore [locate_data_file cq11.brep] c1
+restore [locate_data_file pro15203a.rle] c1
 explode c1 f
 copy c1_1 c1
-restore [locate_data_file cq21.brep] c2
+restore [locate_data_file pro15203c.rle] c2
 explode c2 f
 copy c2_1 c2
 

diff --git a/tests/boolean/bopfuse_complex/L6 b/tests/boolean/bopfuse_complex/L6
index 97d26ed834c534265f45a8c6dfe0a1ae6182a2cd..e518e68bf31ee47c1d38dc7e9b93af453e6a2699 100644 (file)
--- a/tests/boolean/bopfuse_complex/L6
+++ b/tests/boolean/bopfuse_complex/L6
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore [locate_data_file cq11.brep] c1
+restore [locate_data_file pro15203a.rle] c1
 explode c1 f
 copy c1_1 c1
-restore [locate_data_file cq22.brep] c2
+restore [locate_data_file pro15203d.rle] c2
 
 explode c2 f
 

diff --git a/tests/boolean/bopfuse_complex/M3 b/tests/boolean/bopfuse_complex/M3
index 0ca1a9f94308c2b0b3b42fa7e853e9a7cfd2a3bb..51befa440a568221b17b229344c1cf668e69e53b 100644 (file)
--- a/tests/boolean/bopfuse_complex/M3
+++ b/tests/boolean/bopfuse_complex/M3
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore [locate_data_file pro15203_11.brep] c1
-restore [locate_data_file pro15203_21.brep] c2
+restore [locate_data_file pro15203a.rle] c1
+restore [locate_data_file pro15203c.rle] c2
 
 ########################mod by pkv f
 explode c1 f

diff --git a/tests/boolean/bopfuse_complex/M4 b/tests/boolean/bopfuse_complex/M4
index 4975b52443cf1cb2d19839c6f9478e314c5109ac..7b33645f1427a7f19dd223079ed4c70897fddf37 100644 (file)
--- a/tests/boolean/bopfuse_complex/M4
+++ b/tests/boolean/bopfuse_complex/M4
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore [locate_data_file pro15203_11.brep] c1
-restore [locate_data_file pro15203_22.brep] c2
+restore [locate_data_file pro15203a.rle] c1
+restore [locate_data_file pro15203d.rle] c2
 ########################mod by pkv f
 explode c1 f
 copy c1_1 c1

diff --git a/tests/boolean/bopsection/A6 b/tests/boolean/bopsection/A6
index d7026c1a51507412c0ee79c13744c7dace84dd7f..b70919e65d71465b41deca1c8d23eedb37aa3894 100644 (file)
--- a/tests/boolean/bopsection/A6
+++ b/tests/boolean/bopsection/A6
@@ -2,7 +2,7 @@
 # Date : 19Mai98
 
 restore [locate_data_file CTO904_cts20148a.rle] a
-restore [locate_data_file cts20148b.rle] b
+restore [locate_data_file CTO904_cts20148b.rle] b
 
 bop a b
 bopsection result

diff --git a/tests/boolean/bopsection/A8 b/tests/boolean/bopsection/A8
index 45adecb3ca5e50969ffbdd896a46e85c5bf0edba..e5d79c8f921fb06c73cdd9b378d4dc9520029ae6 100644 (file)
--- a/tests/boolean/bopsection/A8
+++ b/tests/boolean/bopsection/A8
@@ -1,7 +1,7 @@
 # Original bug : buc60093
 # Date : 25Mai98
 
-restore [locate_data_file buc60093a.rle] a
+restore [locate_data_file CTO904_buc60093a.rle] a
 restore [locate_data_file buc60093b.rle] b
 
 bop a b

diff --git a/tests/boolean/bopsection/C7 b/tests/boolean/bopsection/C7
index 8c947ca1cbf58aa729e6178bc30539435bc4dd9e..8f07c8a0006cd59be7701a83d78556c388c2a274 100644 (file)
--- a/tests/boolean/bopsection/C7
+++ b/tests/boolean/bopsection/C7
@@ -1,9 +1,9 @@
 # Original bug : pro15203
 ###########################
-restore [locate_data_file cq11.brep] c1
+restore [locate_data_file pro15203a.rle] c1
 explode c1 f
 copy c1_1 c1
-restore [locate_data_file cq21.brep] c2
+restore [locate_data_file pro15203c.rle] c2
 explode c2 f
 copy c2_1 c2
 

diff --git a/tests/boolean/bopsection/E1 b/tests/boolean/bopsection/E1
index 8f4b4049898f2638e75b20f550eb0c219f3d803b..00a803bca4d40bfc67f854bd24d93083963f80b1 100644 (file)
--- a/tests/boolean/bopsection/E1
+++ b/tests/boolean/bopsection/E1
@@ -2,8 +2,8 @@ puts "PRO15203"
 puts "Fuse"
 puts ""
 
-restore [locate_data_file pro15203_11.brep] c1
-restore [locate_data_file pro15203_21.brep] c2
+restore [locate_data_file pro15203a.rle] c1
+restore [locate_data_file pro15203c.rle] c2
 
 ########################mod by pkv f
 explode c1 f

diff --git a/tests/boolean/boptuc_2d/I8 b/tests/boolean/boptuc_2d/I8
index a822dd2b2ef57ba68a89fcaa0349017b84f4ced7..686bc26f0c4bdaeae09b1387795e6448bf077015 100644 (file)
--- a/tests/boolean/boptuc_2d/I8
+++ b/tests/boolean/boptuc_2d/I8
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 boptuc result
 set length 819.435

diff --git a/tests/boolean/boptuc_2d/I9 b/tests/boolean/boptuc_2d/I9
index 5c623b72c6701ea3dd48a7a780bdc85a2493e02f..685dfdb9bf3f6a860e6d0aad7e64f87217a9ddff 100644 (file)
--- a/tests/boolean/boptuc_2d/I9
+++ b/tests/boolean/boptuc_2d/I9
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_edge2.brep] b
+restore [locate_data_file case_5_edge2.brep] b
 bop a b
 boptuc result
 set length 616.124

diff --git a/tests/boolean/boptuc_2d/J4 b/tests/boolean/boptuc_2d/J4
index 89cf9d3537e0cedb68a02303e3dd48cbf3a00d07..3cbd80a518b563a54e4545ae9675ad04ec2d5501 100644 (file)
--- a/tests/boolean/boptuc_2d/J4
+++ b/tests/boolean/boptuc_2d/J4
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 set length 1450.39

diff --git a/tests/boolean/boptuc_2d/J5 b/tests/boolean/boptuc_2d/J5
index 16b63c661a0c6beab5f7e3039ed11ea1af355b50..970348b07c798b9f4633f6729026ac0214880876 100644 (file)
--- a/tests/boolean/boptuc_2d/J5
+++ b/tests/boolean/boptuc_2d/J5
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_solid.brep] a
-restore [locate_data_file case_6_wire4.brep] b
+restore [locate_data_file case_5_wire4.brep] b
 bop a b
 boptuc result
 set length 929.278

diff --git a/tests/boolean/boptuc_2d/J6 b/tests/boolean/boptuc_2d/J6
index 6c7e3129dcf12d2d6a24ca07f025098a68508a48..d8bab5400970aa2f263b36f0578c9b15b1babed2 100644 (file)
--- a/tests/boolean/boptuc_2d/J6
+++ b/tests/boolean/boptuc_2d/J6
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 boptuc result
 set length 819.435

diff --git a/tests/boolean/boptuc_2d/J9 b/tests/boolean/boptuc_2d/J9
index fe290dffb75eecc993cb5eed6be7888464fde03f..5a7d09d8760b1fa50e8be61134e5678d9255ab00 100644 (file)
--- a/tests/boolean/boptuc_2d/J9
+++ b/tests/boolean/boptuc_2d/J9
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_shell.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 set length 1450.39

diff --git a/tests/boolean/boptuc_2d/K1 b/tests/boolean/boptuc_2d/K1
index 2ecc009d7a2ba04e0a07bb7dfec3112e996f2bce..342443a38a83c75b32a9d7e29db60bec0b482029 100644 (file)
--- a/tests/boolean/boptuc_2d/K1
+++ b/tests/boolean/boptuc_2d/K1
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_edge1.brep] b
+restore [locate_data_file case_4_edge1.brep] b
 bop a b
 boptuc result
 set length 819.435

diff --git a/tests/boolean/boptuc_2d/K4 b/tests/boolean/boptuc_2d/K4
index bfe569510a882c68ae71409cd1701cfccb1139ea..f9caa0c12b9c1dedf60584f9d2eca94dd84ec319 100644 (file)
--- a/tests/boolean/boptuc_2d/K4
+++ b/tests/boolean/boptuc_2d/K4
@@ -1,5 +1,5 @@
 restore [locate_data_file case_6_face.brep] a
-restore [locate_data_file case_6_wire3.brep] b
+restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 set length 1450.39

diff --git a/tests/boolean/bsection/A8 b/tests/boolean/bsection/A8
index f238c3fe41b29b010699df098af69726ba06e05e..97f2c46da2c564d490b1dddcfd5a97703b746874 100644 (file)
--- a/tests/boolean/bsection/A8
+++ b/tests/boolean/bsection/A8
@@ -1,4 +1,4 @@
-restore [locate_data_file a8] a
+restore [locate_data_file CIN001_a8.rle] a
 restore [locate_data_file b8] b
 bsection result a b
 

diff --git a/tests/boolean/bsection/B7 b/tests/boolean/bsection/B7
index 3877d67e2204c1bdc87896698601049b8dec845a..0784031c222d38587fa7a17a469daa539332c78e 100644 (file)
--- a/tests/boolean/bsection/B7
+++ b/tests/boolean/bsection/B7
@@ -1,4 +1,4 @@
-restore [locate_data_file a17] a
+restore [locate_data_file CIN001_a17.rle] a
 restore [locate_data_file b17_bsect] b
 bsection result a b
 

diff --git a/tests/boolean/bsection/C6 b/tests/boolean/bsection/C6
index f637e8d7001de13a43359e76049539227c493721..5e8b6a0bdcae48c9a4dc3ff0dd66fe4ad0be79ab 100644 (file)
--- a/tests/boolean/bsection/C6
+++ b/tests/boolean/bsection/C6
@@ -1,4 +1,4 @@
-restore [locate_data_file a27] a
+restore [locate_data_file a47] a
 restore [locate_data_file b27] b
 bsection result a b
 

diff --git a/tests/bugs/caf/bug23489 b/tests/bugs/caf/bug23489
index a033dfb6d2e57af9e4fd25b5ca5606d998243450..6e72af0af710c2f0dacb17ee3096403733ab9996 100755 (executable)
--- a/tests/bugs/caf/bug23489
+++ b/tests/bugs/caf/bug23489
@@ -2,10 +2,13 @@
 
 pload OCAF
 
+# take some big file to be loaded
+set file [locate_data_file Bottom.brep]
+
 set listmem {}
 for {set i 1} {$i < 10} {incr i} {
     # load big shape
-    restore [locate_data_file bug23489_Bottom.brep] a
+    restore $file a
 
     # add shape to new OCAF document
     NewDocument D MDTV-Standard

diff --git a/tests/bugs/moddata/bug23464_1 b/tests/bugs/moddata/bug23464_1
index a2d82397fab47cd63ae6eeae98e89692843eeedc..4ff15396243ef417441ef8e90cede1053dcd6a35 100755 (executable)
--- a/tests/bugs/moddata/bug23464_1
+++ b/tests/bugs/moddata/bug23464_1
@@ -9,8 +9,8 @@ puts ""
 set int_check 3
 set fract_check 1415927
 
-restore [locate_data_file bug23464_c41.brep] c41
-restore [locate_data_file bug23464_s46.brep] s46
+restore [locate_data_file bug23464_c41.draw] c41
+restore [locate_data_file bug23464_s46.draw] s46
 
 project result c41 s46
 set info [length result]

diff --git a/tests/bugs/moddata/bug23464_2 b/tests/bugs/moddata/bug23464_2
index b73c05d8940639008a466df1a6ce593ac44d2868..2aac097032679a1f492a519b6d25c677f6e92944 100755 (executable)
--- a/tests/bugs/moddata/bug23464_2
+++ b/tests/bugs/moddata/bug23464_2
@@ -9,8 +9,8 @@ puts ""
 set int_check 3
 set fract_check 1415927
 
-restore [locate_data_file bug23464_c50.brep] c50
-restore [locate_data_file bug23464_s37.brep] s37
+restore [locate_data_file bug23464_c50.draw] c50
+restore [locate_data_file bug23464_s37.draw] s37
 
 project result c50 s37
 set info [length result]

diff --git a/tests/bugs/moddata/bug23464_3 b/tests/bugs/moddata/bug23464_3
index 18e31749de18386e1ed6971f490239343397349f..104b8c3173053dd6f883b5379d81630f4c7e0d0d 100755 (executable)
--- a/tests/bugs/moddata/bug23464_3
+++ b/tests/bugs/moddata/bug23464_3
@@ -9,8 +9,8 @@ puts ""
 set int_check 3
 set fract_check 1415927
 
-restore [locate_data_file bug23464_c57.brep] c57
-restore [locate_data_file bug23464_s37.brep] s37
+restore [locate_data_file bug23464_c57.draw] c57
+restore [locate_data_file bug23464_s37.draw] s37
 
 project result c57 s37
 set info [length result]

diff --git a/tests/bugs/moddata/bug23464_4 b/tests/bugs/moddata/bug23464_4
index 9f9c8c95d368fc11f54b088d9019f3b92347b53f..20659972774c6164ed8e5710b17ca8538b0dfe03 100755 (executable)
--- a/tests/bugs/moddata/bug23464_4
+++ b/tests/bugs/moddata/bug23464_4
@@ -9,8 +9,8 @@ puts ""
 set int_check 3
 set fract_check 1415927
 
-restore [locate_data_file bug23464_c58.brep] c58
-restore [locate_data_file bug23464_s37.brep] s37
+restore [locate_data_file bug23464_c58.draw] c58
+restore [locate_data_file bug23464_s37.draw] s37
 
 project result c58 s37
 set info [length result]

diff --git a/tests/bugs/moddata/bug23464_5 b/tests/bugs/moddata/bug23464_5
index 5a37546efe7122e389c2106e2c1ebca7050f37f0..275d6d746f7f05a1f7f800fe66ca7f2d8d3b6296 100755 (executable)
--- a/tests/bugs/moddata/bug23464_5
+++ b/tests/bugs/moddata/bug23464_5
@@ -9,8 +9,8 @@ puts ""
 set int_check 3
 set fract_check 1415927
 
-restore [locate_data_file bug23464_c57.brep] c57
-restore [locate_data_file bug23464_s46.brep] s46
+restore [locate_data_file bug23464_c57.draw] c57
+restore [locate_data_file bug23464_s46.draw] s46
 
 project result c57 s46
 set info [length result]

diff --git a/tests/bugs/moddata/bug23464_6 b/tests/bugs/moddata/bug23464_6
index a39a8e6e7b67e60c30688f5079a8158e27bf570e..6e6990a84f13c0ecb738f432d4664296287c6b64 100755 (executable)
--- a/tests/bugs/moddata/bug23464_6
+++ b/tests/bugs/moddata/bug23464_6
@@ -9,8 +9,8 @@ puts ""
 set int_check 3
 set fract_check 1415927
 
-restore [locate_data_file bug23464_c58.brep] c58
-restore [locate_data_file bug23464_s46.brep] s46
+restore [locate_data_file bug23464_c58.draw] c58
+restore [locate_data_file bug23464_s46.draw] s46
 
 project result c58 s46
 set info [length result]

diff --git a/tests/bugs/vis/CR23407_1 b/tests/bugs/vis/CR23407_1
index bd4e2dbe6ee3a2b4ecc22bd6b2e1e46745701ae4..92604ba62c697511207bba566ec7fada5901df97 100755 (executable)
--- a/tests/bugs/vis/CR23407_1
+++ b/tests/bugs/vis/CR23407_1
@@ -19,7 +19,7 @@ set x3 244
 set y3 89
 
 XNewDoc Doc1
-ReadStep Doc1 [locate_data_file CR23407-screw.step]
+ReadStep Doc1 [locate_data_file screw.step]
 XShow Doc1 0:1:1:1
 XShowFaceBoundary Doc1 0:1:1:1 1 255 0 0 10 1
 vfit

diff --git a/tests/chamfer/data/complex/A4 b/tests/chamfer/data/complex/A4
index dc3bd53f06af4434d08b7a3cdb59e8cd2f6e5851..29a194d522a421a86535c653d7045b873c73dc40 100644 (file)
--- a/tests/chamfer/data/complex/A4
+++ b/tests/chamfer/data/complex/A4
@@ -1,4 +1,4 @@
-set chamf_shape test-fillet.mod
+set chamf_shape test-fillet.brep
 set chamf_edge_face  [list "  31   13" "   8    9" "   5    1" "  19    6" "  22   13" "  20   11" "  36   11" "  37   11"]
 set chamf_dist_angle [list "0.03   60" "0.02   60" "0.05   30" "0.01   60" "0.05   30" "0.03   60" "0.03   30" "0.03   30"]
 set chamf_dist_dist  [list "0.03 0.04" "0.02 0.04" "0.05 0.02" "0.01 0.03" "0.05 0.04" "0.03 0.05" "0.03 0.02" "0.03 0.02"]

diff --git a/tests/chamfer/data/complex/A5 b/tests/chamfer/data/complex/A5
index 4b965c44526dbd45cfb4ca910912b3773ce5ef0d..11a4e86a577c208fc3906c0f4911059e7ef67d3b 100644 (file)
--- a/tests/chamfer/data/complex/A5
+++ b/tests/chamfer/data/complex/A5
@@ -1,4 +1,4 @@
-set chamf_shape test-fillet.mod
+set chamf_shape test-fillet.brep
 set chamf_edge_face  [list "  31   13" "   8    9" "   5    1" "  19    6" "  22   13" "  20   11" "  36   11" "  37   11" "   6    1" "  23    9" "  38   13" "  21    7" "  17    6" "   7    1" "  24    9" "  18    6" "  27   11"]
 set chamf_dist_angle [list "0.03   60" "0.05   30" "0.05   30" "0.03   45" "0.05   30" "0.03   60" "0.03   30" "0.03   30" "0.05   30" "0.06   30" "0.02   60" "0.03   45" "0.04   45" "0.05   30" "0.05   30" "0.04   30" "0.03   60"]
 set chamf_dist_dist  [list "0.03 0.04" "0.05 0.04" "0.05 0.02" "0.03 0.03" "0.05 0.04" "0.03 0.05" "0.03 0.02" "0.03 0.02" "0.05 0.04" "0.06 0.03" "0.02 0.04" "0.03 0.03" "0.04 0.04" "0.05 0.04" "0.05 0.02" "0.04 0.03" "0.03 0.06"]

diff --git a/tests/chamfer/data/simple/A3 b/tests/chamfer/data/simple/A3
index 175f0d17fb006a9f3b4dc5baa308695fff6d2935..76a1cecdfe71b1126549aeeb66c2b999eedc2530 100644 (file)
--- a/tests/chamfer/data/simple/A3
+++ b/tests/chamfer/data/simple/A3
@@ -1,4 +1,4 @@
-set chamf_shape test-fillet.mod
+set chamf_shape test-fillet.brep
 set chamf_edge_face  [list "  31   13" "   8    9" "   5    1" "  19    6" "  42   16"]
 set chamf_dist_angle [list "0.03   60" "0.02   60" "0.05   30" "0.01   60" "0.02   60"]
 set chamf_dist_dist  [list "0.03 0.04" "0.02 0.04" "0.05 0.02" "0.01 0.03" "0.02 0.03"]

diff --git a/tests/heal/data/advanced/R2 b/tests/heal/data/advanced/R2
index 5983afd0f32f98db7fae09ebed1e9e18de2f4dbe..1d2974cee7ce083dba40f7a928281f59cb730fc3 100644 (file)
--- a/tests/heal/data/advanced/R2
+++ b/tests/heal/data/advanced/R2
@@ -1,5 +1,5 @@
 if {[string compare $command "SplitAngle"] == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
 }
-restore [locate_data_file topo108-o.brep] a
+restore [locate_data_file CTO908_topo108-o.brep] a
 

diff --git a/tests/heal/data/advanced/R3 b/tests/heal/data/advanced/R3
index b2360fca0b1bc7ca0f1bb1e361ee59b863dede11..e6b7a8ea16f847f8611b7ecdc1ae8bf40fd14e42 100644 (file)
--- a/tests/heal/data/advanced/R3
+++ b/tests/heal/data/advanced/R3
@@ -1,2 +1,2 @@
-restore [locate_data_file topo108.brep] a
+restore [locate_data_file CTO908_topo108.brep] a
 

diff --git a/tests/heal/data/standard/D7 b/tests/heal/data/standard/D7
index 72df9865a9d377f7b39fe352a68f9285ff5b4fab..936ca7862d72209d92bd0ca87fe1b703612a307d 100644 (file)
--- a/tests/heal/data/standard/D7
+++ b/tests/heal/data/standard/D7
@@ -1,2 +1,2 @@
-restore [locate_data_file BUC60392.rle] a
+restore [locate_data_file mal_vis.brep] a
 

diff --git a/tests/heal/data/standard/E4 b/tests/heal/data/standard/E4
index b7de1653d11c71e2eb54becc67a7f80f48b1f1a3..1e6fc40050c3d13e8df1467283c0e741f64ad0ba 100644 (file)
--- a/tests/heal/data/standard/E4
+++ b/tests/heal/data/standard/E4
@@ -1,2 +1,2 @@
-restore [locate_data_file Connection.rle] a
+restore [locate_data_file mal_tige.brep] a
 

diff --git a/tests/heal/data/standard/F4 b/tests/heal/data/standard/F4
index e8a3a03aa1783f235f5340d793b5cce3654d6835..80999233a5c61900c5abcb9580388bbae0441375 100644 (file)
--- a/tests/heal/data/standard/F4
+++ b/tests/heal/data/standard/F4
@@ -1,2 +1,2 @@
-restore [locate_data_file cts16184b.shape] a
+restore [locate_data_file cts16184b.brep] a
 

diff --git a/tests/heal/data/standard/L4 b/tests/heal/data/standard/L4
index 6c702dc6fe71e186e5d0ebdfe30c208b7af0b597..391b60ac5a7fdf0a0f109768f70196bcb5d50601 100644 (file)
--- a/tests/heal/data/standard/L4
+++ b/tests/heal/data/standard/L4
@@ -1,2 +1,2 @@
-restore [locate_data_file ger60039a.shape] a
+restore [locate_data_file ger60039a.brep] a
 

diff --git a/tests/heal/data/standard/R4 b/tests/heal/data/standard/R4
index 571baf2c0639edfafe8e82403c2c8427918c9616..2060cdcb683dc02f96221eb053f8285c332f73bb 100644 (file)
--- a/tests/heal/data/standard/R4
+++ b/tests/heal/data/standard/R4
@@ -1,2 +1,2 @@
-restore [locate_data_file pro5363axe.shape] a
+restore [locate_data_file pro5363axe.brep] a
 

diff --git a/tests/heal/data/standard/R7 b/tests/heal/data/standard/R7
index 6d627b59d1d12a7384546bf747ee78a5ae87a7a5..aac0c2d7979be2ed7637eff1caed3301f4c0917c 100644 (file)
--- a/tests/heal/data/standard/R7
+++ b/tests/heal/data/standard/R7
@@ -1,2 +1,2 @@
-restore [locate_data_file pro5363oblong.shape] a
+restore [locate_data_file pro5363oblong.brep] a
 

diff --git a/tests/heal/data/standard/R8 b/tests/heal/data/standard/R8
index e82fd270eb91767b0a39592b545be8d8168549ae..ae257278c634a3795c0410dd74109b1c20289f58 100644 (file)
--- a/tests/heal/data/standard/R8
+++ b/tests/heal/data/standard/R8
@@ -1,2 +1,2 @@
-restore [locate_data_file pro5557_bsurf.shape] a
+restore [locate_data_file pro5557_bsurf.brep] a
 

diff --git a/tests/heal/data/standard/R9 b/tests/heal/data/standard/R9
index 03fa03a20eeabdcbf2f74efbac5729e935317b8a..54d415a057d1597cc0850eaa89a42576699a3c8b 100644 (file)
--- a/tests/heal/data/standard/R9
+++ b/tests/heal/data/standard/R9
@@ -1,2 +1,2 @@
-restore [locate_data_file pro5557_revol.shape] a
+restore [locate_data_file pro5557_revol.brep] a
 

diff --git a/tests/heal/data/standard/T1 b/tests/heal/data/standard/T1
index 1daaa0269e10014f4e1ef7cd69347485bb9863e0..a08140580c54eb253532393958dbca04b73384e5 100644 (file)
--- a/tests/heal/data/standard/T1
+++ b/tests/heal/data/standard/T1
@@ -1,2 +1,2 @@
-restore [locate_data_file pro6110a.rle] a
+restore [locate_data_file CTO900_pro6110a.rle] a
 

diff --git a/tests/heal/data/standard/V6 b/tests/heal/data/standard/V6
index a40c9475ce2d1aad4f5ae694a08a1197aa7086c5..81e7f4ed102bb8ab48a3d5241613688147c89e98 100644 (file)
--- a/tests/heal/data/standard/V6
+++ b/tests/heal/data/standard/V6
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20171_base] a
+restore [locate_data_file CTO901_cts20171_base.rle] a
 

diff --git a/tests/heal/data/standard/W1 b/tests/heal/data/standard/W1
index 3f3bb37c101f805b60385a751c531a95dd7fd0c6..28d30ce212fd5942b925792e6461bb5e610b4179 100644 (file)
--- a/tests/heal/data/standard/W1
+++ b/tests/heal/data/standard/W1
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20203_outil] a
+restore [locate_data_file CTO901_cts20203_outil.rle] a
 

diff --git a/tests/heal/data/standard/ZA9 b/tests/heal/data/standard/ZA9
index bcabd9f51d2dc92663b5d18cf7d12604f9dcba83..71f17a5a4b9fda9c05322f8a112a6218665d9fa4 100644 (file)
--- a/tests/heal/data/standard/ZA9
+++ b/tests/heal/data/standard/ZA9
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20486a.rle] a
+restore [locate_data_file CTO902_cts20486a.rle] a
 

diff --git a/tests/heal/data/standard/ZE2 b/tests/heal/data/standard/ZE2
index e034aea0e5222d430f3e00099e546c426ffb8cbe..1402d92a8d6101804dad2f137aa3e8ed71204eaf 100644 (file)
--- a/tests/heal/data/standard/ZE2
+++ b/tests/heal/data/standard/ZE2
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20525-part.rle] a
+restore [locate_data_file CTO902_cts20525-part.rle] a
 

diff --git a/tests/heal/data/standard/ZE3 b/tests/heal/data/standard/ZE3
index 363305d01e742026ebba0c1112b7bec0af2ec378..25d01a3203b4bb1d0a041998e519e90e6d7e71e6 100644 (file)
--- a/tests/heal/data/standard/ZE3
+++ b/tests/heal/data/standard/ZE3
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20525-tool.rle] a
+restore [locate_data_file CTO902_cts20525-tool.rle] a
 

diff --git a/tests/heal/data/standard/ZE8 b/tests/heal/data/standard/ZE8
index f39259733a514342c4d20b5d8ee32849cd6fabf3..5d3b8e241c60c4c09e0a967404aa8b6c350e8ec6 100644 (file)
--- a/tests/heal/data/standard/ZE8
+++ b/tests/heal/data/standard/ZE8
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20529a.rle] a
+restore [locate_data_file CTO902_cts20529a.rle] a
 

diff --git a/tests/heal/data/standard/ZF1 b/tests/heal/data/standard/ZF1
index 66d174f7c6e2b9b02c54c1f6524657b88e76a476..21c41632887ff41a09e7806abf562e63db9d084d 100644 (file)
--- a/tests/heal/data/standard/ZF1
+++ b/tests/heal/data/standard/ZF1
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20535a.rle] a
+restore [locate_data_file CTO902_cts20535a.rle] a
 

diff --git a/tests/heal/data/standard/ZG3 b/tests/heal/data/standard/ZG3
index 27852b9f5c674dd126da629ae2b688c8f8133c59..b9ebd8ad60bca69a3683e0f6ac674b8244259fe8 100644 (file)
--- a/tests/heal/data/standard/ZG3
+++ b/tests/heal/data/standard/ZG3
@@ -1,2 +1,2 @@
-restore [locate_data_file buc60093a.rle] a
+restore [locate_data_file CTO904_buc60093a.rle] a
 

diff --git a/tests/heal/data/standard/ZG5 b/tests/heal/data/standard/ZG5
index 21315f08f1b905a0599063e18f179df4a87f79b0..428cc28cecb9187ceb8341ee78cd48243d4ad782 100644 (file)
--- a/tests/heal/data/standard/ZG5
+++ b/tests/heal/data/standard/ZG5
@@ -1,2 +1,2 @@
-restore [locate_data_file buc60116a.rle] a
+restore [locate_data_file CTO904_buc60116a.rle] a
 

diff --git a/tests/heal/data/standard/ZH8 b/tests/heal/data/standard/ZH8
index 21fde95cdb921eea914fe66bf341f2054b1cca42..ce384d83ab4dad88a1f26595c83e013fe02b942f 100644 (file)
--- a/tests/heal/data/standard/ZH8
+++ b/tests/heal/data/standard/ZH8
@@ -1,2 +1,2 @@
-restore [locate_data_file cts20148b.rle] a
+restore [locate_data_file CTO904_cts20148b.rle] a
 

diff --git a/tests/heal/data/standard/ZX4 b/tests/heal/data/standard/ZX4
index 9592a5742215416e1108365a5e2b81308b8a765b..513c0a0d2c746ec00632df7f741a3a831c546430 100644 (file)
--- a/tests/heal/data/standard/ZX4
+++ b/tests/heal/data/standard/ZX4
@@ -1,2 +1,2 @@
-restore [locate_data_file boitecfe002.rle] a
+restore [locate_data_file pro16389a.rle] a
 

diff --git a/tests/mesh/data/advanced/A8 b/tests/mesh/data/advanced/A8
index d41adf0a3bf6c52b74a392ee0dbf33bf4bf01804..4519520099ae6da561f5a7f72596956435d265d0 100755 (executable)
--- a/tests/mesh/data/advanced/A8
+++ b/tests/mesh/data/advanced/A8
@@ -1 +1 @@
-set TheFileName OCC22086-linkrods.step
+set TheFileName linkrods.step

diff --git a/tests/offset/shape_type_a/A4 b/tests/offset/shape_type_a/A4
index e5c7918b993f420c0671581f614364c7b049aaee..f44934c2bf432a125c35ab0dcc4e69bae44fe103 100644 (file)
--- a/tests/offset/shape_type_a/A4
+++ b/tests/offset/shape_type_a/A4
@@ -1,6 +1,6 @@
 #old file ofs9
 
-restore [locate_data_file bb9] s
+restore [locate_data_file CHE_bb9.rle] s
 OFFSETSHAPE -0.1 {} $calcul $type
 
 set volume 24.6541

diff --git a/tests/offset/shape_type_a/B2 b/tests/offset/shape_type_a/B2
index a3783b798f92b2a13413928589158e34cf8fdef8..08288cab8e20092c420ee1de0d8065fc78ded47c 100644 (file)
--- a/tests/offset/shape_type_a/B2
+++ b/tests/offset/shape_type_a/B2
@@ -1,6 +1,6 @@
 #old file ofsc9
 
-restore [locate_data_file bb9] s
+restore [locate_data_file CHE_bb9.rle] s
 OFFSETSHAPE 0.8 {} $calcul $type
 
 set volume 100.616

diff --git a/tests/offset/shape_type_a/B6 b/tests/offset/shape_type_a/B6
index 96609a5b800f75b04096bb028fb653796a5c3be7..a01713a0fc3f2a5b4f131a1a33d663c6d5fc48dd 100644 (file)
--- a/tests/offset/shape_type_a/B6
+++ b/tests/offset/shape_type_a/B6
@@ -1,6 +1,6 @@
 #old file ofs9 part two
 
-restore [locate_data_file bb9] s
+restore [locate_data_file CHE_bb9.rle] s
 OFFSETSHAPE 0.1 {} $calcul $type
 
 set volume 36.8614

diff --git a/tests/sewing/tol_0_01/A6 b/tests/sewing/tol_0_01/A6
index 1d282bb1d8596d4647335dc87d9a483118eafddd..2a2a627ff3bbb19a54a27ead1cc4f9693e6a0db6 100644 (file)
--- a/tests/sewing/tol_0_01/A6
+++ b/tests/sewing/tol_0_01/A6
@@ -1 +1 @@
-restore [locate_data_file BUC60392.rle] a
+restore [locate_data_file mal_vis.brep] a

diff --git a/tests/sewing/tol_0_01/L3 b/tests/sewing/tol_0_01/L3
index 084d184f60cfb463a17063f0291034875e109808..c61a85d98945fdc7854b516c98c2965c56e1808b 100644 (file)
--- a/tests/sewing/tol_0_01/L3
+++ b/tests/sewing/tol_0_01/L3
@@ -1 +1 @@
-restore [locate_data_file CFE900_cts20gal.rle] a
+restore [locate_data_file cts20170_base.rle] a

diff --git a/tests/sewing/tol_0_01/O4 b/tests/sewing/tol_0_01/O4
index 2c75ff58c1fc7695c03e6506c619c6fce5220eff..b45102519978567f79d01d264b1b2271281682d1 100644 (file)
--- a/tests/sewing/tol_0_01/O4
+++ b/tests/sewing/tol_0_01/O4
@@ -1 +1 @@
-restore [locate_data_file CFE900_cts20gej.rle] a
+restore [locate_data_file cts20721_base.brep] a

diff --git a/tests/sewing/tol_1/Z8 b/tests/sewing/tol_1/Z8
index 8c7b8618e1852df4f9887db221c056a7c9ca9ef3..cc2f2913524bfee7e7ff4c5d65b930bdd0c0c72b 100644 (file)
--- a/tests/sewing/tol_1/Z8
+++ b/tests/sewing/tol_1/Z8
@@ -1 +1 @@
-restore [locate_data_file CTO902_cts20552a.rle] a
+restore [locate_data_file cts20552-part.rle] a

diff --git a/tests/xcaf/igs_to_dxc/E6 b/tests/xcaf/igs_to_dxc/E6
index ec814b1c8fa6d3b3548cbf7db4ce4e7692000c9e..e0ac7a127610f82c588fdeb3c5d15b892c0ea8aa 100644 (file)
--- a/tests/xcaf/igs_to_dxc/E6
+++ b/tests/xcaf/igs_to_dxc/E6
@@ -1,4 +1,4 @@
-ReadIges D_First [locate_data_file hammer.igs]
+ReadIges D_First [locate_data_file hammer.iges]
 set TypeOfFile ""
 set AddToDocument ""
 set CompareDocumentsMode "ALL CHECKSHAPE"