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.

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" }
+    }
+}

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

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

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

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
 

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

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

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

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 

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 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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
 

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 
 

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

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

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
 

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

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

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

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
 

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
 

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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
 

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

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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
 

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
 

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
 

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

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]

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]

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]

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]

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]

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]

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

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"]

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"]

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"]

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
 

tests/heal/data/advanced/R3

@@ -1,2 +1,2 @@
-restore [locate_data_file topo108.brep] a
+restore [locate_data_file CTO908_topo108.brep] a
 

tests/heal/data/standard/D7

@@ -1,2 +1,2 @@
-restore [locate_data_file BUC60392.rle] a
+restore [locate_data_file mal_vis.brep] a
 

tests/heal/data/standard/E4

@@ -1,2 +1,2 @@
-restore [locate_data_file Connection.rle] a
+restore [locate_data_file mal_tige.brep] a
 

tests/heal/data/standard/F4

@@ -1,2 +1,2 @@
-restore [locate_data_file cts16184b.shape] a
+restore [locate_data_file cts16184b.brep] a
 

tests/heal/data/standard/L4

@@ -1,2 +1,2 @@
-restore [locate_data_file ger60039a.shape] a
+restore [locate_data_file ger60039a.brep] a