diff --git a/testing/dv3d/TestManager.py b/testing/dv3d/TestManager.py index f49bd034e5..f459e4162d 100644 --- a/testing/dv3d/TestManager.py +++ b/testing/dv3d/TestManager.py @@ -124,7 +124,7 @@ def interact(self): def test( self, interactive=False ): self.build() # test_image = os.path.join( self.test_dir, 'images', '.'.join( [ self.name, 'png' ] ) ) - test_image = '.'.join( [ self.name, 'test', 'png' ] ) + test_image = '.'.join( [ self.name, 'png' ] ) self.canvas.png( test_image, width = 900, height = 600 ) ret = regression.check_result_image( test_image, self.image_name,\ diff --git a/testing/vcs/test_vcs_1D_with_manyDs.py b/testing/vcs/test_vcs_1D_with_manyDs.py index db45baa285..f9c7f8220e 100644 --- a/testing/vcs/test_vcs_1D_with_manyDs.py +++ b/testing/vcs/test_vcs_1D_with_manyDs.py @@ -6,4 +6,4 @@ d = numpy.reshape(d,(10,10)) one = x.create1d() x.plot(d,one,bg=1) -regression.run(x, "test_1D_with_manyDs.png", sys.argv[1]) \ No newline at end of file +regression.run(x, "test_vcs_1D_with_manyDs.png", sys.argv[1]) diff --git a/testing/vcs/test_vcs_1d_in_boxfill.py b/testing/vcs/test_vcs_1d_in_boxfill.py index 8b5dc26e36..5332fd8692 100644 --- a/testing/vcs/test_vcs_1d_in_boxfill.py +++ b/testing/vcs/test_vcs_1d_in_boxfill.py @@ -5,4 +5,4 @@ d = numpy.sin(numpy.arange(100)) b = x.createboxfill() x.plot(d,b,bg=1) -regression.run(x, "test_1d_in_boxfill.png", sys.argv[1]) \ No newline at end of file +regression.run(x, "test_vcs_1d_in_boxfill.png", sys.argv[1]) diff --git a/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py b/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py index 71f6831f45..b2e9f1a3c8 100644 --- a/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py +++ b/testing/vcs/test_vcs_1d_marker_not_shown_if_xaxis_flipped.py @@ -12,4 +12,5 @@ gm.datawc_x2=0 gm.markersize=30 x.plot(data,gm,bg=1) -regression.run(x, "test_1d_marker_not_shown_if_xaxis_flipped.png", sys.argv[1]) \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm, sys.argv[1]) diff --git a/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py b/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py index 9ae4aa8fee..5f025e7514 100644 --- a/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py +++ b/testing/vcs/test_vcs_box_custom_as_def_vistrails_exts.py @@ -9,4 +9,5 @@ gm.ext_1 = "y" gm.ext_2 = "y" x.plot(s, gm, bg=1) -regression.run(x, "test_box_custom_as_def_vistrails_exts.png", sys.argv[1]) \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm, sys.argv[1]) diff --git a/testing/vcs/test_vcs_boxfill_custom.py b/testing/vcs/test_vcs_boxfill_custom.py index 67e1c3d22e..9a9f960bae 100644 --- a/testing/vcs/test_vcs_boxfill_custom.py +++ b/testing/vcs/test_vcs_boxfill_custom.py @@ -19,4 +19,5 @@ # Load the image testing module: # Create the test image and compare: -regression.run(canvas, "test_boxfill_custom.png") +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(canvas, fnm) diff --git a/testing/vcs/test_vcs_boxfill_custom_ext1.py b/testing/vcs/test_vcs_boxfill_custom_ext1.py index 2aca9d83ae..3b475ad7cc 100644 --- a/testing/vcs/test_vcs_boxfill_custom_ext1.py +++ b/testing/vcs/test_vcs_boxfill_custom_ext1.py @@ -20,6 +20,6 @@ boxfill.fillareacolors=vcs.getcolors(boxfill.levels) canvas.plot(clt, boxfill, bg=1) - +fnm = os.path.split(__file__)[1][:-3] + ".png" # Load the image testing module: -regression.run(canvas, "test_boxfill_custom_ext1.png") \ No newline at end of file +regression.run(canvas, fnm) diff --git a/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py b/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py index a72e1c71b3..0caa22e979 100644 --- a/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py +++ b/testing/vcs/test_vcs_boxfill_custom_ext1_ext2.py @@ -21,6 +21,6 @@ boxfill.fillareacolors=vcs.getcolors(boxfill.levels) canvas.plot(clt, boxfill, bg=1) - +fnm = os.path.split(__file__)[1][:-3] + ".png" # Load the image testing module: -regression.run(canvas, "test_boxfill_custom_ext1_ext2.png") +regression.run(canvas, fnm) diff --git a/testing/vcs/test_vcs_boxfill_custom_ext2.py b/testing/vcs/test_vcs_boxfill_custom_ext2.py index 21da587145..d87834b70d 100644 --- a/testing/vcs/test_vcs_boxfill_custom_ext2.py +++ b/testing/vcs/test_vcs_boxfill_custom_ext2.py @@ -25,5 +25,5 @@ boxfill.fillareacolors=vcs.getcolors(boxfill.levels) canvas.plot(clt, boxfill, bg=1) - -regression.run(canvas, "test_boxfill_custom_ext2.png") \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(canvas, fnm) diff --git a/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py b/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py index 1cbbccf85f..cd21414e83 100644 --- a/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py +++ b/testing/vcs/test_vcs_boxfill_custom_non_default_levels.py @@ -19,4 +19,5 @@ boxfill.fillareacolors=vcs.getcolors(levels) canvas.plot(clt, boxfill, bg=1) -regression.run(canvas, "test_boxfill_custom_no_default_levels.png") +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(canvas, fnm) diff --git a/testing/vcs/test_vcs_boxfill_decreasing_latitude.py b/testing/vcs/test_vcs_boxfill_decreasing_latitude.py index f6716e82c9..cc5b166358 100755 --- a/testing/vcs/test_vcs_boxfill_decreasing_latitude.py +++ b/testing/vcs/test_vcs_boxfill_decreasing_latitude.py @@ -52,4 +52,5 @@ gm.datawc_y1 = 90 x.plot(ice, gm, tmpl, bg=1) -regression.run(x, "test_boxfill_decreasing_latitude.png") +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py index 5926ec751f..05cc0ba4f6 100644 --- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py +++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1.py @@ -8,4 +8,5 @@ b.level_2 = 80 b.ext_1 = "y" x.plot(s, b, bg=1) -regression.run(x, "test_boxfill_lev1_lev2_ext1.png") \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py index 7205d32430..4737391dd2 100644 --- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py +++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext1_ext2.py @@ -9,4 +9,5 @@ b.ext_1 = "y" b.ext_2 = "y" x.plot(s, b, bg=1) -regression.run(x, "test_boxfill_lev1_lev2_ext1_ext2.png") \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py index 2cb0e580c5..fa84941269 100644 --- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py +++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ext2.py @@ -8,4 +8,5 @@ b.level_2 = 80 b.ext_2 = "y" x.plot(s, b, bg=1) -regression.run(x, "test_boxfill_lev1_lev2_ext2.png") \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py b/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py index c17a3488b0..c16a080894 100644 --- a/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py +++ b/testing/vcs/test_vcs_boxfill_lev1_lev2_ta_missing.py @@ -8,4 +8,5 @@ b.level_1 = -40 b.level_2 = 40 x.plot(s, b, bg=1) -regression.run(x, "test_boxfill_lev1_lev2_ta_missing.png") \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_infinity.py b/testing/vcs/test_vcs_infinity.py index 63af086170..60d5040203 100644 --- a/testing/vcs/test_vcs_infinity.py +++ b/testing/vcs/test_vcs_infinity.py @@ -12,5 +12,5 @@ x.drawlogooff() x.setbgoutputdimensions(1200,1091,units="pixels") x.plot(s,bg=1) -fnm = "infinity.png" -regression.run(x, fnm) \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_iso_celine_part1.py b/testing/vcs/test_vcs_iso_celine_part1.py index 4980acc4a3..3097330e39 100644 --- a/testing/vcs/test_vcs_iso_celine_part1.py +++ b/testing/vcs/test_vcs_iso_celine_part1.py @@ -10,5 +10,5 @@ x.scriptrun(os.path.join(pth0,"celine.json")) i = x.getisofill("celine") x.plot(s,i,bg=1) -fnm = "test_celine_iso.png" +fnm = os.path.split(__file__)[1][:-3] + ".png" regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_iso_celine_part2.py b/testing/vcs/test_vcs_iso_celine_part2.py index 12c60b2e8b..b059ca37de 100644 --- a/testing/vcs/test_vcs_iso_celine_part2.py +++ b/testing/vcs/test_vcs_iso_celine_part2.py @@ -14,5 +14,5 @@ b.fillareacolors=i.fillareacolors b.boxfill_type="custom" x.plot(s,b,bg=1) -fnm = "test_celine_iso_2.png" +fnm = os.path.split(__file__)[1][:-3] + ".png" regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_lon_axes_freak_out.py b/testing/vcs/test_vcs_lon_axes_freak_out.py index 4233b7e86c..c40cce2271 100644 --- a/testing/vcs/test_vcs_lon_axes_freak_out.py +++ b/testing/vcs/test_vcs_lon_axes_freak_out.py @@ -8,4 +8,5 @@ x.plot(s,bg=1) x.clear() x.plot(s3,bg=1) -regression.run(x, "test_lon_axes_freak_out.png") \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_matplotlib_colormap.py b/testing/vcs/test_vcs_matplotlib_colormap.py index 07f3e6fb37..c27c89b581 100644 --- a/testing/vcs/test_vcs_matplotlib_colormap.py +++ b/testing/vcs/test_vcs_matplotlib_colormap.py @@ -15,4 +15,5 @@ canvas = regression.init() canvas.setcolormap(vcs.matplotlib2vcs("viridis")) canvas.plot(clt, bg=1) -regression.run(canvas, "test_matplotlib_colormap.png") +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(canvas, fnm) diff --git a/testing/vcs/test_vcs_oned_level_axis.py b/testing/vcs/test_vcs_oned_level_axis.py index 10b398f663..86e9adec99 100644 --- a/testing/vcs/test_vcs_oned_level_axis.py +++ b/testing/vcs/test_vcs_oned_level_axis.py @@ -5,5 +5,5 @@ ta = cdutil.averager(ta,axis="yx") x = regression.init() x.plot(ta,bg=1) -fnm = "test_oned_level_axis.png" -regression.run(x, fnm) \ No newline at end of file +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py b/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py index abd2dedae2..bdac3cb98e 100644 --- a/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py +++ b/testing/vcs/test_vcs_plot_unstructured_via_boxfill.py @@ -4,4 +4,5 @@ s = f("sample") x = regression.init() x.plot(s,bg=1) -regression.run(x, "test_plot_unstructured_via_boxfill.png") +fnm = os.path.split(__file__)[1][:-3] + ".png" +regression.run(x, fnm) diff --git a/testing/vcs/test_vcs_remove_marker_none_1d.py b/testing/vcs/test_vcs_remove_marker_none_1d.py index 48d24036b9..7ac205cfd6 100644 --- a/testing/vcs/test_vcs_remove_marker_none_1d.py +++ b/testing/vcs/test_vcs_remove_marker_none_1d.py @@ -11,5 +11,5 @@ gm.marker = None x.plot(gm, dummy_data,bg=1) -fnm = "test_remove_marker_none_1d.png" -regression.run(x, fnm) \ No newline at end of file +fnm = "test_vcs_remove_marker_none_1d.png" +regression.run(x, fnm) diff --git a/testing/vcs/vtk_ui/test_vtk_ui_text_dimensions.py b/testing/vcs/vtk_ui/test_vtk_ui_text_dimensions.py index 1fb2296392..a9064b5859 100644 --- a/testing/vcs/vtk_ui/test_vtk_ui_text_dimensions.py +++ b/testing/vcs/vtk_ui/test_vtk_ui_text_dimensions.py @@ -16,20 +16,20 @@ def do_test(self): w, h = vcs.vtk_ui.text.text_dimensions("no descenders", text_property, dpi) - if w != 175 or h != 24: - print "no descenders width/height changed" + if w != 174 or h != 23: + print "no descenders width/height changed (%d,%d)"%(w,h) return w, h = vcs.vtk_ui.text.text_dimensions("couple good descenders", text_property, dpi) - if w != 299 or h != 24: - print "couple good descenders width/height changed" + if w != 298 or h != 23: + print "couple good descenders width/height changed (%d, %d)"%(w,h) return w, h = vcs.vtk_ui.text.text_dimensions( "This one\nis on\nmultiple lines", text_property, dpi) - if w != 151 or h != 76: - print "Multi-line width/height changed" + if w != 150 or h != 73: + print "Multi-line width/height changed (%d,%d)"%(w,h) return self.passed = 0 diff --git a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py index 9e6d47a111..4c5e2912fb 100644 --- a/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py +++ b/testing/vcsaddons/test_12_plot_one_leg_per_row_right.py @@ -2,7 +2,7 @@ import vcs from vcsaddons import EzTemplate -import cdms,vcs,sys +import cdms2,vcs,sys ## 12 plots 1 legend per row on the right ## Initialize VCS x = vcs.init()