Merge pull request #125 from rigdenlab/test_fixes

Fixed test cases for Oleg
rigdenlab · Feb 17, 2020 · 6662e3c · 6662e3c
2 parents a7713da + 5008852
commit 6662e3c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/simbad/util/tests/test_matthews_prob.py b/simbad/util/tests/test_matthews_prob.py
@@ -25,7 +25,7 @@ def test_solvent_content(self):
 
         reference_data = 46.82229046138755
 
-        self.assertEqual(data, reference_data)
+        self.assertAlmostEqual(data, reference_data)
 
     def test_matthews_prob(self):
         """Test case for matthews_prob.MatthewsProbability.calculate_content_ncopies_from_file"""
@@ -38,7 +38,7 @@ def test_matthews_prob(self):
 
         reference_data = (0.5061537904240863, 1)
 
-        self.assertEqual(data, reference_data)
+        self.assertAlmostEqual(data, reference_data)
 
 
 if __name__ == "__main__":

diff --git a/simbad/util/tests/test_mtz_util.py b/simbad/util/tests/test_mtz_util.py
@@ -20,19 +20,27 @@ def test_crystal_data_1(self):
         input_mtz = os.path.join(CCP4ROOT, "examples", "toxd", "toxd.mtz")
         data = mtz_util.crystal_data(input_mtz)
 
-        reference_data = ("P212121", 2.300205240684743, (73.58200073242188, 38.733001708984375, 23.18899917602539, 90.0, 90.0, 90.0))
+        reference_data = ("P212121",
+                          2.300205240684743,
+                          (73.58200073242188, 38.733001708984375, 23.18899917602539, 90.0, 90.0, 90.0))
 
-        self.assertEqual(data, reference_data)
+        self.assertEqual(data[0], reference_data[0])
+        self.assertAlmostEqual(data[1], reference_data[1])
+        self.assertAlmostEqual(data[2], reference_data[2])
 
     def test_crystal_data_2(self):
         """Test case for mtz_util.crystal_data"""
 
         input_mtz = os.path.join(CCP4ROOT, "examples", "rnase", "rnase25.mtz")
         data = mtz_util.crystal_data(input_mtz)
 
-        reference_data = ("P212121", 2.4999665357495098, (64.89700317382812, 78.322998046875, 38.79199981689453, 90.0, 90.0, 90.0))
+        reference_data = ("P212121",
+                          2.4999665357495098,
+                          (64.89700317382812, 78.322998046875, 38.79199981689453, 90.0, 90.0, 90.0))
 
-        self.assertEqual(data, reference_data)
+        self.assertEqual(data[0], reference_data[0])
+        self.assertAlmostEqual(data[1], reference_data[1])
+        self.assertAlmostEqual(data[2], reference_data[2])
 
     def test_get_labels_1(self):
         """Test case for mtz_util.get_labels"""
@@ -62,8 +70,10 @@ def test_get_labels_2(self):
         os.remove(temp_mtz)
         os.remove(temp_log)
 
-        data = (mtz_labels.f, mtz_labels.sigf, mtz_labels.fplus, mtz_labels.sigfplus, mtz_labels.fminus, mtz_labels.sigfminus, mtz_labels.free)
-        reference_data = ("FNAT", "SIGFNAT", "FPTNCD25(+)", "SIGFPTNCD25(+)", "FPTNCD25(-)", "SIGFPTNCD25(-)", "FreeR_flag")
+        data = (mtz_labels.f, mtz_labels.sigf, mtz_labels.fplus, mtz_labels.sigfplus, mtz_labels.fminus,
+                mtz_labels.sigfminus, mtz_labels.free)
+        reference_data = ("FNAT", "SIGFNAT", "FPTNCD25(+)", "SIGFPTNCD25(+)",
+                          "FPTNCD25(-)", "SIGFPTNCD25(-)", "FreeR_flag")
 
         self.assertEqual(data, reference_data)
 
@@ -74,8 +84,12 @@ def test_change_space_group_1(self):
         mtz_util.reindex(input_mtz, temp_mtz, "18")
 
         data = mtz_util.crystal_data(temp_mtz)
-        reference_data = ("P21212", 2.300205240684743, (73.58200073242188, 38.733001708984375, 23.18899917602539, 90.0, 90.0, 90.0))
-        self.assertEqual(data, reference_data)
+        reference_data = ("P21212",
+                          2.300205240684743,
+                          (73.58200073242188, 38.733001708984375, 23.18899917602539, 90.0, 90.0, 90.0))
+        self.assertEqual(data[0], reference_data[0])
+        self.assertAlmostEqual(data[1], reference_data[1])
+        self.assertAlmostEqual(data[2], reference_data[2])
 
 
 if __name__ == "__main__":