From c5f284cd8d79bdf9e8dd6a377b7831e2ee742afe Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 18 Aug 2021 10:44:04 +0200 Subject: [PATCH] increased test coverage --- python/damask/_result.py | 2 +- python/tests/test_Result.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/python/damask/_result.py b/python/damask/_result.py index 40547010a..4ca9e51b7 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -1258,7 +1258,7 @@ class Result: Arguments parsed to func. """ - if len(datasets) != 1 or self.N_constituents !=1: + if len(datasets) != 1 or self.N_constituents != 1: raise NotImplementedError at_cell_ph,in_data_ph,at_cell_ho,in_data_ho = self._mappings() diff --git a/python/tests/test_Result.py b/python/tests/test_Result.py index 87c594f0f..d6b630e52 100644 --- a/python/tests/test_Result.py +++ b/python/tests/test_Result.py @@ -268,10 +268,15 @@ class TestResult: in_file = default.place('V(F)') assert np.allclose(in_memory,in_file) - def test_add_invalid(self,default): + def test_add_invalid_dataset(self,default): with pytest.raises(TypeError): default.add_calculation('#invalid#*2') + def test_add_generic_grid_invalid(self,ref_path): + result = Result(ref_path/'4grains2x4x3_compressionY.hdf5') + with pytest.raises(NotImplementedError): + result.add_curl('F') + @pytest.mark.parametrize('shape',['vector','tensor']) def test_add_curl(self,default,shape): @@ -502,7 +507,10 @@ class TestResult: @pytest.mark.parametrize('fname',['4grains2x4x3_compressionY.hdf5', '6grains6x7x8_single_phase_tensionY.hdf5']) - def test_export_setup(self,ref_path,tmp_path,fname): + @pytest.mark.parametrize('output',['material.yaml','*']) + @pytest.mark.parametrize('overwrite',[True,False]) + def test_export_setup(self,ref_path,tmp_path,fname,output,overwrite): os.chdir(tmp_path) r = Result(ref_path/fname) - r.export_setup() + r.export_setup(output,overwrite) + r.export_setup(output,overwrite)