test fixes and refactoring

ISISNeutronMuon · Jan 15, 2024 · cd86819 · cd86819
1 parent e3f0d8f
commit cd86819
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 104 deletions.
diff --git a/MDANSE/Src/MDANSE/Framework/Units.py b/MDANSE/Src/MDANSE/Framework/Units.py
@@ -161,7 +161,7 @@ def __add__(self, other):
         else:
             raise UnitError("Incompatible units")
 
-    def __div__(self, other):
+    def __truediv__(self, other):
         """Divide _Unit instances.
 
         >>> print(measure(100, 'V') / measure(10, 'kohm'))

diff --git a/MDANSE/Src/MDANSE/MolecularDynamics/TrajectoryUtils.py b/MDANSE/Src/MDANSE/MolecularDynamics/TrajectoryUtils.py
@@ -212,7 +212,7 @@ def build_connectivity(
         elif isinstance(ce, AtomCluster):
             atom_clusters.append(ce)
         else:
-            if ce.number_of_atoms() == 1:
+            if ce.number_of_atoms == 1:
                 single_atoms_objects.extend(ce.atom_list)
 
     if single_atoms_objects:

diff --git a/MDANSE/Tests/UnitTests/AllTests.py b/MDANSE/Tests/UnitTests/AllTests.py
diff --git a/MDANSE/Tests/UnitTests/select_atoms.py b/MDANSE/Tests/UnitTests/select_atoms.py
diff --git a/MDANSE/Tests/UnitTests/TestDatabases.py → MDANSE/Tests/UnitTests/test_databases.py b/MDANSE/Tests/UnitTests/TestDatabases.py → MDANSE/Tests/UnitTests/test_databases.py
@@ -684,17 +684,3 @@ def test_save(self):
             RESIDUES_DATABASE.save()
             op.assert_called_with(RESIDUES_DATABASE._USER_DATABASE, "w")
             dump.assert_called_with(self.data, ANY)
-
-
-def suite():
-    loader = unittest.TestLoader()
-    s = unittest.TestSuite()
-    s.addTest(loader.loadTestsFromTestCase(TestAtomsDatabase))
-    s.addTest(loader.loadTestsFromTestCase(TestMoleculesDatabase))
-    s.addTest(loader.loadTestsFromTestCase(TestNucleotidesDatabase))
-    s.addTest(loader.loadTestsFromTestCase(TestResiduesDatabase))
-    return s
-
-
-if __name__ == "__main__":
-    unittest.main(verbosity=2)
diff --git a/MDANSE/Tests/UnitTests/TestGeometry.py → MDANSE/Tests/UnitTests/test_geometry.py b/MDANSE/Tests/UnitTests/TestGeometry.py → MDANSE/Tests/UnitTests/test_geometry.py
@@ -88,14 +88,3 @@ def test_center_of_mass(self):
                 numpy.array([0.5, 0.5, 0.0], dtype=numpy.float64),
             )
         )
-
-
-def suite():
-    loader = unittest.TestLoader()
-    s = unittest.TestSuite()
-    s.addTest(loader.loadTestsFromTestCase(TestGeometry))
-    return s
-
-
-if __name__ == "__main__":
-    unittest.main(verbosity=2)
diff --git a/.../Tests/UnitTests/TestMolecularDynamics.py → ...ests/UnitTests/test_molecular_dynamics.py b/.../Tests/UnitTests/TestMolecularDynamics.py → ...ests/UnitTests/test_molecular_dynamics.py
@@ -135,14 +135,3 @@ def test_mean_square_fluctuation(self):
         )
 
         self.assertEqual(mean_square_fluctuation(coords, root=False), 0.75)
-
-
-def suite():
-    loader = unittest.TestLoader()
-    s = unittest.TestSuite()
-    s.addTest(loader.loadTestsFromTestCase(TestMolecularDynamics))
-    return s
-
-
-if __name__ == "__main__":
-    unittest.main(verbosity=2)
diff --git a/...SE/Tests/UnitTests/TestTrajectoryUtils.py → .../Tests/UnitTests/test_trajectory_utils.py b/...SE/Tests/UnitTests/TestTrajectoryUtils.py → .../Tests/UnitTests/test_trajectory_utils.py
diff --git a/MDANSE/Tests/UnitTests/TestUnitCell.py → MDANSE/Tests/UnitTests/test_unit_cell.py b/MDANSE/Tests/UnitTests/TestUnitCell.py → MDANSE/Tests/UnitTests/test_unit_cell.py
@@ -89,14 +89,3 @@ def test_transposed_matrices(self):
 
     def test_volume(self):
         self.assertAlmostEqual(1, self.cell.volume)
-
-
-def suite():
-    loader = unittest.TestLoader()
-    s = unittest.TestSuite()
-    s.addTest(loader.loadTestsFromTestCase(TestUnitCell))
-    return s
-
-
-if __name__ == "__main__":
-    unittest.main(verbosity=2)
diff --git a/MDANSE/Tests/UnitTests/TestUnits.py → MDANSE/Tests/UnitTests/test_units.py b/MDANSE/Tests/UnitTests/TestUnits.py → MDANSE/Tests/UnitTests/test_units.py
@@ -212,14 +212,3 @@ def test_equivalent_units(self):
 
         m = measure(1.0, "eV", equivalent=False)
         self.assertRaises(UnitError, m.toval, "THz")
-
-
-def suite():
-    loader = unittest.TestLoader()
-    s = unittest.TestSuite()
-    s.addTest(loader.loadTestsFromTestCase(TestUnits))
-    return s
-
-
-if __name__ == "__main__":
-    unittest.main(verbosity=2)