From 0c43b9eee075bf39f40c4a22a52e092ea435ed64 Mon Sep 17 00:00:00 2001 From: Aashish Chaudhary Date: Wed, 6 Jan 2016 00:07:56 -0500 Subject: [PATCH] Fixed styling and indentation --- testing/vcs/CMakeLists.txt | 907 +++++++++++++++------------------- testing/vcs/test_to_base64.py | 2 +- 2 files changed, 391 insertions(+), 518 deletions(-) diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt index 2b578b3500..acb4baccbc 100644 --- a/testing/vcs/CMakeLists.txt +++ b/testing/vcs/CMakeLists.txt @@ -365,610 +365,483 @@ if (CDAT_DOWNLOAD_SAMPLE_DATA) ) cdat_add_test(test_vcs_box_custom_as_def_vistrails_exts "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_gen_meshfill.py - "${BASELINE_DIR}/test_vcs_gen_meshfill.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_box_custom_as_def_vistrails_exts.py + "${BASELINE_DIR}/test_box_custom_as_def_vistrails_exts.png" ) - cdat_add_test(vcs_setcolormap + cdat_add_test(test_vcs_boxfill_custom "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_setcolormap.py" - "${BASELINE_DIR}/test_vcs_setcolormap.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom.py + "${BASELINE_DIR}/test_boxfill_custom.png" ) - cdat_add_test(vcs_test_1d_in_boxfill + cdat_add_test(test_vcs_boxfill_custom_non_default_levels "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_1d_in_boxfill.py - "${BASELINE_DIR}/test_1d_in_boxfill.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_non_default_levels.py + "${BASELINE_DIR}/test_boxfill_custom_no_default_levels.png" ) - cdat_add_test(vcs_test_1d_missing + cdat_add_test(test_vcs_boxfill_custom_ext1 "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_1D_missing.py - "${BASELINE_DIR}/test_vcs_1d_missing.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_ext1.py + "${BASELINE_DIR}/test_boxfill_custom_ext1.png" ) - cdat_add_test(vcs_test_infinity + cdat_add_test(test_vcs_boxfill_custom_ext2 "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_infinity.py - "${BASELINE_DIR}/infinity.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_ext2.py + "${BASELINE_DIR}/test_boxfill_custom_ext2.png" ) - cdat_add_test(test_vcs_1D_datawc + cdat_add_test(test_vcs_boxfill_custom_ext1_ext2 "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_1D_datawc.py - "${BASELINE_DIR}/test_vcs_1D_datawc.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_ext1_ext2.py + "${BASELINE_DIR}/test_boxfill_custom_ext1_ext2.png" ) - cdat_add_test(test_vcs_1D_datawc_missing + cdat_add_test(test_vcs_boxfill_number_color_less_than_number_levels "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_1D_datawc_missing.py - "${BASELINE_DIR}/test_vcs_1D_datawc_missing.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_number_color_less_than_number_levels.py ) - cdat_add_test(vcs_test_wmo_marker + cdat_add_test(test_vcs_boxfill_number_color_more_than_number_levels "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_wmo_w07_marker.py - "${BASELINE_DIR}/wmo_marker.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_number_color_more_than_number_levels.py ) - cdat_add_test(vcs_test_wmo_markers + cdat_add_test(test_vcs_user_passed_date "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_wmo_markers.py - "${BASELINE_DIR}/wmo_markers.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date.py + "${BASELINE_DIR}/test_vcs_user_passed_date.png" ) - cdat_add_test(vcs_test_iso_celine_part1 + cdat_add_test(test_vcs_user_passed_date_as_string "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_celine_iso_bug.py - "${BASELINE_DIR}/test_celine_iso.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date_as_string.py + "${BASELINE_DIR}/test_vcs_user_passed_date_as_string.png" ) - cdat_add_test(vcs_test_iso_celine_part2 + cdat_add_test(test_vcs_auto_time_labels "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_celine_iso_bug_part2.py - "${BASELINE_DIR}/test_celine_iso_2.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_auto_time_labels.py + "${BASELINE_DIR}/test_vcs_auto_time_labels.png" ) - cdat_add_test(vcs_test_markers + cdat_add_test(test_vcs_isofill_data_read_north_to_south "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_markers.py - "${BASELINE_DIR}/test_markers.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_data_read_north_to_south.py + "${BASELINE_DIR}/test_vcs_isofill_data_read_north_to_south.png" ) - cdat_add_test(vcs_test_star_triangle_markers + cdat_add_test(test_vcs_lon_axes_freak_out "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_star_triangle_markers.py - "${BASELINE_DIR}/test_star_triangle_markers.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_lon_axes_freak_out.py + "${BASELINE_DIR}/test_lon_axes_freak_out.png" ) - cdat_add_test(vcs_test_canvas_background +cdat_add_test(test_vcs_set_colors_name_rgba_1d "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_canvas_background.py - "${BASELINE_DIR}/test_canvas_background.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_1d.py + "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_1d.png" ) - cdat_add_test(vcs_test_canvas_background_update +cdat_add_test(test_vcs_set_colors_name_rgba_isoline "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_canvas_background_update.py - "${BASELINE_DIR}/test_canvas_background_update.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py + "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isoline.png" ) - cdat_add_test(vcs_test_boxfill_decreasing_latitude +cdat_add_test(test_vcs_set_colors_name_rgba_meshfill "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_decreasing_latitude.py - "${BASELINE_DIR}/test_vcs_boxfill_decreasing_latitude.png" - "${UVCDAT_GIT_TESTDATA_DIR}/data/decreasing_latitude.nc" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py + "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_meshfill.png" ) - cdat_add_test(vcs_test_boxfill_10x10_numpy +cdat_add_test(test_vcs_set_colors_name_rgba_boxfill "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_10x10_numpy.py - "${BASELINE_DIR}/test_vcs_boxfill_10x10_numpy.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py + "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_boxfill.png" ) - cdat_add_test(vcs_test_boxfill_10x10_masked_numpy +cdat_add_test(test_vcs_set_colors_name_rgba_isofill "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_10x10_masked_numpy.py - "${BASELINE_DIR}/test_vcs_boxfill_10x10_masked_numpy.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba.py + "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isofill.png" ) - cdat_add_test(vcs_test_1D_with_manyDs + cdat_add_test(test_vcs_isofill_mask_cell_shift "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_1D_with_manyDs.py - "${BASELINE_DIR}/test_1D_with_manyDs.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py + "${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png" ) - cdat_add_test(vcs_test_1d_marker_not_shown_if_xaxis_flipped + cdat_add_test(vcs_test_bad_time_units "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_1d_marker_not_shown_if_xaxis_flipped.py - "${BASELINE_DIR}/test_1d_marker_not_shown_if_xaxis_flipped.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py ) + cdat_add_test(vcs_test_plot_file_varible + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_file_var.py + ) + FOREACH(gm boxfill isofill meshfill) + FOREACH(ori horizontal vertical) + FOREACH(ext1 y n) + FOREACH(ext2 y n) + cdat_add_test(vcs_test_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2} + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_legend.py + --gm_type=${gm} + --orientation=${ori} + --ext1=${ext1} + --ext2=${ext2} + "--source=${BASELINE_DIR}/test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}.png" + ) + ENDFOREACH(ext2) + ENDFOREACH(ext1) + ENDFOREACH(ori) + ENDFOREACH(gm) + FOREACH(gm boxfill isofill isoline vector meshfill yxvsx xvsy xyvsy 1d scatter) + cdat_add_test(vcs_test_basic_${gm}_transparent + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --transparent + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_transparent.png" + ) + cdat_add_test(vcs_test_basic_${gm}_zero + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --zero + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_zero.png" + ) + cdat_add_test(vcs_test_basic_${gm} + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}.png" + ) + cdat_add_test(vcs_test_basic_${gm}_masked + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --mask + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked.png" + ) + ENDFOREACH(gm) + cdat_add_test(vcs_test_show + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_show.py + ) + FOREACH(gm boxfill isofill isoline meshfill ) + FOREACH(ptype 0 -3 aeqd) + cdat_add_test(vcs_test_basic_${gm}_masked_${ptype}_proj + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --mask + --projection=${ptype} + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked_${ptype}_proj.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=-90 + --lat2=0 + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_-180_180 + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=-90 + --lat2=0 + --lon1=-180 + --lon2=180 + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_0_360 + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=-90 + --lat2=0 + --lon1=0 + --lon2=360 + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_NH + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=90 + --lat2=0 + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_gm + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=-90 + --lat2=0 + --range_via_gm + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_via_gm.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_-180_180_gm + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=-90 + --lat2=0 + --lon1=-180 + --lon2=180 + --range_via_gm + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_via_gm.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_0_360_gm + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=-90 + --lat2=0 + --lon1=0 + --lon2=360 + --range_via_gm + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_via_gm.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_NH_gm + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=90 + --lat2=0 + --range_via_gm + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH_via_gm.png" + ) + cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_NH_gm_flip + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + --gm_type=${gm} + --projection=${ptype} + --lat1=90 + --lat2=0 + --range_via_gm + --gm_flips_lat_range + "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_gmflip_NH_via_gm.png" + ) + ENDFOREACH(ptype) + ENDFOREACH(gm) - - # These test actually plot things need sample data - if (CDAT_DOWNLOAD_SAMPLE_DATA) - FOREACH(gm boxfill isofill meshfill isoline vector) - FOREACH(src vcs canvas gm) - cdat_add_test(test_vcs_colormaps_source_${gm}_${src} - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colormaps_source.py - -b ${BASELINE_DIR}/test_vcs_colormaps_source_${gm}_${src}.png - -g ${gm} - -s ${src} - ) - ENDFOREACH() - ENDFOREACH() - - cdat_add_test(test_vcs_meshfill_regular_grid - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_meshfill_regular_grid.py - "${BASELINE_DIR}/test_meshfill_regular_grid.png" + cdat_add_test(vcs_test_isoline_numpy + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_numpy.py + ${BASELINE_DIR}/test_vcs_isoline_numpy.png ) - cdat_add_test(test_vcs_plot_unstructured_via_boxfill - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_plot_unstructured_via_boxfill.py - "${BASELINE_DIR}/test_plot_unstructured_via_boxfill.png" + cdat_add_test(vcs_test_meshfill_draw_mesh + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_meshfill_draw_mesh.py + ${BASELINE_DIR}/test_meshfill_draw_mesh.png ) - cdat_add_test(test_vcs_box_custom_as_def_vistrails_exts + # @dlonie is looking into why RH6 fails for these + if (NOT EXISTS /etc/redhat-release) + cdat_add_test(vcs_test_isoline_labels_multi_label_input_types "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_box_custom_as_def_vistrails_exts.py - "${BASELINE_DIR}/test_box_custom_as_def_vistrails_exts.png" + "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py" + "${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png" ) - cdat_add_test(test_vcs_boxfill_custom + cdat_add_test(vcs_test_isoline_labels "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom.py - "${BASELINE_DIR}/test_boxfill_custom.png" + "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labels.py" + "${BASELINE_DIR}/test_isoline_labels.png" ) - cdat_add_test(test_vcs_boxfill_custom_non_default_levels + cdat_add_test(vcs_test_isoline_labelskipdistance "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_non_default_levels.py - "${BASELINE_DIR}/test_boxfill_custom_no_default_levels.png" + "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labelskipdistance.py" + "${BASELINE_DIR}/test_isoline_labelskipdistance.png" ) - cdat_add_test(test_vcs_boxfill_custom_ext1 + cdat_add_test(vcs_test_isofill_isoline_labels "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_ext1.py - "${BASELINE_DIR}/test_boxfill_custom_ext1.png" + "${cdat_SOURCE_DIR}/testing/vcs/test_isofill_isoline_labels.py" + "${BASELINE_DIR}/test_isofill_isoline_labels.png" ) - cdat_add_test(test_vcs_boxfill_custom_ext2 + cdat_add_test(vcs_test_isoline_width_stipple "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_ext2.py - "${BASELINE_DIR}/test_boxfill_custom_ext2.png" + "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_width_stipple.py" + "${BASELINE_DIR}/test_isoline_width_stipple.png" ) - cdat_add_test(test_vcs_boxfill_custom_ext1_ext2 + cdat_add_test(vcs_test_isoline_labels_background "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_custom_ext1_ext2.py - "${BASELINE_DIR}/test_boxfill_custom_ext1_ext2.png" + "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labels_background.py" + "${BASELINE_DIR}/test_isoline_labels_background.png" ) - cdat_add_test(test_vcs_boxfill_number_color_less_than_number_levels - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_number_color_less_than_number_levels.py - ) - cdat_add_test(test_vcs_boxfill_number_color_more_than_number_levels - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_number_color_more_than_number_levels.py - ) - cdat_add_test(test_vcs_user_passed_date - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date.py - "${BASELINE_DIR}/test_vcs_user_passed_date.png" - ) - cdat_add_test(test_vcs_user_passed_date_as_string - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_user_passed_date_as_string.py - "${BASELINE_DIR}/test_vcs_user_passed_date_as_string.png" - ) - cdat_add_test(test_vcs_auto_time_labels - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_auto_time_labels.py - "${BASELINE_DIR}/test_vcs_auto_time_labels.png" - ) - cdat_add_test(test_vcs_isofill_data_read_north_to_south - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_data_read_north_to_south.py - "${BASELINE_DIR}/test_vcs_isofill_data_read_north_to_south.png" - ) - cdat_add_test(test_vcs_lon_axes_freak_out - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_lon_axes_freak_out.py - "${BASELINE_DIR}/test_lon_axes_freak_out.png" - ) - cdat_add_test(test_vcs_set_colors_name_rgba_1d - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_1d.py - "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_1d.png" - ) - cdat_add_test(test_vcs_set_colors_name_rgba_isoline - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_isoline.py - "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isoline.png" - ) - cdat_add_test(test_vcs_set_colors_name_rgba_meshfill - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_meshfill.py - "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_meshfill.png" - ) - cdat_add_test(test_vcs_set_colors_name_rgba_boxfill - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba_boxfill.py - "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_boxfill.png" - ) - cdat_add_test(test_vcs_set_colors_name_rgba_isofill - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_settings_color_name_rgba.py - "${BASELINE_DIR}/test_vcs_settings_color_name_rgba_isofill.png" - ) - cdat_add_test(test_vcs_isofill_mask_cell_shift - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isofill_mask_cell_shift.py - "${BASELINE_DIR}/test_vcs_isofill_mask_cell_shift.png" - ) - cdat_add_test(vcs_test_bad_time_units - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_bad_time_units.py - ) - cdat_add_test(vcs_test_plot_file_varible - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_plot_file_var.py - ) - FOREACH(gm boxfill isofill meshfill) - FOREACH(ori horizontal vertical) - FOREACH(ext1 y n) - FOREACH(ext2 y n) - cdat_add_test(vcs_test_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2} - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_legend.py - --gm_type=${gm} - --orientation=${ori} - --ext1=${ext1} - --ext2=${ext2} - "--source=${BASELINE_DIR}/test_vcs_legend_${gm}_${ori}_ext1_${ext1}_ext2_${ext2}.png" - ) - ENDFOREACH(ext2) - ENDFOREACH(ext1) - ENDFOREACH(ori) - ENDFOREACH(gm) - FOREACH(gm boxfill isofill isoline vector meshfill yxvsx xvsy xyvsy 1d scatter) - cdat_add_test(vcs_test_basic_${gm}_transparent - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --transparent - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_transparent.png" - ) - cdat_add_test(vcs_test_basic_${gm}_zero - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --zero - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_zero.png" - ) - cdat_add_test(vcs_test_basic_${gm} - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}.png" - ) - cdat_add_test(vcs_test_basic_${gm}_masked - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --mask - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked.png" - ) - ENDFOREACH(gm) - cdat_add_test(vcs_test_show - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_show.py - ) - FOREACH(gm boxfill isofill isoline meshfill ) - FOREACH(ptype 0 -3 aeqd) - cdat_add_test(vcs_test_basic_${gm}_masked_${ptype}_proj - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --mask - --projection=${ptype} - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_masked_${ptype}_proj.png" - ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --projection=${ptype} - --lat1=-90 - --lat2=0 - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH.png" - ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_-180_180 - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --projection=${ptype} - --lat1=-90 - --lat2=0 - --lon1=-180 - --lon2=180 - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180.png" - ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_0_360 - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --projection=${ptype} - --lat1=-90 - --lat2=0 - --lon1=0 - --lon2=360 - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360.png" - ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_NH - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --projection=${ptype} - --lat1=90 - --lat2=0 - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH.png" - ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_gm + endif() + cdat_add_test(vcs_test_oned_level_axis + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_oned_level_axis.py + "${BASELINE_DIR}/test_oned_level_axis.png" + ) + cdat_add_test(vcs_test_first_png_blank + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_first_png_blank.py + "${BASELINE_DIR}/first_png_blank.png" + ) + # cdat_add_test(vcs_test_aspect_ratio + # "${PYTHON_EXECUTABLE}" + # ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py + # ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py + # ) + cdat_add_test(vcs_test_polar_set_opt_param_polar + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_polar_set_opt_param_polar.py + "${BASELINE_DIR}/test_polar_set_opt_param_polar.png" + ) + cdat_add_test(vcs_test_boxfill_lev1_lev2 + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2.py + "${BASELINE_DIR}/test_boxfill_lev1_lev2.png" + ) + cdat_add_test(vcs_test_boxfill_lev1_lev2_ext1 + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ext1.py + "${BASELINE_DIR}/test_boxfill_lev1_lev2_ext1.png" + ) + cdat_add_test(vcs_test_boxfill_lev1_lev2_ext2 + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ext2.py + "${BASELINE_DIR}/test_boxfill_lev1_lev2_ext2.png" + ) + cdat_add_test(vcs_test_boxfill_lev1_lev2_ext1_ext2 + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ext1_ext2.py + "${BASELINE_DIR}/test_boxfill_lev1_lev2_ext1_ext2.png" + ) + + cdat_add_test(vcs_test_hatches_patterns + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hatches_patterns.py + "${BASELINE_DIR}/test_vcs_hatches_patterns.png" + ) + FOREACH(gm isofill boxfill meshfill) + FOREACH(style solid pattern hatch) + cdat_add_test(vcs_test_${gm}_${style}_fill_non-contig "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py" --gm_type=${gm} - --projection=${ptype} - --lat1=-90 - --lat2=0 - --range_via_gm - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_via_gm.png" + --fill_style=${style} + --non-contiguous + "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180_non-contig.png" + "--threshold=45" ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_-180_180_gm + cdat_add_test(vcs_test_${gm}_${style}_fill "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py" --gm_type=${gm} - --projection=${ptype} - --lat1=-90 - --lat2=0 - --lon1=-180 - --lon2=180 - --range_via_gm - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_-180_180_via_gm.png" + --fill_style=${style} + "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180.png" + "--threshold=45" ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_SH_0_360_gm + cdat_add_test(vcs_test_${gm}_${style}_fill_0_360 "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py + "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py" --gm_type=${gm} - --projection=${ptype} - --lat1=-90 - --lat2=0 + --fill_style=${style} --lon1=0 --lon2=360 - --range_via_gm - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_SH_0_360_via_gm.png" - ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_NH_gm - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --projection=${ptype} - --lat1=90 - --lat2=0 - --range_via_gm - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_NH_via_gm.png" - ) - cdat_add_test(vcs_test_basic_${gm}_${ptype}_proj_NH_gm_flip - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py - --gm_type=${gm} - --projection=${ptype} - --lat1=90 - --lat2=0 - --range_via_gm - --gm_flips_lat_range - "--source=${BASELINE_DIR}/test_vcs_basic_${gm}_${ptype}_proj_gmflip_NH_via_gm.png" + "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_0_360.png" + "--threshold=45" ) - ENDFOREACH(ptype) - ENDFOREACH(gm) + ENDFOREACH(style) + ENDFOREACH(gm) - cdat_add_test(vcs_test_isoline_numpy - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_numpy.py - ${BASELINE_DIR}/test_vcs_isoline_numpy.png - ) - cdat_add_test(vcs_test_meshfill_draw_mesh - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_meshfill_draw_mesh.py - ${BASELINE_DIR}/test_meshfill_draw_mesh.png - ) - # @dlonie is looking into why RH6 fails for these - if (NOT EXISTS /etc/redhat-release) - cdat_add_test(vcs_test_isoline_labels_multi_label_input_types - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_isoline_labels_multi_label_input_types.py" - "${BASELINE_DIR}/test_vcs_isoline_labels_multi_label_input_types.png" - ) - cdat_add_test(vcs_test_isoline_labels - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labels.py" - "${BASELINE_DIR}/test_isoline_labels.png" - ) - cdat_add_test(vcs_test_isoline_labelskipdistance - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labelskipdistance.py" - "${BASELINE_DIR}/test_isoline_labelskipdistance.png" - ) - cdat_add_test(vcs_test_isofill_isoline_labels + FOREACH(gm isofill meshfill boxfill) + FOREACH(proj polar robinson mercator mollweide lambert) + cdat_add_test(vcs_test_animate_projected_${gm}_${proj} "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_isofill_isoline_labels.py" - "${BASELINE_DIR}/test_isofill_isoline_labels.png" - ) - cdat_add_test(vcs_test_isoline_width_stipple - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_width_stipple.py" - "${BASELINE_DIR}/test_isoline_width_stipple.png" - ) - cdat_add_test(vcs_test_isoline_labels_background - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_isoline_labels_background.py" - "${BASELINE_DIR}/test_isoline_labels_background.png" + "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_animate_projected_plots.py" + --gm_type=${gm} + --projection_type=${proj} + --source=${BASELINE_DIR}/test_vcs_animate_projected_${gm}_${proj}.png + --threshold=40 ) - endif() - cdat_add_test(vcs_test_oned_level_axis - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_oned_level_axis.py - "${BASELINE_DIR}/test_oned_level_axis.png" - ) - cdat_add_test(vcs_test_first_png_blank - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_first_png_blank.py - "${BASELINE_DIR}/first_png_blank.png" - ) - # cdat_add_test(vcs_test_aspect_ratio - # "${PYTHON_EXECUTABLE}" - # ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py - # ${cdat_SOURCE_DIR}/testing/vcs/test_aspect_ratio.py - # ) - cdat_add_test(vcs_test_polar_set_opt_param_polar - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_polar_set_opt_param_polar.py - "${BASELINE_DIR}/test_polar_set_opt_param_polar.png" - ) - cdat_add_test(vcs_test_boxfill_lev1_lev2 - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2.py - "${BASELINE_DIR}/test_boxfill_lev1_lev2.png" - ) - cdat_add_test(vcs_test_boxfill_lev1_lev2_ext1 - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ext1.py - "${BASELINE_DIR}/test_boxfill_lev1_lev2_ext1.png" - ) - cdat_add_test(vcs_test_boxfill_lev1_lev2_ext2 - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ext2.py - "${BASELINE_DIR}/test_boxfill_lev1_lev2_ext2.png" - ) - cdat_add_test(vcs_test_boxfill_lev1_lev2_ext1_ext2 - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ext1_ext2.py - "${BASELINE_DIR}/test_boxfill_lev1_lev2_ext1_ext2.png" - ) + ENDFOREACH(proj) + ENDFOREACH(gm) - cdat_add_test(vcs_test_hatches_patterns + FOREACH(flip None X XY Y) + cdat_add_test(vcs_test_flip${flip} "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hatches_patterns.py - "${BASELINE_DIR}/test_vcs_hatches_patterns.png" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_flip${flip}.py + "${BASELINE_DIR}/test_vcs_flip${flip}.png" ) - FOREACH(gm isofill boxfill meshfill) - FOREACH(style solid pattern hatch) - cdat_add_test(vcs_test_${gm}_${style}_fill_non-contig - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py" - --gm_type=${gm} - --fill_style=${style} - --non-contiguous - "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180_non-contig.png" - "--threshold=45" - ) - cdat_add_test(vcs_test_${gm}_${style}_fill - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py" - --gm_type=${gm} - --fill_style=${style} - "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180.png" - "--threshold=45" - ) - cdat_add_test(vcs_test_${gm}_${style}_fill_0_360 - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py" - --gm_type=${gm} - --fill_style=${style} - --lon1=0 - --lon2=360 - "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_0_360.png" - "--threshold=45" - ) - ENDFOREACH(style) - ENDFOREACH(gm) - - FOREACH(gm isofill meshfill boxfill) - FOREACH(proj polar robinson mercator mollweide lambert) - cdat_add_test(vcs_test_animate_projected_${gm}_${proj} - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_animate_projected_plots.py" - --gm_type=${gm} - --projection_type=${proj} - --source=${BASELINE_DIR}/test_vcs_animate_projected_${gm}_${proj}.png - --threshold=40 - ) - ENDFOREACH(proj) - ENDFOREACH(gm) - - FOREACH(flip None X XY Y) - cdat_add_test(vcs_test_flip${flip} - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_flip${flip}.py - "${BASELINE_DIR}/test_vcs_flip${flip}.png" - ) - ENDFOREACH(flip) + ENDFOREACH(flip) - cdat_add_test(vcs_test_boxfill_lev1_lev2_ta_missing - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ta_missing.py - "${BASELINE_DIR}/test_boxfill_lev1_lev2_ta_missing.png" - ) + cdat_add_test(vcs_test_boxfill_lev1_lev2_ta_missing + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_boxfill_lev1_lev2_ta_missing.py + "${BASELINE_DIR}/test_boxfill_lev1_lev2_ta_missing.png" + ) - cdat_add_test(vcs_test_close - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_close.py - "${BASELINE_DIR}/test_vcs_close.png" - ) + cdat_add_test(vcs_test_close + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_close.py + "${BASELINE_DIR}/test_vcs_close.png" + ) - cdat_add_test(vcs_test_basic_isofill_bigvalues - "${PYTHON_EXECUTABLE}" - "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py" - --gm_type=isofill - --bigvalues - "--source=${BASELINE_DIR}/test_vcs_basic_isofill_bigvalues.png" - ) - cdat_add_test(vcs_test_issue_960_labels - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_issue_960_labels.py - ${BASELINE_DIR}/test_vcs_issue_960_labels_1.png - ${BASELINE_DIR}/test_vcs_issue_960_labels_2.png - ) - cdat_add_test(vcs_test_animate_meshfill + cdat_add_test(vcs_test_basic_isofill_bigvalues + "${PYTHON_EXECUTABLE}" + "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_basic_gms.py" + --gm_type=isofill + --bigvalues + "--source=${BASELINE_DIR}/test_vcs_basic_isofill_bigvalues.png" + ) + cdat_add_test(vcs_test_issue_960_labels + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_issue_960_labels.py + ${BASELINE_DIR}/test_vcs_issue_960_labels_1.png + ${BASELINE_DIR}/test_vcs_issue_960_labels_2.png + ) + cdat_add_test(vcs_test_animate_meshfill + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_animate_meshfill.py + ${BASELINE_DIR} + ) + cdat_add_test(vcs_test_animate_isofill + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isofill.py + ${BASELINE_DIR} + ) + cdat_add_test(vcs_test_animate_boxfill + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_animate_boxfill.py + ${BASELINE_DIR} + ) + cdat_add_test(vcs_test_animate_isoline + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline.py + ${BASELINE_DIR} + ) + cdat_add_test(vcs_test_animate_isoline_colored + "${PYTHON_EXECUTABLE}" + ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_colored.py + ${BASELINE_DIR} + ) + if ( (NOT EXISTS /etc/redhat-release) AND (NOT CDAT_BUILD_OFFSCREEN)) + cdat_add_test(vcs_test_animate_isoline_text_labels "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_animate_meshfill.py + ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels.py ${BASELINE_DIR} ) - cdat_add_test(vcs_test_animate_isofill + cdat_add_test(vcs_test_animate_isoline_text_labels_colored "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isofill.py + ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels_colored.py ${BASELINE_DIR} ) - cdat_add_test(vcs_test_animate_boxfill + cdat_add_test(vcs_test_patterns "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_animate_boxfill.py - ${BASELINE_DIR} + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_patterns.py + "${BASELINE_DIR}/test_vcs_patterns.png" ) - cdat_add_test(vcs_test_animate_isoline + cdat_add_test(vcs_test_vectors_robinson "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline.py - ${BASELINE_DIR} + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson.py + "${BASELINE_DIR}/test_vcs_vectors_robinson.png" ) - cdat_add_test(vcs_test_animate_isoline_colored + cdat_add_test(vcs_test_vectors_robinson_wrap "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_colored.py - ${BASELINE_DIR} + ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson_wrap.py + "${BASELINE_DIR}/test_vcs_vectors_robinson_wrap.png" ) - if ( (NOT EXISTS /etc/redhat-release) AND (NOT CDAT_BUILD_OFFSCREEN)) - cdat_add_test(vcs_test_animate_isoline_text_labels - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels.py - ${BASELINE_DIR} - ) - cdat_add_test(vcs_test_animate_isoline_text_labels_colored - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_animate_isoline_text_labels_colored.py - ${BASELINE_DIR} - ) - cdat_add_test(vcs_test_patterns - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_patterns.py - "${BASELINE_DIR}/test_vcs_patterns.png" - ) - cdat_add_test(vcs_test_vectors_robinson - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson.py - "${BASELINE_DIR}/test_vcs_vectors_robinson.png" - ) - cdat_add_test(vcs_test_vectors_robinson_wrap - "${PYTHON_EXECUTABLE}" - ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_robinson_wrap.py - "${BASELINE_DIR}/test_vcs_vectors_robinson_wrap.png" - ) - endif() endif() +endif() cdat_add_test(vcs_test_endconfigure "${PYTHON_EXECUTABLE}" diff --git a/testing/vcs/test_to_base64.py b/testing/vcs/test_to_base64.py index b0c17f6102..6b88b35114 100644 --- a/testing/vcs/test_to_base64.py +++ b/testing/vcs/test_to_base64.py @@ -17,7 +17,7 @@ try: display._repr_png() except Exception as exc: - print "Convertion to base64 binary string failed.", exc + print "Conversion to base64 binary string failed.", exc success = 1 sys.exit(success)