From dd8e065f5fd5cb8a697c597086df102a9b037f50 Mon Sep 17 00:00:00 2001 From: kgv Date: Sat, 21 Sep 2019 15:04:16 +0300 Subject: [PATCH] # update test cases --- tests/bugs/vis/bug25136 | 4 ++-- tests/bugs/vis/bug25459_coloredshape | 2 +- tests/bugs/vis/bug25544_graytexture | 4 ++-- tests/bugs/vis/bug25723 | 2 +- tests/bugs/vis/bug25723_1 | 2 +- tests/bugs/vis/bug26680 | 4 ++-- tests/bugs/vis/bug26719_1 | 4 ++-- tests/bugs/vis/bug27083 | 4 ++-- tests/bugs/vis/bug27836 | 2 +- tests/bugs/vis/bug28004 | 8 ++++---- tests/bugs/vis/bug29791 | 8 ++++---- tests/bugs/xde/bug25381 | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/bugs/vis/bug25136 b/tests/bugs/vis/bug25136 index 9a49851e41..10c214b382 100644 --- a/tests/bugs/vis/bug25136 +++ b/tests/bugs/vis/bug25136 @@ -10,7 +10,7 @@ vaxo # create default color scale vcolorscale cs1 -demo -xy 0 0 -foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 SPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 MEDIUMSPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } # reduce color scale range and number of intervals vcolorscale cs2 -range 0 20 5 -xy 60 0 @@ -26,5 +26,5 @@ vcolorscale cs4 -color 1 0.42 0.35 0.8 vcolorscale cs4 -color 5 pink vcolorscale cs4 -label 6 "last" vcolorscale cs4 -title "My color scale" -foreach {y aColor} {60 PINK 120 RED 200 GREEN 280 BLUE 350 MEDIUMPURPLE2} { if { [vreadpixel 215 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {60 PINK 120 RED 200 GREEN 280 BLUE 350 LIGHTSTEELBLUE3} { if { [vreadpixel 215 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25459_coloredshape b/tests/bugs/vis/bug25459_coloredshape index b61ffe4030..92f08d5c25 100644 --- a/tests/bugs/vis/bug25459_coloredshape +++ b/tests/bugs/vis/bug25459_coloredshape @@ -18,4 +18,4 @@ vaspects b -subshapes b_3 -setcolor RED vaspects b -setmaterial PLASTIC # validate results -if { [vreadpixel 128 256 -rgb -name] != "BROWN"} { puts "Error: wrong Face color" } +if { [vreadpixel 128 256 -rgb -name] != "RED4"} { puts "Error: wrong Face color" } diff --git a/tests/bugs/vis/bug25544_graytexture b/tests/bugs/vis/bug25544_graytexture index 42794caf19..e7c3574cf4 100644 --- a/tests/bugs/vis/bug25544_graytexture +++ b/tests/bugs/vis/bug25544_graytexture @@ -19,5 +19,5 @@ vtexture b 1 -modulate off set aColorDec [vreadpixel 290 180 rgb name] vdump $imagedir/${casename}_decal.png -if {"$aColorMod" != "GOLD4"} { puts "Error: wrong color with modulation ON" } -if {"$aColorDec" != "GRAY91"} { puts "Error: wrong color with modulation OFF" } +if {"$aColorMod" != "GOLDENROD4"} { puts "Error: wrong color with modulation ON" } +if {"$aColorDec" != "GRAY91"} { puts "Error: wrong color with modulation OFF" } diff --git a/tests/bugs/vis/bug25723 b/tests/bugs/vis/bug25723 index 886f7b7488..350791245e 100644 --- a/tests/bugs/vis/bug25723 +++ b/tests/bugs/vis/bug25723 @@ -24,6 +24,6 @@ verase # rotation vrotate -mouseStart 100 100 -mouseMove 300 300 -if {"[vreadpixel 220 50 rgb name]" != "DARKGOLDENROD3"} { puts "Error: Rotation is not correct" } +if {"[vreadpixel 220 50 rgb name]" != "GOLDENROD3"} { puts "Error: Rotation is not correct" } vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25723_1 b/tests/bugs/vis/bug25723_1 index 27a0d59dfc..ff7fc15b08 100644 --- a/tests/bugs/vis/bug25723_1 +++ b/tests/bugs/vis/bug25723_1 @@ -41,6 +41,6 @@ vrotate -mouseStart ${x_mouse_start_coord} ${y_mouse_start_coord} -mouseMove ${x vselect 0 0 # check color -if {"[vreadpixel ${x_check_coord} ${y_check_coord} rgb name]" != "DARKGOLDENROD3"} { puts "Error : Rotation is not correct" } +if {"[vreadpixel ${x_check_coord} ${y_check_coord} rgb name]" != "GOLDENROD3"} { puts "Error : Rotation is not correct" } vdump ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug26680 b/tests/bugs/vis/bug26680 index 9597089692..fd5baac2c2 100644 --- a/tests/bugs/vis/bug26680 +++ b/tests/bugs/vis/bug26680 @@ -1,5 +1,5 @@ puts "============" -puts "0026680: Visualization - Changed behavior of mesh visualization and selection in OMF sample"" +puts "0026680: Visualization - Changed behavior of mesh visualization and selection in OMF sample" puts "============" puts "" @@ -17,7 +17,7 @@ vmoveto 0 0 if {[vreadpixel 197 257 rgb name] != "BLUE"} { puts "ERROR: the object is not unhighlighted after dynamic highlight!" } vselect 200 200 -if {[vreadpixel 197 257 rgb name] != "GRAY86"} { puts "ERROR: presentation for selection highlight is wrong!" } +if {[vreadpixel 197 257 rgb name] != "GRAY85"} { puts "ERROR: presentation for selection highlight is wrong!" } vselect 0 0 if {[vreadpixel 197 257 rgb name] != "BLUE"} { puts "ERROR: the object is not unhighlighted after selection highlight!" } diff --git a/tests/bugs/vis/bug26719_1 b/tests/bugs/vis/bug26719_1 index de4670fa41..0553f689b9 100644 --- a/tests/bugs/vis/bug26719_1 +++ b/tests/bugs/vis/bug26719_1 @@ -21,8 +21,8 @@ vviewparams -eye 0.7 -1.14 -0.17 # with dynamic highlight color, check that the face is # not highlighted vmoveto 280 290 -if {[vreadpixel 297 297 -rgb -name] != "CYAN"} { puts "ERROR: zoom persistent box is not highlighted dynamically!" } -if {[vreadpixel 372 210 -rgb -name] != "DARKGOLDENROD3"} { puts "ERROR: the shape behind zoom persistent object was highlighted instead!" } +if {[vreadpixel 297 297 -rgb -name] != "CYAN"} { puts "ERROR: zoom persistent box is not highlighted dynamically!" } +if {[vreadpixel 372 210 -rgb -name] != "GOLDENROD3"} { puts "ERROR: the shape behind zoom persistent object was highlighted instead!" } vdump ${imagedir}/${casename}_1.png vmoveto 0 0 diff --git a/tests/bugs/vis/bug27083 b/tests/bugs/vis/bug27083 index d52a22783d..1faa5f9c93 100644 --- a/tests/bugs/vis/bug27083 +++ b/tests/bugs/vis/bug27083 @@ -15,7 +15,7 @@ vfit vaspects b -setFaceBoundaryDraw 1 -setFaceBoundaryColor RED -setFaceBoundaryWidth 3 vraytrace 1 -if {[vreadpixel 295 255 -rgb -name] != "SIENNA"} { puts "ERROR: the box with boundary aspect set is not shown in ray-tracing mode!" } -if {[vreadpixel 105 58 -rgb -name] != "RED"} { puts "ERROR: the box's boundaries are not shown in ray-tracing mode!" } +if {[vreadpixel 295 255 -rgb -name] != "DARKGOLDENROD"} { puts "ERROR: the box with boundary aspect set is not shown in ray-tracing mode!" } +if {[vreadpixel 105 58 -rgb -name] != "RED"} { puts "ERROR: the box's boundaries are not shown in ray-tracing mode!" } vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27836 b/tests/bugs/vis/bug27836 index bd3a54ffe8..a2a33bbf4a 100644 --- a/tests/bugs/vis/bug27836 +++ b/tests/bugs/vis/bug27836 @@ -19,6 +19,6 @@ vfit vviewparams -scale 6.66 -eye 48 43 -210 -at 50 45 -95 -if { [vreadpixel 100 300 -rgb -name] != "LIGHTSTEELBLUE3" } { puts "Error: gradient background is not displayed" } +if { [vreadpixel 100 300 -rgb -name] != "GRAY74" } { puts "Error: gradient background is not displayed" } vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug28004 b/tests/bugs/vis/bug28004 index 0b86f8dda6..b3a8bca31f 100644 --- a/tests/bugs/vis/bug28004 +++ b/tests/bugs/vis/bug28004 @@ -11,8 +11,8 @@ vaxo # create default color scale vcolorscale cs1 -demo -smooth 0 -xy 0 0 vcolorscale cs2 -demo -smooth 1 -xy 60 0 -foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 SPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } -foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 SPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 MEDIUMSPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 MEDIUMSPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } # reduce color scale range and number of intervals vcolorscale cs3 -range 0 20 5 -font 16 -colors white 0 0 1 green 1 0 0 1 1 1 -labels start 1 2 3 4 end -smooth 0 -xy 120 0 @@ -22,8 +22,8 @@ foreach {y aColor} {40 WHITE 120 RED 200 GREEN 280 BLUE 350 WHITE} { if { [vread # color scale with overridden hue range vcolorscale cs5 -demo -smooth 0 -hueRange 300 130 -xy 240 0 vcolorscale cs6 -demo -smooth 1 -hueRange 300 130 -xy 300 0 -foreach {y aColor} {20 GREEN 60 SPRINGGREEN 100 AQUAMARINE1 140 TURQUOISE1 180 DODGERBLUE1 220 BLUE 250 BLUE 290 BLUE 330 PURPLE1 370 MAGENTA} { if { [vreadpixel 245 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } -foreach {y aColor} {20 GREEN 60 MEDIUMSPRINGGREEN 100 AQUAMARINE1 140 TURQUOISE2 180 DEEPSKYBLUE2 220 ROYALBLUE1 250 BLUE 290 BLUE 330 PURPLE1 370 MEDIUMORCHID1} { if { [vreadpixel 315 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {20 GREEN 60 SPRINGGREEN 100 CYAN2 140 TURQUOISE2 180 DODGERBLUE1 220 BLUE 250 BLUE 290 BLUEVIOLET 330 PURPLE 370 MAGENTA} { if { [vreadpixel 245 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {20 GREEN 60 MEDIUMSPRINGGREEN 100 CYAN2 140 TURQUOISE2 180 DEEPSKYBLUE2 220 DODGERBLUE2 250 ROYALBLUE2 290 PURPLE3 330 PURPLE 370 MAGENTA2} { if { [vreadpixel 315 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } # free labels vcolorscale cs7 -demo -smooth 0 -colorRange BLACK WHITE -xy 360 0 -freeLabels 3 l1 l2 l3 diff --git a/tests/bugs/vis/bug29791 b/tests/bugs/vis/bug29791 index 40fc1a2eb6..fd3cb5bf27 100644 --- a/tests/bugs/vis/bug29791 +++ b/tests/bugs/vis/bug29791 @@ -18,8 +18,8 @@ vfit vmoveto 150 200 vstate -entities vselect 150 200 -if { [vreadpixel 150 200 rgb name] != "BLACK" } { puts "Error: object is not clipped" } -if { [vreadpixel 350 200 rgb name] != "GOLDENROD" } { puts "Error: object should NOT be selected" } +if { [vreadpixel 150 200 rgb name] != "BLACK" } { puts "Error: object is not clipped" } +if { [vreadpixel 350 200 rgb name] != "PERU" } { puts "Error: object should NOT be selected" } vdump $imagedir/${casename}_1.png # depth range starts behinds the picking ray @@ -27,7 +27,7 @@ vviewparams -scale 14.7435 -proj 0.193921 -0.891229 0.410007 -up -0.0205984 0.41 vmoveto 150 200 vstate -entities vselect 150 200 -if { [vreadpixel 150 200 rgb name] != "BLACK" } { puts "Error: object is not clipped" } -if { [vreadpixel 300 200 rgb name] != "DARKGOLDENROD3" } { puts "Error: object should NOT be selected" } +if { [vreadpixel 150 200 rgb name] != "BLACK" } { puts "Error: object is not clipped" } +if { [vreadpixel 300 200 rgb name] != "GOLDENROD3" } { puts "Error: object should NOT be selected" } vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/xde/bug25381 b/tests/bugs/xde/bug25381 index 2d8ac7e748..be30372a52 100644 --- a/tests/bugs/xde/bug25381 +++ b/tests/bugs/xde/bug25381 @@ -14,7 +14,7 @@ vselprops dynHighlight -dispMode -1 vmoveto 300 200 if { [vreadpixel 250 200 rgb name] != "CYAN2" } { puts "Error: object is NOT picked" } vmoveto 200 250 -if { [vreadpixel 200 250 rgb name] != "BLACK"} { puts "Error: hidden part is displayed" } -if { [vreadpixel 250 200 rgb name] != "BROWN" } { puts "Error: object is picked by hidden part" } +if { [vreadpixel 200 250 rgb name] != "BLACK" } { puts "Error: hidden part is displayed" } +if { [vreadpixel 250 200 rgb name] != "RED4" } { puts "Error: object is picked by hidden part" } vdump ${imagedir}/${casename}.png -- 2.39.5