Skip to content

Commit 8ad7e77

Browse files
committed
Remove superfluous defaults testing
1 parent f2ad88e commit 8ad7e77

10 files changed

+17
-84
lines changed

tests/properties/test_band_gap.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ def test_default_quantities(self):
2626
electronic_band_gap.iri
2727
== 'http://fairmat-nfdi.eu/taxonomy/ElectronicBandGap'
2828
)
29-
assert electronic_band_gap.name == 'ElectronicBandGap'
3029

3130
@pytest.mark.parametrize(
3231
'momentum_transfer, type, result',

tests/properties/test_band_structure.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def test_default_quantities(self, n_bands: Optional[int]):
3333
electronic_eigenvalues.iri
3434
== 'http://fairmat-nfdi.eu/taxonomy/ElectronicEigenvalues'
3535
)
36-
assert electronic_eigenvalues.name == 'ElectronicEigenvalues'
3736

3837
# @pytest.mark.parametrize(
3938
# 'occupation, result',

tests/properties/test_energies.py

Lines changed: 0 additions & 50 deletions
This file was deleted.

tests/properties/test_fermi_surface.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ def test_default_quantities(self, n_bands: Optional[int]):
2424
"""
2525
fermi_surface = FermiSurface(n_bands=n_bands)
2626
assert fermi_surface.iri == 'http://fairmat-nfdi.eu/taxonomy/FermiSurface'
27-
assert fermi_surface.name == 'FermiSurface'

tests/properties/test_forces.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

tests/properties/test_hopping_matrix.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def test_default_quantities(self, n_orbitals: Optional[int], rank: Optional[list
2727
"""
2828
hopping_matrix = HoppingMatrix(n_orbitals=n_orbitals)
2929
assert hopping_matrix.iri == 'http://fairmat-nfdi.eu/taxonomy/HoppingMatrix'
30-
assert hopping_matrix.name == 'HoppingMatrix'
3130

3231

3332
class TestCrystalFieldSplitting:
@@ -51,4 +50,3 @@ def test_default_quantities(self, n_orbitals: Optional[int], rank: Optional[list
5150
assert (
5251
crystal_field.iri == 'http://fairmat-nfdi.eu/taxonomy/CrystalFieldSplitting'
5352
)
54-
assert crystal_field.name == 'CrystalFieldSplitting'

tests/properties/test_permittivity.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ def test_default_quantities(self):
2222
"""
2323
permittivity = Permittivity()
2424
assert permittivity.iri == 'http://fairmat-nfdi.eu/taxonomy/Permittivity'
25-
assert permittivity.name == 'Permittivity'
2625

2726
@pytest.mark.parametrize(
2827
'kmesh_grid, frequency, result',

tests/properties/test_spectral_profile.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def test_default_quantities(self):
3434
electronic_dos.iri
3535
== 'http://fairmat-nfdi.eu/taxonomy/ElectronicDensityOfStates'
3636
)
37-
assert electronic_dos.name == 'ElectronicDensityOfStates'
3837

3938
def test_resolve_energies_origin(self):
4039
"""
@@ -209,24 +208,14 @@ def test_default_quantities(self):
209208
Test the default quantities assigned when creating an instance of the `AbsorptionSpectrum` class.
210209
"""
211210
absorption_spectrum = AbsorptionSpectrum()
212-
assert absorption_spectrum.iri is None # Add iri when available
213-
assert absorption_spectrum.name == 'AbsorptionSpectrum'
211+
assert absorption_spectrum.iri == '' # IRI is empty string by default
214212

215213

216214
class TestXASSpectrum:
217215
"""
218216
Test the `XASSpectrum` class defined in `properties/spectral_profile.py`.
219217
"""
220218

221-
# ! Include this initial `test_default_quantities` method when testing your PhysicalProperty classes
222-
def test_default_quantities(self):
223-
"""
224-
Test the default quantities assigned when creating an instance of the `XASSpectrum` class.
225-
"""
226-
xas_spectrum = XASSpectrum()
227-
assert xas_spectrum.iri is None # Add iri when available
228-
assert xas_spectrum.name == 'XASSpectrum'
229-
230219
@pytest.mark.parametrize(
231220
'xanes_energies, exafs_energies, xas_values',
232221
[

tests/test_physical_properties.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,11 @@ def test_plotting_and_contributions(self):
9191
# Both should be normalized
9292
assert main_property.m_cache.get('_is_normalized', False) is True
9393
assert contribution.m_cache.get('_is_normalized', False) is True
94+
95+
def test_name_setting_during_normalization(self):
96+
"""
97+
Test that the name is set during normalization for PhysicalProperty.
98+
"""
99+
property_obj = PhysicalProperty()
100+
property_obj.normalize(EntryArchive(), logger)
101+
assert property_obj.name == 'PhysicalProperty'

tests/test_variables.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,11 @@ def test_normalize(self, n_points: int, points: list, result: int):
3333
assert variable.get_n_points(logger) == result
3434
variable.normalize(EntryArchive(), logger)
3535
assert variable.n_points == result
36+
37+
def test_name_setting_during_normalization(self):
38+
"""
39+
Test that the name is set during normalization for Variables.
40+
"""
41+
variable = Variables()
42+
variable.normalize(EntryArchive(), logger)
43+
assert variable.name == 'Variables'

0 commit comments

Comments
 (0)