Moritz Huebner: Fixed test cases for changed prior tests

.gitlab-ci.yml

@@ -21,7 +21,7 @@ exitcode-jessie:
     - pip install -r requirements.txt
     - pip install coverage
     - pip install coverage-badge
-    - coverage run test/parameter_tests.py
+    - coverage run test/prior_tests.py
     - coverage run test/tests.py
     - coverage run test/waveform_generator_tests.py
     - coverage html --include=peyote/*

test/parameter_tests.py

-from context import peyote
-import unittest
-import numpy as np
-
-
-class TestParameterInstantiationWithoutOptionalParameters(unittest.TestCase):
-
-    def setUp(self):
-        self.test_name = 'test_name'
-        self.parameter = peyote.parameter.PriorFactory(self.test_name)
-
-    def tearDown(self):
-        del self.parameter
-
-    def test_name(self):
-        self.assertEqual(self.parameter.name, self.test_name)
-
-    def test_prior(self):
-        self.assertIsNone(self.parameter.prior)
-
-    def test_value(self):
-        self.assertTrue(np.isnan(self.parameter.value))
-
-    def test_latex_label(self):
-        self.assertEqual(self.parameter.latex_label, self.test_name)
-
-    def test_is_fixed(self):
-        self.assertFalse(self.parameter.is_fixed)
-
-
-class TestParameterName(unittest.TestCase):
-
-    def setUp(self):
-        self.test_name = 'test_name'
-        self.parameter = peyote.parameter.PriorFactory(self.test_name)
-
-    def tearDown(self):
-        del self.parameter
-
-    def test_name_assignment(self):
-        self.parameter.name = "other_name"
-        self.assertEqual(self.parameter.name, "other_name")
-
-
-class TestParameterPrior(unittest.TestCase):
-
-    def setUp(self):
-        self.test_name = 'test_name'
-        self.parameter = peyote.parameter.PriorFactory(self.test_name)
-
-    def tearDown(self):
-        del self.parameter
-
-    def test_prior_assignment(self):
-        test_prior = peyote.prior.Uniform(0, 100)
-        self.parameter.prior = test_prior
-        self.assertDictEqual(test_prior.__dict__, self.parameter.prior.__dict__)
-
-    def test_default_assignment(self):
-        test_prior = peyote.prior.PowerLaw(alpha=0, bounds=(5, 100))
-        self.parameter.name = 'mchirp'
-        self.parameter.prior = None
-        self.assertDictEqual(test_prior.__dict__, self.parameter.prior.__dict__)
-
-
-class TestParameterValue(unittest.TestCase):
-    def setUp(self):
-        self.test_name = 'test_name'
-        self.parameter = peyote.parameter.PriorFactory(self.test_name)
-
-    def tearDown(self):
-        del self.parameter
-
-    def test_prior_assignment(self):
-        test_value = 15
-        self.parameter.value = test_value
-        self.assertEqual(test_value, self.parameter.value)
-
-    def test_default_value_assignment(self):
-        self.parameter.name = 'a1'
-        self.parameter.value = None
-        self.assertEqual(self.parameter.value, 0)
-
-    def test_default_value_assignment_default(self):
-        self.parameter.value = None
-        self.assertTrue(np.isnan(self.parameter.value))
-
-
-class TestParameterLatexLabel(unittest.TestCase):
-    def setUp(self):
-        self.test_name = 'test_name'
-        self.parameter = peyote.parameter.PriorFactory(self.test_name)
-
-    def tearDown(self):
-        del self.parameter
-
-    def test_label_assignment(self):
-        test_label = 'test_label'
-        self.parameter.latex_label = 'test_label'
-        self.assertEqual(test_label, self.parameter.latex_label)
-
-    def test_default_label_assignment(self):
-        self.parameter.name = 'mchirp'
-        self.parameter.latex_label = None
-        self.assertEqual(self.parameter.latex_label, '$\mathcal{M}$')
-
-    def test_default_label_assignment_default(self):
-        self.assertTrue(self.parameter.latex_label, self.parameter.name)
-
-
-class TestParameterIsFixed(unittest.TestCase):
-    def setUp(self):
-        self.test_name = 'test_name'
-        self.parameter = peyote.parameter.PriorFactory(self.test_name)
-
-    def tearDown(self):
-        del self.parameter
-
-    def test_is_fixed_assignment(self):
-        self.parameter.is_fixed = True
-        self.assertTrue(self.parameter.is_fixed)
-
-    def test_default_is_fixed_assignment(self):
-        self.assertFalse(self.parameter.is_fixed)
-
-
-class TestFixMethod(unittest.TestCase):
-
-    def setUp(self):
-        self.test_name = 'test_name'
-        self.parameter = peyote.parameter.PriorFactory(self.test_name)
-
-    def tearDown(self):
-        del self.parameter
-
-    def test_is_fixed_attribute_after_fixing(self):
-        arbitrary_float = 11.3
-        self.parameter.fix(arbitrary_float)
-        self.assertTrue(self.parameter.is_fixed)
-
-    def test_value_attribute_after_fixing(self):
-        arbitrary_float = 11.3
-        self.parameter.fix(arbitrary_float)
-        self.assertEqual(self.parameter.value, arbitrary_float)
-
-    def test_prior_attribute_after_fixing(self):
-        arbitrary_float = 11.3
-        self.parameter.fix(arbitrary_float)
-        self.assertIsInstance(self.parameter.prior, peyote.prior.DeltaFunction)
-
-    def test_raising_value_error_if_value_is_none(self):
-        self.assertRaises(ValueError, self.parameter.fix, np.nan)
-
-    def test_fixing_existing_value(self):
-        arbitrary_float = 11.3
-        self.parameter.value = arbitrary_float
-        self.parameter.fix()
-        self.assertEqual(self.parameter.value, arbitrary_float)
-
-    def test_is_fixed_after_fixing_existing_value(self):
-        arbitrary_float = 11.3
-        self.parameter.value = arbitrary_float
-        self.parameter.fix()
-        self.assertTrue(self.parameter.is_fixed)
-
-    def test_prior_after_fixing_existing_value(self):
-        arbitrary_float = 11.3
-        self.parameter.value = arbitrary_float
-        self.parameter.fix()
-        self.assertIsInstance(self.parameter.prior, peyote.prior.DeltaFunction)
-
-
-if __name__ == '__main__':
-    unittest.main()

test/prior_tests.py

+from context import peyote
+import unittest
+import numpy as np
+
+
+class TestPriorInstantiationWithoutOptionalPriors(unittest.TestCase):
+
+    def setUp(self):
+        self.prior = peyote.prior.Prior()
+
+    def tearDown(self):
+        del self.prior
+
+    def test_name(self):
+        self.assertIsNone(self.prior.name)
+
+    def test_latex_label(self):
+        self.assertIsNone(self.prior.latex_label)
+
+    def test_is_fixed(self):
+        self.assertFalse(self.prior.is_fixed)
+
+    def test_class_instance(self):
+        self.assertIsInstance(self.prior, peyote.prior.Prior)
+
+
+class TestPriorName(unittest.TestCase):
+
+    def setUp(self):
+        self.test_name = 'test_name'
+        self.prior = peyote.prior.Prior(self.test_name)
+
+    def tearDown(self):
+        del self.prior
+        del self.test_name
+
+    def test_name_assignment(self):
+        self.prior.name = "other_name"
+        self.assertEqual(self.prior.name, "other_name")
+
+
+class TestPriorLatexLabel(unittest.TestCase):
+    def setUp(self):
+        self.test_name = 'test_name'
+        self.prior = peyote.prior.Prior(self.test_name)
+
+    def tearDown(self):
+        del self.test_name
+        del self.prior
+
+    def test_label_assignment(self):
+        test_label = 'test_label'
+        self.prior.latex_label = 'test_label'
+        self.assertEqual(test_label, self.prior.latex_label)
+
+    def test_default_label_assignment(self):
+        self.prior.name = 'mchirp'
+        self.prior.latex_label = None
+        self.assertEqual(self.prior.latex_label, '$\mathcal{M}$')
+
+    def test_default_label_assignment_default(self):
+        self.assertTrue(self.prior.latex_label, self.prior.name)
+
+
+class TestPriorIsFixed(unittest.TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_is_fixed_parent_class(self):
+        self.prior = peyote.prior.Prior()
+        self.assertFalse(self.prior.is_fixed)
+
+    def test_is_fixed_delta_function_class(self):
+        self.prior = peyote.prior.DeltaFunction(peak=0)
+        self.assertTrue(self.prior.is_fixed)
+
+    def test_is_fixed_uniform_class(self):
+        self.prior = peyote.prior.Uniform(lower=0, upper=10)
+        self.assertFalse(self.prior.is_fixed)
+
+
+class TestFixMethod(unittest.TestCase):
+
+    def setUp(self):
+        self.test_name = 'test_name'
+        self.prior = peyote.prior.Prior(self.test_name)
+
+    def tearDown(self):
+        del self.prior
+
+    def test_is_fixed_attribute_after_fixing(self):
+        arbitrary_float = 11.3
+        fixed_prior = peyote.prior.fix(self.prior, arbitrary_float)
+        self.assertTrue(fixed_prior.is_fixed)
+
+    def test_value_attribute_after_fixing(self):
+        arbitrary_float = 11.3
+        fixed_prior = peyote.prior.fix(self.prior, arbitrary_float)
+        self.assertEqual(fixed_prior.peak, arbitrary_float)
+
+    def test_prior_attribute_after_fixing(self):
+        arbitrary_float = 11.3
+        fixed_prior = peyote.prior.fix(self.prior, arbitrary_float)
+        self.assertIsInstance(fixed_prior, peyote.prior.DeltaFunction)
+
+    def test_raising_value_error_if_value_is_none(self):
+        self.assertRaises(ValueError, peyote.prior.fix, self.prior, np.nan)
+
+
+if __name__ == '__main__':
+    unittest.main()