Skip to content

Commit 56ed6d8

Browse files
committed
changed unit tests
1 parent 81d6721 commit 56ed6d8

1 file changed

Lines changed: 9 additions & 31 deletions

File tree

‎tests/unit/CodeEntropy/levels/test_axes.py‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,8 @@ def _select_atoms(q):
103103

104104
u.select_atoms.side_effect = _select_atoms
105105

106-
monkeypatch.setattr(ax, "get_UA_masses", lambda mol: [10.0, 12.0])
107-
monkeypatch.setattr(ax, "get_moment_of_inertia_tensor", lambda **kwargs: np.eye(3))
108106
monkeypatch.setattr(
109-
ax,
110-
"get_principal_axes_from_tensor",
111-
lambda moi: (np.eye(3), np.array([3.0, 2.0, 1.0])),
107+
ax, "get_molecule_axes", lambda molecule: (np.eye(3), np.array([3.0, 2.0, 1.0]))
112108
)
113109

114110
trans, rot, center, moi = ax.get_residue_axes(u, index=7, relative_index=0)
@@ -142,9 +138,7 @@ def _select_atoms(q):
142138

143139
monkeypatch.setattr("CodeEntropy.levels.axes.make_whole", lambda _ag: None)
144140
monkeypatch.setattr(
145-
ax,
146-
"get_moment_of_inertia_tensor",
147-
lambda **kwargs: np.array([[9.0, 0.0, 0.0], [0.0, 8.0, 0.0], [0.0, 0.0, 7.0]]),
141+
ax, "get_molecule_axes", lambda molecule: (np.eye(3), np.array([9.0, 8.0, 7.0]))
148142
)
149143

150144
trans, rot, center, moi = ax.get_residue_axes(u, index=10, relative_index=0)
@@ -638,12 +632,10 @@ def _select_atoms(q):
638632

639633
u.select_atoms.side_effect = _select_atoms
640634

641-
monkeypatch.setattr(ax, "get_UA_masses", lambda mol: [10.0, 12.0])
642-
monkeypatch.setattr(ax, "get_moment_of_inertia_tensor", lambda **kwargs: np.eye(3))
643635
monkeypatch.setattr(
644636
ax,
645-
"get_principal_axes_from_tensor",
646-
lambda moi: (np.eye(3), np.array([3.0, 2.0, 1.0])),
637+
"get_molecule_axes",
638+
lambda molecule: (2 * np.eye(3), np.array([3.0, 2.0, 1.0])),
647639
)
648640

649641
trans, rot, center, moi = ax.get_residue_axes(u, index=7, relative_index=0)
@@ -678,14 +670,14 @@ def _select_atoms(q):
678670

679671
monkeypatch.setattr(
680672
ax,
681-
"get_moment_of_inertia_tensor",
682-
lambda **kwargs: np.array([[9.0, 0.0, 0.0], [0.0, 8.0, 0.0], [0.0, 0.0, 7.0]]),
673+
"get_molecule_axes",
674+
lambda molecule: (2 * np.eye(3), np.array([9.0, 8.0, 7.0])),
683675
)
684676

685677
trans, rot, center, moi = ax.get_residue_axes(u, index=10, relative_index=0)
686678

687-
assert np.allclose(trans, np.eye(3))
688-
assert np.allclose(rot, np.eye(3))
679+
assert np.allclose(trans, 2 * np.eye(3))
680+
assert np.allclose(rot, 2 * np.eye(3))
689681
assert np.allclose(center, np.array([1.0, 2.0, 3.0]))
690682
assert np.allclose(moi, np.array([9.0, 8.0, 7.0]))
691683

@@ -937,11 +929,9 @@ def test_get_residue_axes_from_topology_no_neighbor_bonds_uses_cached_indices(
937929
has_neighbor_bonds=False,
938930
)
939931

940-
get_tensor = MagicMock(return_value=np.eye(3))
941932
get_principal = MagicMock(return_value=(np.eye(3) * 2.0, np.array([3.0, 2.0, 1.0])))
942933

943-
monkeypatch.setattr(ax, "get_moment_of_inertia_tensor", get_tensor)
944-
monkeypatch.setattr(ax, "get_principal_axes_from_tensor", get_principal)
934+
monkeypatch.setattr(ax, "get_molecule_axes", get_principal)
945935

946936
box = np.array([20.0, 30.0, 40.0])
947937
trans_axes, rot_axes, center, moi = ax.get_residue_axes_from_topology(
@@ -956,18 +946,6 @@ def test_get_residue_axes_from_topology_no_neighbor_bonds_uses_cached_indices(
956946
np.testing.assert_allclose(rot_axes, np.eye(3) * 2.0)
957947
np.testing.assert_allclose(center, np.array([9.0, 8.0, 7.0]))
958948
np.testing.assert_allclose(moi, np.array([3.0, 2.0, 1.0]))
959-
960-
tensor_kwargs = get_tensor.call_args.kwargs
961-
np.testing.assert_allclose(
962-
tensor_kwargs["center_of_mass"],
963-
np.array([9.0, 8.0, 7.0]),
964-
)
965-
np.testing.assert_allclose(
966-
tensor_kwargs["positions"],
967-
np.array([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]),
968-
)
969-
np.testing.assert_allclose(tensor_kwargs["masses"], np.array([13.0, 14.0]))
970-
np.testing.assert_allclose(tensor_kwargs["dimensions"], box)
971949
get_principal.assert_called_once()
972950

973951

0 commit comments

Comments
 (0)