Increase integration test coverage

Author: AndrewSazonov

pixi.toml

@@ -168,7 +168,6 @@ docstring-coverage = 'interrogate -c pyproject.toml src/easydiffraction'
 cov = { depends-on = [
   'docstring-coverage',
   'unit-tests-coverage',
-  'functional-tests-coverage',
   'integration-tests-coverage',
 ] }
 

tests/integration/fitting/conftest.py

@@ -0,0 +1,89 @@
+# SPDX-FileCopyrightText: 2026 EasyScience contributors <https://github.com/easyscience>
+# SPDX-License-Identifier: BSD-3-Clause
+
+"""Shared fixtures for integration tests."""
+
+import tempfile
+
+import pytest
+
+from easydiffraction import ExperimentFactory
+from easydiffraction import Project
+from easydiffraction import StructureFactory
+from easydiffraction import download_data
+
+TEMP_DIR = tempfile.gettempdir()
+
+
+@pytest.fixture(scope='session')
+def lbco_fitted_project():
+    """Build and fit an LBCO CWL project (session-scoped for reuse)."""
+    model = StructureFactory.from_scratch(name='lbco')
+    model.space_group.name_h_m = 'P m -3 m'
+    model.cell.length_a = 3.88
+    model.atom_sites.create(
+        label='La',
+        type_symbol='La',
+        fract_x=0,
+        fract_y=0,
+        fract_z=0,
+        wyckoff_letter='a',
+        occupancy=0.5,
+        b_iso=0.1,
+    )
+    model.atom_sites.create(
+        label='Ba',
+        type_symbol='Ba',
+        fract_x=0,
+        fract_y=0,
+        fract_z=0,
+        wyckoff_letter='a',
+        occupancy=0.5,
+        b_iso=0.1,
+    )
+    model.atom_sites.create(
+        label='Co',
+        type_symbol='Co',
+        fract_x=0.5,
+        fract_y=0.5,
+        fract_z=0.5,
+        wyckoff_letter='b',
+        b_iso=0.1,
+    )
+    model.atom_sites.create(
+        label='O',
+        type_symbol='O',
+        fract_x=0,
+        fract_y=0.5,
+        fract_z=0.5,
+        wyckoff_letter='c',
+        b_iso=0.1,
+    )
+
+    data_path = download_data(id=3, destination=TEMP_DIR)
+    expt = ExperimentFactory.from_data_path(name='hrpt', data_path=data_path)
+    expt.instrument.setup_wavelength = 1.494
+    expt.instrument.calib_twotheta_offset = 0
+    expt.peak.broad_gauss_u = 0.1
+    expt.peak.broad_gauss_v = -0.1
+    expt.peak.broad_gauss_w = 0.2
+    expt.peak.broad_lorentz_x = 0
+    expt.peak.broad_lorentz_y = 0
+    expt.linked_phases.create(id='lbco', scale=5.0)
+    expt.background.create(id='1', x=10, y=170)
+    expt.background.create(id='2', x=165, y=170)
+
+    project = Project()
+    project.structures.add(model)
+    project.experiments.add(expt)
+    project.analysis.current_minimizer = 'lmfit'
+
+    model.cell.length_a.free = True
+    expt.linked_phases['lbco'].scale.free = True
+    expt.instrument.calib_twotheta_offset.free = True
+    expt.background['1'].y.free = True
+    expt.background['2'].y.free = True
+
+    project.analysis.fit(verbosity='silent')
+
+    return project

tests/integration/fitting/test_analysis_display.py

@@ -0,0 +1,95 @@
+# SPDX-FileCopyrightText: 2026 EasyScience contributors <https://github.com/easyscience>
+# SPDX-License-Identifier: BSD-3-Clause
+
+"""Integration tests for Analysis display methods and CIF serialization."""
+
+
+def test_display_all_params(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.display.all_params()
+
+
+def test_display_fittable_params(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.display.fittable_params()
+
+
+def test_display_free_params(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.display.free_params()
+
+
+def test_display_how_to_access_parameters(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.display.how_to_access_parameters()
+
+
+def test_display_parameter_cif_uids(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.display.parameter_cif_uids()
+
+
+def test_display_constraints_empty(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.display.constraints()
+
+
+def test_display_fit_results(lbco_fitted_project):
+    project = lbco_fitted_project
+    assert project.analysis.fit_results is not None
+    project.analysis.display.fit_results()
+
+
+def test_display_as_cif(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.display.as_cif()
+
+
+def test_analysis_as_cif(lbco_fitted_project):
+    project = lbco_fitted_project
+    cif_text = project.analysis.as_cif()
+    assert isinstance(cif_text, str)
+    assert len(cif_text) > 0
+
+
+def test_analysis_help(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.help()
+
+
+def test_show_current_minimizer(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.show_current_minimizer()
+
+
+def test_show_available_minimizers(lbco_fitted_project):
+    from easydiffraction.analysis.analysis import Analysis
+
+    Analysis.show_available_minimizers()
+
+
+def test_show_supported_aliases_types(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.show_supported_aliases_types()
+    project.analysis.show_current_aliases_type()
+
+
+def test_show_supported_constraints_types(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.show_supported_constraints_types()
+    project.analysis.show_current_constraints_type()
+
+
+def test_show_supported_fit_mode_types(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.analysis.show_supported_fit_mode_types()
+    project.analysis.show_current_fit_mode_type()
+
+
+def test_fit_results_attributes(lbco_fitted_project):
+    project = lbco_fitted_project
+    results = project.analysis.fit_results
+    assert results is not None
+    assert results.reduced_chi_square is not None
+    assert results.reduced_chi_square > 0
+    assert isinstance(results.success, bool)

tests/integration/fitting/test_exploration_help.py

@@ -0,0 +1,163 @@
+# SPDX-FileCopyrightText: 2026 EasyScience contributors <https://github.com/easyscience>
+# SPDX-License-Identifier: BSD-3-Clause
+
+"""Integration tests for help(), show_as_cif(), and switchable-category show methods."""
+
+
+def test_project_str(lbco_fitted_project):
+    project = lbco_fitted_project
+    text = str(project)
+    assert 'Project' in text
+    assert '1 structures' in text
+    assert '1 experiments' in text
+
+
+def test_project_help(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.help()
+
+
+def test_project_full_name(lbco_fitted_project):
+    project = lbco_fitted_project
+    assert project.full_name == project.name
+
+
+def test_structure_help(lbco_fitted_project):
+    project = lbco_fitted_project
+    model = project.structures['lbco']
+    model.help()
+
+
+def test_structure_show_as_cif(lbco_fitted_project):
+    project = lbco_fitted_project
+    model = project.structures['lbco']
+    model.show_as_cif()
+
+
+def test_structure_as_cif(lbco_fitted_project):
+    project = lbco_fitted_project
+    model = project.structures['lbco']
+    cif_text = model.as_cif
+    assert isinstance(cif_text, str)
+    assert '_space_group' in cif_text
+
+
+def test_structure_switchable_category_types(lbco_fitted_project):
+    project = lbco_fitted_project
+    model = project.structures['lbco']
+    # Cell
+    model.show_supported_cell_types()
+    model.show_current_cell_type()
+    assert isinstance(model.cell_type, str)
+    # Space group
+    model.show_supported_space_group_types()
+    model.show_current_space_group_type()
+    assert isinstance(model.space_group_type, str)
+    # Atom sites
+    model.show_supported_atom_sites_types()
+    model.show_current_atom_sites_type()
+    assert isinstance(model.atom_sites_type, str)
+
+
+def test_experiment_help(lbco_fitted_project):
+    project = lbco_fitted_project
+    expt = project.experiments['hrpt']
+    expt.help()
+
+
+def test_experiment_show_as_cif(lbco_fitted_project):
+    project = lbco_fitted_project
+    expt = project.experiments['hrpt']
+    expt.show_as_cif()
+
+
+def test_experiment_as_cif(lbco_fitted_project):
+    project = lbco_fitted_project
+    expt = project.experiments['hrpt']
+    cif_text = expt.as_cif
+    assert isinstance(cif_text, str)
+    assert len(cif_text) > 0
+
+
+def test_experiment_switchable_category_types(lbco_fitted_project):
+    project = lbco_fitted_project
+    expt = project.experiments['hrpt']
+    # Instrument
+    expt.show_supported_instrument_types()
+    expt.show_current_instrument_type()
+    assert isinstance(expt.instrument_type, str)
+    # Background
+    expt.show_supported_background_types()
+    expt.show_current_background_type()
+    assert isinstance(expt.background_type, str)
+    # Peak profile
+    expt.show_supported_peak_profile_types()
+    expt.show_current_peak_profile_type()
+    assert isinstance(expt.peak_profile_type, str)
+    # Linked phases
+    expt.show_supported_linked_phases_types()
+    expt.show_current_linked_phases_type()
+    assert isinstance(expt.linked_phases_type, str)
+    # Calculator
+    expt.show_supported_calculator_types()
+    expt.show_current_calculator_type()
+    assert isinstance(expt.calculator_type, str)
+    # Diffrn
+    expt.show_supported_diffrn_types()
+    expt.show_current_diffrn_type()
+    assert isinstance(expt.diffrn_type, str)
+
+
+def test_experiment_data_info(lbco_fitted_project):
+    project = lbco_fitted_project
+    expt = project.experiments['hrpt']
+    # Data access
+    assert expt.data is not None
+    assert expt.data.x is not None
+    assert len(expt.data.x) > 0
+    assert expt.data.intensity_meas is not None
+
+
+def test_structure_cell_properties(lbco_fitted_project):
+    project = lbco_fitted_project
+    model = project.structures['lbco']
+    # Access cell parameters
+    assert model.cell.length_a.value > 0
+    params = model.cell.parameters
+    assert len(params) > 0
+
+
+def test_structure_atom_sites_iteration(lbco_fitted_project):
+    project = lbco_fitted_project
+    model = project.structures['lbco']
+    count = 0
+    for site in model.atom_sites:
+        assert site.label.value is not None
+        assert site.type_symbol.value is not None
+        count += 1
+    assert count == 4
+
+
+def test_structures_collection_names(lbco_fitted_project):
+    project = lbco_fitted_project
+    names = project.structures.names
+    assert 'lbco' in names
+    # Parameters
+    params = project.structures.parameters
+    assert len(params) > 0
+    fittable = project.structures.fittable_parameters
+    assert len(fittable) > 0
+    free = project.structures.free_parameters
+    assert len(free) > 0
+
+
+def test_experiments_collection_names(lbco_fitted_project):
+    project = lbco_fitted_project
+    names = project.experiments.names
+    assert 'hrpt' in names
+    params = project.experiments.parameters
+    assert len(params) > 0
+    fittable = project.experiments.fittable_parameters
+    assert len(fittable) > 0
+    free = project.experiments.free_parameters
+    assert len(free) > 0

tests/integration/fitting/test_plotting.py

@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: 2026 EasyScience contributors <https://github.com/easyscience>
+# SPDX-License-Identifier: BSD-3-Clause
+
+"""Integration tests for the Plotter facade on a fitted project."""
+
+
+def test_plot_meas(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.plotter.plot_meas(expt_name='hrpt')
+
+
+def test_plot_calc(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.plotter.plot_calc(expt_name='hrpt')
+
+
+def test_plot_meas_vs_calc(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.plotter.plot_meas_vs_calc(expt_name='hrpt')
+
+
+def test_plot_meas_with_range(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.plotter.plot_meas(expt_name='hrpt', x_min=20, x_max=80)
+
+
+def test_plot_meas_vs_calc_with_range(lbco_fitted_project):
+    project = lbco_fitted_project
+    project.plotter.plot_meas_vs_calc(expt_name='hrpt', x_min=20, x_max=80)