floodmodeller-api 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

floodmodeller_api/mapping.py

@@ -0,0 +1,84 @@
+from typing import Any
+
+from . import DAT, IED, IEF, INP, LF1, LF2, XML2D, ZZN
+from .backup import File
+from .units import (
+    BLOCKAGE,
+    BRIDGE,
+    COMMENT,
+    CONDUIT,
+    CRUMP,
+    CULVERT,
+    FLAT_V_WEIR,
+    HTBDY,
+    IIC,
+    INTERPOLATE,
+    ORIFICE,
+    OUTFALL,
+    QHBDY,
+    QTBDY,
+    REFHBDY,
+    REPLICATE,
+    RIVER,
+    RNWEIR,
+    SLUICE,
+    SPILL,
+    UNSUPPORTED,
+    WEIR,
+    Variables,
+)
+from .urban1d.conduits import CONDUIT as CONDUIT_URBAN
+from .urban1d.conduits import CONDUITS as CONDUITS_URBAN
+from .urban1d.junctions import JUNCTION, JUNCTIONS
+from .urban1d.losses import LOSS, LOSSES
+from .urban1d.outfalls import OUTFALL as OUTFALL_URBAN
+from .urban1d.outfalls import OUTFALLS as OUTFALLS_URBAN
+from .urban1d.raingauges import RAINGAUGE, RAINGAUGES
+from .urban1d.xsections import XSECTION, XSECTIONS
+
+api_class_mapping: dict[str, Any] = {
+    "floodmodeller_api.dat.DAT": DAT,
+    "floodmodeller_api.ied.IED": IED,
+    "floodmodeller_api.ief.IEF": IEF,
+    "floodmodeller_api.inp.INP": INP,
+    "floodmodeller_api.lf.LF1": LF1,
+    "floodmodeller_api.lf.LF2": LF2,
+    "floodmodeller_api.xml2d.XML2D": XML2D,
+    "floodmodeller_api.zzn.ZZN": ZZN,
+    "floodmodeller_api.backup.File": File,
+    "floodmodeller_api.urban1d.junctions.JUNCTIONS": JUNCTIONS,
+    "floodmodeller_api.urban1d.junctions.JUNCTION": JUNCTION,
+    "floodmodeller_api.urban1d.outfalls.OUTFALLS": OUTFALLS_URBAN,
+    "floodmodeller_api.urban1d.outfalls.OUTFALL": OUTFALL_URBAN,
+    "floodmodeller_api.urban1d.raingauges.RAINGAUGES": RAINGAUGES,
+    "floodmodeller_api.urban1d.raingauges.RAINGAUGE": RAINGAUGE,
+    "floodmodeller_api.urban1d.conduits.CONDUITS": CONDUITS_URBAN,
+    "floodmodeller_api.urban1d.conduits.CONDUIT": CONDUIT_URBAN,
+    "floodmodeller_api.urban1d.losses.LOSSES": LOSSES,
+    "floodmodeller_api.urban1d.losses.LOSS": LOSS,
+    "floodmodeller_api.urban1d.xsections.XSECTIONS": XSECTIONS,
+    "floodmodeller_api.urban1d.xsections.XSECTION": XSECTION,
+    "floodmodeller_api.units.boundaries.HTBDY": HTBDY,
+    "floodmodeller_api.units.boundaries.QHBDY": QHBDY,
+    "floodmodeller_api.units.boundaries.QTBDY": QTBDY,
+    "floodmodeller_api.units.boundaries.REFHBDY": REFHBDY,
+    "floodmodeller_api.units.comment.COMMENT": COMMENT,
+    "floodmodeller_api.units.conduits.CONDUIT": CONDUIT,
+    "floodmodeller_api.units.iic.IIC": IIC,
+    "floodmodeller_api.units.losses.BLOCKAGE": BLOCKAGE,
+    "floodmodeller_api.units.losses.CULVERT": CULVERT,
+    "floodmodeller_api.units.sections.INTERPOLATE": INTERPOLATE,
+    "floodmodeller_api.units.sections.REPLICATE": REPLICATE,
+    "floodmodeller_api.units.sections.RIVER": RIVER,
+    "floodmodeller_api.units.structures.BRIDGE": BRIDGE,
+    "floodmodeller_api.units.structures.CRUMP": CRUMP,
+    "floodmodeller_api.units.structures.FLAT_V_WEIR": FLAT_V_WEIR,
+    "floodmodeller_api.units.structures.ORIFICE": ORIFICE,
+    "floodmodeller_api.units.structures.OUTFALL": OUTFALL,
+    "floodmodeller_api.units.structures.RNWEIR": RNWEIR,
+    "floodmodeller_api.units.structures.SLUICE": SLUICE,
+    "floodmodeller_api.units.structures.SPILL": SPILL,
+    "floodmodeller_api.units.structures.WEIR": WEIR,
+    "floodmodeller_api.units.unsupported.UNSUPPORTED": UNSUPPORTED,
+    "floodmodeller_api.units.variables.Variables": Variables,
+}

floodmodeller_api/test/__init__.py

@@ -1,4 +1,4 @@
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))

floodmodeller_api/test/conftest.py

@@ -1,8 +1,9 @@
-import os
-
-import pytest
-
-
-@pytest.fixture(scope="session")
-def test_workspace():
-    return os.path.join(os.path.dirname(__file__), "test_data")
+import os
+from pathlib import Path
+
+import pytest
+
+
+@pytest.fixture(scope="session")
+def test_workspace():
+    return Path(os.path.dirname(__file__), "test_data")

floodmodeller_api/test/test_backup.py

@@ -1,117 +1,117 @@
-from pathlib import Path
-
-import pandas as pd
-import pytest
-
-from floodmodeller_api.backup import BackupControl, File
-
-
-@pytest.fixture
-def backup_control():
-    # Use a different directory for testing
-    return BackupControl()
-
-
-@pytest.fixture
-def file(test_workspace):
-    test_file = Path(test_workspace, "EX1.DAT")
-    file = File(test_file)
-    # Make a backup to clear in test
-    file.backup()
-    return file
-
-
-def test_init_backup(backup_control):
-    """Has the backup been initialised correctly?"""
-    assert backup_control.backup_dir.exists()
-    assert backup_control.backup_csv_path.exists()
-
-
-def test_generate_file_id(file, test_workspace):
-    """Does this generate a consistent file ID for the same file on disk?"""
-    # Test that the file ID is the same for the same path input
-    file1 = File(Path(test_workspace, "EX1.DAT"))
-    file2 = File(Path(test_workspace, "EX1.DAT"))
-    assert file1.file_id == file2.file_id
-
-
-def test_clear_backup(file, test_workspace):
-    """
-    Does the the clear_backup method work correctly
-    """
-    # Clearing backup -------------------
-    # Load a different file to check it isn't affected by the
-    other_file = File(Path(test_workspace, "EX3.DAT"))
-    # Assert there is a backup for the other file
-    other_file.backup()
-    # Clear the backups for the file to test backup functionality
-    file.clear_backup()
-    # Assert that clearing the backup has worked - there aren't any backups for the file
-    assert len(file.list_backups()) == 0
-    # And that clearing it hasn't affected backups for the other file
-    assert len(other_file.list_backups()) > 0
-
-
-def test_backup_locations(file):
-    """
-    Does it make a backup in the right place?
-    """
-    # Making a backup --------------------
-    file.clear_backup()
-    # make a backup and check if file exists
-    file.backup()
-    backup_file_path = Path(file.backup_dir, file.backup_filename)
-    assert backup_file_path.exists()
-    # check if contents of backup file match the original file
-    with open(backup_file_path, "r") as f1, open(file.path, "r") as f2:
-        assert f1.read() == f2.read()
-
-
-def test_no_duplicate_backup(file, test_workspace):
-    """The backup method should only backup if the file has changed"""
-    # Don't Make Duplicate -------------------
-    # Check that the file isn't backed up again if it hasn't changed
-    the_same_file = File(Path(test_workspace, "EX1.DAT"))
-    # Append something to the dttm string to ensure the filename is different to the previous backup
-    # If the two File objects are created in the same second then then will have identical file names
-    # The function should check for equivalence between file contents.
-    the_same_file.dttm_str = the_same_file.dttm_str + "_1"
-    # Generate a new file name
-    the_same_file._generate_file_name()
-    # Attempt a backup
-    the_same_file.backup()
-    # Check that the file hasn't been created
-    duplicate_backup_path = Path(the_same_file.backup_dir, the_same_file.backup_filename)
-    assert not duplicate_backup_path.exists()
-
-
-def test_backup_logs(file):
-    """Are backups being logged in the CSV?"""
-    # Clear the backup
-    file.clear_backup()
-    # There shouldn't be any edits in the csv
-    backup_logs = pd.read_csv(file.backup_csv_path)
-    backup_count = backup_logs[
-        (backup_logs.file_id == file.file_id) & (backup_logs.dttm == file.dttm_str)
-    ].shape[0]
-    assert backup_count == 0
-    # Make a backup and assert it is in the CSV
-    file.backup()
-    # Check edits to the backup CSV
-    # Check a row has been added to the csv for the file & version
-    backup_logs = pd.read_csv(file.backup_csv_path)
-    backup_count = backup_logs[
-        (backup_logs.file_id == file.file_id) & (backup_logs.dttm == file.dttm_str)
-    ].shape[0]
-    assert backup_count == 1
-
-
-def test_list_backups(file):
-    """Does the list backups method work correctly?"""
-    # First clear any backups that exist
-    file.clear_backup()
-    # make a backup and check if it appears in the backup list
-    file.backup()
-    backups = file.list_backups()
-    expected_backup = Path(file.backup_dir, file.backup_filename)
-    assert expected_backup in [backup.path for backup in backups]
+from pathlib import Path
+
+import pandas as pd
+import pytest
+
+from floodmodeller_api.backup import BackupControl, File
+
+
+@pytest.fixture
+def backup_control():
+    # Use a different directory for testing
+    return BackupControl()
+
+
+@pytest.fixture
+def file(test_workspace):
+    test_file = Path(test_workspace, "EX1.DAT")
+    file = File(test_file)
+    # Make a backup to clear in test
+    file.backup()
+    return file
+
+
+def test_init_backup(backup_control):
+    """Has the backup been initialised correctly?"""
+    assert backup_control.backup_dir.exists()
+    assert backup_control.backup_csv_path.exists()
+
+
+def test_generate_file_id(file, test_workspace):
+    """Does this generate a consistent file ID for the same file on disk?"""
+    # Test that the file ID is the same for the same path input
+    file1 = File(Path(test_workspace, "EX1.DAT"))
+    file2 = File(Path(test_workspace, "EX1.DAT"))
+    assert file1.file_id == file2.file_id
+
+
+def test_clear_backup(file, test_workspace):
+    """
+    Does the the clear_backup method work correctly
+    """
+    # Clearing backup -------------------
+    # Load a different file to check it isn't affected by the
+    other_file = File(Path(test_workspace, "EX3.DAT"))
+    # Assert there is a backup for the other file
+    other_file.backup()
+    # Clear the backups for the file to test backup functionality
+    file.clear_backup()
+    # Assert that clearing the backup has worked - there aren't any backups for the file
+    assert len(file.list_backups()) == 0
+    # And that clearing it hasn't affected backups for the other file
+    assert len(other_file.list_backups()) > 0
+
+
+def test_backup_locations(file):
+    """
+    Does it make a backup in the right place?
+    """
+    # Making a backup --------------------
+    file.clear_backup()
+    # make a backup and check if file exists
+    file.backup()
+    backup_file_path = Path(file.backup_dir, file.backup_filename)
+    assert backup_file_path.exists()
+    # check if contents of backup file match the original file
+    with open(backup_file_path) as f1, open(file.path) as f2:
+        assert f1.read() == f2.read()
+
+
+def test_no_duplicate_backup(file, test_workspace):
+    """The backup method should only backup if the file has changed"""
+    # Don't Make Duplicate -------------------
+    # Check that the file isn't backed up again if it hasn't changed
+    the_same_file = File(Path(test_workspace, "EX1.DAT"))
+    # Append something to the dttm string to ensure the filename is different to the previous backup
+    # If the two File objects are created in the same second then then will have identical file names
+    # The function should check for equivalence between file contents.
+    the_same_file.dttm_str = the_same_file.dttm_str + "_1"
+    # Generate a new file name
+    the_same_file._generate_file_name()
+    # Attempt a backup
+    the_same_file.backup()
+    # Check that the file hasn't been created
+    duplicate_backup_path = Path(the_same_file.backup_dir, the_same_file.backup_filename)
+    assert not duplicate_backup_path.exists()
+
+
+def test_backup_logs(file):
+    """Are backups being logged in the CSV?"""
+    # Clear the backup
+    file.clear_backup()
+    # There shouldn't be any edits in the csv
+    backup_logs = pd.read_csv(file.backup_csv_path)
+    backup_count = backup_logs[
+        (backup_logs.file_id == file.file_id) & (backup_logs.dttm == file.dttm_str)
+    ].shape[0]
+    assert backup_count == 0
+    # Make a backup and assert it is in the CSV
+    file.backup()
+    # Check edits to the backup CSV
+    # Check a row has been added to the csv for the file & version
+    backup_logs = pd.read_csv(file.backup_csv_path)
+    backup_count = backup_logs[
+        (backup_logs.file_id == file.file_id) & (backup_logs.dttm == file.dttm_str)
+    ].shape[0]
+    assert backup_count == 1
+
+
+def test_list_backups(file):
+    """Does the list backups method work correctly?"""
+    # First clear any backups that exist
+    file.clear_backup()
+    # make a backup and check if it appears in the backup list
+    file.backup()
+    backups = file.list_backups()
+    expected_backup = Path(file.backup_dir, file.backup_filename)
+    assert expected_backup in [backup.path for backup in backups]

floodmodeller_api/test/test_dat.py

@@ -1,92 +1,221 @@
-import os
-from pathlib import Path
-
-import pytest
-
-from floodmodeller_api import DAT
-from floodmodeller_api.units import QTBDY
-
-
-@pytest.fixture
-def dat_fp(test_workspace):
-    return os.path.join(test_workspace, "network.DAT")
-
-
-@pytest.fixture
-def data_before(dat_fp):
-    return DAT(dat_fp)._write()
-
-
-def test_dat_str_not_changed_by_write(dat_fp, data_before):
-    # TODO: Update this test - it isn't really testing anything since the behaviour of the fixture is exactly the same
-    """DAT: Test str representation equal to dat file with no changes"""
-    dat = DAT(dat_fp)
-    assert dat._write() == data_before
-
-
-def test_changing_section_and_dist_works(dat_fp, data_before):
-    """DAT: Test changing and reverting section name and dist to next makes no changes"""
-    dat = DAT(dat_fp)
-    prev_name = dat.sections["CSRD10"].name
-    prev_dist = dat.sections["CSRD10"].dist_to_next
-    dat.sections["CSRD10"].name = "check"
-    dat.sections["CSRD10"].dist_to_next = 0.0
-    assert dat._write() != data_before
-
-    dat.sections["check"].name = prev_name
-    dat.sections["check"].dist_to_next = prev_dist
-    assert dat._write() == data_before
-
-
-def test_changing_and_reverting_qtbdy_hydrograph_works(dat_fp, data_before):
-    """DAT: Test changing and reverting QTBDY hydrograph makes no changes"""
-    dat = DAT(dat_fp)
-    prev_qt = {}
-    for name, unit in dat.boundaries.items():
-        if isinstance(unit, QTBDY):
-            prev_qt[name] = unit.data.copy()
-            unit.data *= 2  # Multiply QT flow data by 2
-    assert dat._write() != data_before
-
-    for name, qt in prev_qt.items():
-        dat.boundaries[name].data = qt  # replace QT flow data with original
-    assert dat._write() == data_before
-
-
-def test_dat_read_doesnt_change_data(test_workspace):
-    """DAT: Check all '.dat' files in folder by reading the _write() output into a new DAT instance and checking it stays the same."""
-    for datfile in Path(test_workspace).glob("*.dat"):
-        dat = DAT(datfile)
-        first_output = dat._write()
-        dat.save("__temp.dat")
-        second_dat = DAT("__temp.dat")
-        assert dat == second_dat  # Checks equivalence on the class itself
-        second_output = second_dat._write()
-        assert first_output == second_output
-        os.remove("__temp.dat")
-    try:
-        os.remove("__temp.gxy")
-    except FileNotFoundError:
-        pass
-
-
-def test_insert_unit(test_workspace):
-    dat_a = DAT(Path(test_workspace, "EX3.DAT"))
-    dat_b = DAT(Path(Path(test_workspace, "EX6.DAT")))
-    unit = dat_a.sections["20"]
-    dat_b.insert_unit(unit, add_before=dat_b.sections["P4000"])
-    # Check unit is added to sections
-    assert "20" in dat_b.sections
-    # Check unit in correct position in all units
-    assert dat_b._all_units[8:10] == [unit, dat_b.sections["P4000"]]
-
-
-def test_remove_unit(test_workspace):
-    dat_a = DAT(Path(test_workspace, "EX3.DAT"))
-    unit = dat_a.sections["20"]
-    prev_dat_struct_len = len(dat_a._dat_struct)
-    dat_a.remove_unit(unit)
-    assert "20" not in dat_a.sections
-    assert unit not in dat_a._all_units
-    assert [u for u in dat_a._dat_struct]
-    assert (prev_dat_struct_len - len(dat_a._dat_struct)) == 1
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from floodmodeller_api import DAT
+from floodmodeller_api.units import QTBDY
+
+
+@pytest.fixture
+def dat_fp(test_workspace):
+    return Path(test_workspace, "network.dat")
+
+
+@pytest.fixture
+def data_before(dat_fp):
+    return DAT(dat_fp)._write()
+
+
+@pytest.fixture()
+def dat_ex3(test_workspace):
+    return DAT(Path(test_workspace, "EX3.DAT"))
+
+
+@pytest.fixture()
+def units(dat_ex3):
+    unit_1 = dat_ex3.sections["20"]
+    unit_2 = dat_ex3.sections["40"]
+    unit_3 = dat_ex3.sections["60"]
+    return [unit_1, unit_2, unit_3]
+
+
+@pytest.fixture()
+def dat_ex6(test_workspace):
+    dat = DAT(Path(test_workspace, "EX6.DAT"))
+    with (
+        patch.object(dat, "_update_raw_data", wraps=dat._update_raw_data),
+        patch.object(dat, "_update_dat_struct", wraps=dat._update_dat_struct),
+    ):
+        yield dat
+
+
+def test_dat_str_not_changed_by_write(dat_fp, data_before):
+    # TODO: Update this test - it isn't really testing anything since the behaviour of the fixture is exactly the same
+    """DAT: Test str representation equal to dat file with no changes"""
+    dat = DAT(dat_fp)
+    assert dat._write() == data_before
+
+
+def test_changing_section_and_dist_works(dat_fp, data_before):
+    """DAT: Test changing and reverting section name and dist to next makes no changes"""
+    dat = DAT(dat_fp)
+    prev_name = dat.sections["CSRD10"].name
+    prev_dist = dat.sections["CSRD10"].dist_to_next
+    dat.sections["CSRD10"].name = "check"
+    dat.sections["CSRD10"].dist_to_next = 0.0
+    assert dat._write() != data_before
+
+    dat.sections["check"].name = prev_name
+    dat.sections["check"].dist_to_next = prev_dist
+    assert dat._write() == data_before
+
+
+def test_changing_and_reverting_qtbdy_hydrograph_works(dat_fp, data_before):
+    """DAT: Test changing and reverting QTBDY hydrograph makes no changes"""
+    dat = DAT(dat_fp)
+    prev_qt = {}
+    for name, unit in dat.boundaries.items():
+        if isinstance(unit, QTBDY):
+            prev_qt[name] = unit.data.copy()
+            unit.data *= 2  # Multiply QT flow data by 2
+    assert dat._write() != data_before
+
+    for name, qt in prev_qt.items():
+        dat.boundaries[name].data = qt  # replace QT flow data with original
+    assert dat._write() == data_before
+
+
+def test_dat_read_doesnt_change_data(test_workspace, tmpdir):
+    """DAT: Check all '.dat' files in folder by reading the _write() output into a new DAT instance and checking it stays the same."""
+    for datfile in Path(test_workspace).glob("*.dat"):
+        dat = DAT(datfile)
+        first_output = dat._write()
+        new_path = Path(tmpdir) / "tmp.dat"
+        dat.save(new_path)
+        second_dat = DAT(new_path)
+        assert dat == second_dat  # Checks equivalence on the class itself
+        second_output = second_dat._write()
+        assert first_output == second_output
+
+
+def test_insert_unit_before(units, dat_ex6):
+    dat_ex6.insert_unit(units[0], add_before=dat_ex6.sections["P4000"])
+    assert "20" in dat_ex6.sections
+    assert dat_ex6._all_units[8:10] == [units[0], dat_ex6.sections["P4000"]]
+    dat_ex6._update_raw_data.assert_called_once()
+    dat_ex6._update_dat_struct.assert_called_once()
+
+
+def test_insert_unit_after(units, dat_ex6):
+    dat_ex6.insert_unit(units[0], add_after=dat_ex6.sections["P4000"])
+    assert "20" in dat_ex6.sections
+    assert dat_ex6._all_units[8:10] == [dat_ex6.sections["P4000"], units[0]]
+    dat_ex6._update_raw_data.assert_called_once()
+    dat_ex6._update_dat_struct.assert_called_once()
+
+
+def test_insert_unit_at(units, dat_ex6):
+    dat_ex6.insert_unit(units[0], add_at=2)
+    assert "20" in dat_ex6.sections
+    assert dat_ex6._all_units[2] == units[0]
+    dat_ex6._update_raw_data.assert_called_once()
+    dat_ex6._update_dat_struct.assert_called_once()
+
+
+@pytest.mark.parametrize(
+    "kwargs",
+    [
+        {"add_at": 1, "add_before": 2},
+        {"add_at": 1, "add_after": 3},
+        {"add_before": 2, "add_after": 3},
+        {"add_at": 1, "add_before": 2, "add_after": 3},
+    ],
+)
+def test_insert_unit_too_many_arguments_error(dat_ex6, units, kwargs):
+    msg = (
+        r"\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+        r"\nAPI Error: Problem encountered when trying to insert unit DAT file .*\."
+        r"\n"
+        r"\nDetails: .*-floodmodeller_api/dat\.py-\d+"
+        r"\nMsg: Only one of add_at, add_before, or add_after required"
+        r"\n"
+        r"\nFor additional support, go to: https://github\.com/People-Places-Solutions/floodmodeller-api"
+    )
+    with pytest.raises(Exception, match=msg):
+        dat_ex6.insert_unit(units[0], **kwargs)
+
+
+def test_insert_unit_no_arguments_error(dat_ex6, units):
+    msg = (
+        r"\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+        r"\nAPI Error: Problem encountered when trying to insert unit DAT file .*\."
+        r"\n"
+        r"\nDetails: .*-floodmodeller_api/dat\.py-\d+"
+        r"\nMsg: No positional argument given\. Please provide either add_before, add_at or add_after"
+        r"\n"
+        r"\nFor additional support, go to: https://github\.com/People-Places-Solutions/floodmodeller-api"
+    )
+    with pytest.raises(Exception, match=msg):
+        dat_ex6.insert_unit(units[0])
+
+
+def test_insert_units_before(units, dat_ex6):
+    dat_ex6.insert_units(units, add_before=dat_ex6.sections["P4000"])
+    assert "20" in dat_ex6.sections
+    assert "40" in dat_ex6.sections
+    assert "60" in dat_ex6.sections
+    assert dat_ex6._all_units[8:12] == [*units, dat_ex6.sections["P4000"]]
+    dat_ex6._update_raw_data.assert_called_once()
+    dat_ex6._update_dat_struct.assert_called_once()
+
+
+def test_insert_units_after(units, dat_ex6):
+    dat_ex6.insert_units(units, add_after=dat_ex6.sections["P4000"])
+    assert "20" in dat_ex6.sections
+    assert "40" in dat_ex6.sections
+    assert "60" in dat_ex6.sections
+    assert dat_ex6._all_units[8:12] == [dat_ex6.sections["P4000"], *units]
+    dat_ex6._update_raw_data.assert_called_once()
+    dat_ex6._update_dat_struct.assert_called_once()
+
+
+def test_insert_units_at(units, dat_ex6):
+    dat_ex6.insert_units(units, add_at=2)
+    assert "20" in dat_ex6.sections
+    assert "40" in dat_ex6.sections
+    assert "60" in dat_ex6.sections
+    assert dat_ex6._all_units[2:5] == units
+    dat_ex6._update_raw_data.assert_called_once()
+    dat_ex6._update_dat_struct.assert_called_once()
+
+
+def test_insert_units_at_end(units, dat_ex6):
+    dat_ex6.insert_units(units, add_at=-1)
+    assert "20" in dat_ex6.sections
+    assert "40" in dat_ex6.sections
+    assert "60" in dat_ex6.sections
+    assert dat_ex6._all_units[-3:] == units
+    dat_ex6._update_raw_data.assert_called_once()
+    dat_ex6._update_dat_struct.assert_called_once()
+
+
+def test_remove_unit(dat_ex3):
+    unit = dat_ex3.sections["20"]
+    prev_dat_struct_len = len(dat_ex3._dat_struct)
+    dat_ex3.remove_unit(unit)
+    assert "20" not in dat_ex3.sections
+    assert unit not in dat_ex3._all_units
+    assert dat_ex3._dat_struct
+    assert (prev_dat_struct_len - len(dat_ex3._dat_struct)) == 1
+
+
+def test_diff(test_workspace, capsys):
+    dat_ex4 = DAT(Path(test_workspace, "ex4.DAT"))
+    dat_ex4_changed = DAT(Path(test_workspace, "ex4_changed.DAT"))
+    dat_ex4.diff(dat_ex4_changed)
+    assert capsys.readouterr().out == (
+        "Files not equivalent, 12 difference(s) found:\n"
+        "  DAT->structures->MILLAu->RNWEIR..MILLAu->upstream_crest_height:  1.07 != 1.37\n"
+        "  DAT->structures->MILLBu->RNWEIR..MILLBu->upstream_crest_height:  0.43 != 0.73\n"
+        "  DAT->structures->ROAD1->RNWEIR..ROAD1->upstream_crest_height:  2.02 != 2.32\n"
+        "  DAT->structures->RAILRDu->RNWEIR..RAILRDu->upstream_crest_height:  1.75 != 2.05\n"
+        "  DAT->structures->CSRD01u->RNWEIR..CSRD01u->upstream_crest_height:  0.81 != 1.11\n"
+        "  DAT->structures->FOOTa->RNWEIR..FOOTa->upstream_crest_height:  2.47 != 2.77\n"
+        "  DAT->_all_units->itm[28]->RNWEIR..MILLAu->upstream_crest_height:  1.07 != 1.37\n"
+        "  DAT->_all_units->itm[29]->RNWEIR..MILLBu->upstream_crest_height:  0.43 != 0.73\n"
+        "  DAT->_all_units->itm[42]->RNWEIR..ROAD1->upstream_crest_height:  2.02 != 2.32\n"
+        "  DAT->_all_units->itm[57]->RNWEIR..RAILRDu->upstream_crest_height:  1.75 != 2.05\n"
+        "  DAT->_all_units->itm[61]->RNWEIR..CSRD01u->upstream_crest_height:  0.81 != 1.11\n"
+        "  DAT->_all_units->itm[73]->RNWEIR..FOOTa->upstream_crest_height:  2.47 != 2.77\n"
+    )