From 0b622219f290121a0ab91550b3622c3127bd941b Mon Sep 17 00:00:00 2001 From: Sarthak Srivastava Date: Wed, 31 Jul 2024 10:43:01 +0530 Subject: [PATCH] regression update --- .../tools/tests/test_liv_plot.py | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/tardis/visualization/tools/tests/test_liv_plot.py b/tardis/visualization/tools/tests/test_liv_plot.py index 8a7b221e746..899aab13b5f 100644 --- a/tardis/visualization/tools/tests/test_liv_plot.py +++ b/tardis/visualization/tools/tests/test_liv_plot.py @@ -1,6 +1,7 @@ -import json import numpy as np import pytest +from numpy import testing as npt +from pandas import testing as pdt from copy import deepcopy from matplotlib.collections import PolyCollection from matplotlib.lines import Line2D @@ -122,15 +123,15 @@ def test_parse_species_list( f"livplotter_parse_species_list_{subgroup_name}.h5" ) - regression_data.check( - { - "_species_list": plotter._species_list, - "_keep_colour": plotter._keep_colour, - "_species_mapped": convert_to_native_type( - plotter._species_mapped - ), - }, - fname=regression_data_fname, + expected = pd.read_hdf(regression_data_fname, "species_list") + pdt.assert_frame_equal(plotter._species_list, expected) + + expected = pd.read_hdf(regression_data_fname, "keep_colour") + pdt.assert_frame_equal(plotter._keep_colour, expected) + + expected = pd.read_hdf(regression_data_fname, "species_mapped") + pdt.assert_frame_equal( + convert_to_native_type(plotter._species_mapped), expected ) @pytest.mark.parametrize("packets_mode", ["virtual", "real"]) @@ -181,14 +182,14 @@ def test_prepare_plot_data( f"livplotter_prepare_plot_data_{subgroup_name}.h5" ) - regression_data.check( - { - "plot_data": plot_data_list, - "plot_colors": plotter.plot_colors, - "new_bin_edges": plotter.new_bin_edges, - }, - fname=regression_data_fname, - ) + expected = pd.read_hdf(regression_data_fname, "plot_data") + pdt.assert_frame_equal(plot_data_list, expected) + + expected = pd.read_hdf(regression_data_fname, "plot_colors") + pdt.assert_frame_equal(plotter.plot_colors, expected) + + expected = pd.read_hdf(regression_data_fname, "new_bin_edges") + pdt.assert_frame_equal(plotter.new_bin_edges, expected) @pytest.mark.parametrize( "species_list", [["Si II", "Ca II", "C", "Fe I-V"], None] @@ -261,7 +262,9 @@ def test_generate_plot_mpl( regression_data_fname = ( f"livplotter_generate_plot_mpl_{subgroup_name}.h5" ) - regression_data.check(fig_data, fname=regression_data_fname) + + expected = pd.read_hdf(regression_data_fname, "fig_data") + pdt.assert_frame_equal(fig_data, expected) @pytest.mark.parametrize( "species_list", [["Si II", "Ca II", "C", "Fe I-V"], None] @@ -330,4 +333,6 @@ def test_generate_plot_ply( regression_data_fname = ( f"livplotter_generate_plot_ply_{subgroup_name}.h5" ) - regression_data.check(fig_data, fname=regression_data_fname) + + expected = pd.read_hdf(regression_data_fname, "fig_data") + pdt.assert_frame_equal(fig_data, expected)