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 41ed8e3..7aeaa81 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 909d63d..0735485 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 d661067..e443d96 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 f16a089..7563677 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 c98e655..e50efe5 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 2aa7864..7176688 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 e05eae4..61977f5 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 40ae189..c2713d2 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 a98fc36..6e35afa 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 bab937c..17d0034 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 b2d0658..e2ed844 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 dfed15e..4f11b0d 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 9796d37..50fdc83 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 0a484c9..6c257e7 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 be2f0a7..41c5bb5 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 ed9744c..03f132c 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 da9fe15..d7c25ab 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 d56b5c4..60fea88 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 17d49ad..1e0fc26 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 6b7bb70..ad97099 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 8fb703a..7d5ae76 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 8403b9b..1e0d992 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 3dc2657..ad6aa95 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 1a78313..622bdb7 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 73675f4..13f2dc7 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 2969942..e68d2e3 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 4890438..dab5c8e 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 b93fe3c..7b87dd0 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 94f5e3a..75a100c 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 d1b9ab2..aa0d703 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 108b9a6..d0e2ae2 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 1cc056b..bba6879 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 49f6a5f..eef1bbf 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 a1fe59b..40aeff3 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 39be578..c2b7c70 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 2e7a5d5..c39923f 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 7d75e96..fe50523 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 90c99cf..04eae52 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 db0e381..f1942b9 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 f197602..7942790 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 fccc7c7..e3ab01f 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 8230050..b27e30a 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 3177502..399382d 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 82122f2..ff2def1 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 626108f..b2e6592 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 6ebf88d..e16dc26 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 51a0c8c..0a18f97 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 1ed8fee..d70eac7 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 bab2cb1..a8774ed 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 6f248d4..70c62af 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 1971eae..21d6827 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 9824664..4e6e372 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 2d3f9d4..7a63844 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 95efd65..105b002 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 167e387..aa594e6 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 e221b6c..fd85ae8 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 285ddae..c0ef61a 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 1be572e..fb2efa8 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 9d56528..f3f0fbb 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 b5254a6..3793c2b 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 4bed6e2..51888d2 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 d699e9e..0311ff8 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 75357e3..4880573 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 7073403..a29e045 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 dd0dea0..6e4f796 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 97d26ed..e518e68 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 0ca1a9f..51befa4 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 4975b52..7b33645 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 d7026c1..b70919e 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 45adecb..e5d79c8 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 8c947ca..8f07c8a 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 8f4b404..00a803b 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 a822dd2..686bc26 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 5c623b7..685dfdb 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 89cf9d3..3cbd80a 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 16b63c6..970348b 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 6c7e312..d8bab54 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 fe290df..5a7d09d 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 2ecc009..342443a 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 bfe5695..f9caa0c 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 f238c3f..97f2c46 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 3877d67..0784031 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 f637e8d..5e8b6a0 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 a033dfb..6e72af0 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 a2d8239..4ff1539 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 b73c05d..2aac097 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 18e3174..104b8c3 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 9f9c8c9..2065997 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 5a37546..275d6d7 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 a39a8e6..6e6990a 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 bd4e2db..92604ba 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 dc3bd53..29a194d 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 4b965c4..11a4e86 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 175f0d1..76a1cec 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 5983afd..1d2974c 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 b2360fc..e6b7a8e 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 72df986..936ca78 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 b7de165..1e6fc40 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 e8a3a03..8099923 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 6c702dc..391b60a 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 571baf2..2060cdc 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 6d627b5..aac0c2d 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 e82fd27..ae25727 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 03fa03a..54d415a 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 1daaa02..a081405 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 a40c947..81e7f4e 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 3f3bb37..28d30ce 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 bcabd9f..71f17a5 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 e034aea..1402d92 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 363305d..25d01a3 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 f392597..5d3b8e2 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 66d174f..21c4163 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 27852b9..b9ebd8a 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 21315f0..428cc28 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 21fde95..ce384d8 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 9592a57..513c0a0 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 d41adf0..4519520 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 e5c7918..f44934c 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 a3783b7..08288ca 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 96609a5..a01713a 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 1d282bb..2a2a627 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 084d184..c61a85d 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 2c75ff5..b451025 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 8c7b861..cc2f291 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 ec814b1..e0ac7a1 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"