From ac2164c7029bdadde968bd2dcdd60ae57cd27d96 Mon Sep 17 00:00:00 2001 From: Romain Hugonnet Date: Sun, 5 May 2024 20:06:53 -0800 Subject: [PATCH] Update test_base --- tests/test_coreg/test_base.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test_coreg/test_base.py b/tests/test_coreg/test_base.py index 15537b0a..264e26a5 100644 --- a/tests/test_coreg/test_base.py +++ b/tests/test_coreg/test_base.py @@ -568,8 +568,8 @@ def test_pipeline_combinations__nobiasvar(self, coreg1: Coreg, coreg2: Coreg) -> @pytest.mark.parametrize( "coreg2", [ - coreg.BiasCorr1D(bias_var_names=["slope"], fit_or_bin="bin"), - coreg.BiasCorr2D(bias_var_names=["slope", "aspect"], fit_or_bin="bin"), + coreg.BiasCorr(bias_var_names=["slope"], fit_or_bin="bin"), + coreg.BiasCorr(bias_var_names=["slope", "aspect"], fit_or_bin="bin"), ], ) # type: ignore def test_pipeline_combinations__biasvar(self, coreg1: Coreg, coreg2: Coreg) -> None: @@ -588,24 +588,24 @@ def test_pipeline_combinations__biasvar(self, coreg1: Coreg, coreg2: Coreg) -> N def test_pipeline__errors(self) -> None: """Test pipeline raises proper errors.""" - pipeline = coreg.CoregPipeline([coreg.NuthKaab(), coreg.BiasCorr1D()]) + pipeline = coreg.CoregPipeline([coreg.NuthKaab(), coreg.BiasCorr()]) with pytest.raises( ValueError, match=re.escape( "No `bias_vars` passed to .fit() for bias correction step " - " of the pipeline." + " of the pipeline." ), ): pipeline.fit(**self.fit_params) - pipeline2 = coreg.CoregPipeline([coreg.NuthKaab(), coreg.BiasCorr1D(), coreg.BiasCorr1D()]) + pipeline2 = coreg.CoregPipeline([coreg.NuthKaab(), coreg.BiasCorr(), coreg.BiasCorr()]) with pytest.raises( ValueError, match=re.escape( - "No `bias_vars` passed to .fit() for bias correction step " + "No `bias_vars` passed to .fit() for bias correction step " "of the pipeline. As you are using several bias correction steps requiring" " `bias_vars`, don't forget to explicitly define their `bias_var_names` " - "during instantiation, e.g. BiasCorr1D(bias_var_names=['slope'])." + "during instantiation, e.g. BiasCorr(bias_var_names=['slope'])." ), ): pipeline2.fit(**self.fit_params) @@ -615,17 +615,17 @@ def test_pipeline__errors(self) -> None: match=re.escape( "When using several bias correction steps requiring `bias_vars` in a pipeline," "the `bias_var_names` need to be explicitly defined at each step's " - "instantiation, e.g. BiasCorr1D(bias_var_names=['slope'])." + "instantiation, e.g. BiasCorr(bias_var_names=['slope'])." ), ): pipeline2.fit(**self.fit_params, bias_vars={"slope": xdem.terrain.slope(self.ref)}) - pipeline3 = coreg.CoregPipeline([coreg.NuthKaab(), coreg.BiasCorr1D(bias_var_names=["slope"])]) + pipeline3 = coreg.CoregPipeline([coreg.NuthKaab(), coreg.BiasCorr(bias_var_names=["slope"])]) with pytest.raises( ValueError, match=re.escape( "Not all keys of `bias_vars` in .fit() match the `bias_var_names` defined during " - "instantiation of the bias correction step : ['slope']." + "instantiation of the bias correction step : ['slope']." ), ): pipeline3.fit(**self.fit_params, bias_vars={"ncc": xdem.terrain.slope(self.ref)})