Skip to content

Commit

Permalink
General test updates
Browse files Browse the repository at this point in the history
  • Loading branch information
pc494 committed Sep 2, 2020
1 parent 3d44bb0 commit 969c8ec
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions diffsims/tests/test_generators/test_diffraction_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@


@pytest.fixture(
params=[(300, 0.02, None),]
params=[(300)]
)
def diffraction_calculator(request):
return DiffractionGenerator(*request.param)
return DiffractionGenerator(request.param)


@pytest.fixture(params=[(300, [np.linspace(-1, 1, 10)] * 2)])
Expand Down Expand Up @@ -143,7 +143,6 @@ def test_calculate_profile_class(self, local_structure, diffraction_calculator):

class TestDiffractionCalculatorAtomic:
def test_init(self, diffraction_calculator_atomic: AtomicDiffractionGenerator):
assert diffraction_calculator_atomic.debye_waller_factors == {}
assert len(diffraction_calculator_atomic.detector) == 2

def test_shapes(self, diffraction_calculator_atomic, local_structure, precessed):
Expand Down Expand Up @@ -174,13 +173,13 @@ def test_mode(self, diffraction_calculator_atomic, local_structure):

@pytest.mark.parametrize("scattering_param", scattering_params)
def test_param_check(scattering_param):
generator = DiffractionGenerator(300, 0.2, None, scattering_params=scattering_param)
generator = DiffractionGenerator(300,scattering_params=scattering_param)


@pytest.mark.xfail(raises=NotImplementedError)
def test_invalid_scattering_params():
scattering_param = "_empty"
generator = DiffractionGenerator(300, 0.2, None, scattering_params=scattering_param)
generator = DiffractionGenerator(300,scattering_params=scattering_param)


@pytest.mark.parametrize("shape", [(10, 20), (20, 10)])
Expand All @@ -192,4 +191,4 @@ def test_param_check_atomic(shape):
@pytest.mark.xfail(raises=NotImplementedError)
def test_invalid_scattering_params_atomic():
detector = [np.linspace(-1, 1, 10)] * 2
generator = AtomicDiffractionGenerator(300, detector, debye_waller_factors=True)
generator = AtomicDiffractionGenerator(300, detector)

0 comments on commit 969c8ec

Please sign in to comment.