update tests

test/gw_prior_test.py

@@ -93,24 +93,35 @@ class TestUniformComovingVolumePrior(unittest.TestCase):
     def test_specify_cosmology(self):
         prior = bilby.gw.prior.UniformComovingVolume(
             minimum=10, maximum=10000, cosmology='Planck13')
-        self.assertEqual(prior.cosmology, cosmology.Planck13.name)
+        self.assertEqual(repr(prior.cosmology), repr(cosmology.Planck13))
+
+    def test_comoving_prior_creation(self):
+        prior = bilby.gw.prior.UniformComovingVolume(
+            minimum=0.1, maximum=1, name='comoving_distance',
+            latex_label='$d_C$')
+        self.assertEqual(prior.latex_label, '$d_C$')
 
     def test_redshift_prior_creation(self):
         prior = bilby.gw.prior.UniformComovingVolume(
-            minimum=0.1, maximum=1, name='redshift')
+            minimum=0.1, maximum=1, name='redshift', latex_label='$z$')
         self.assertEqual(prior.latex_label, '$z$')
 
     def test_redshift_to_luminosity_distance(self):
         prior = bilby.gw.prior.UniformComovingVolume(
             minimum=0.1, maximum=1, name='redshift')
-        new_prior = prior.get_luminosity_distance_prior()
+        new_prior = prior.get_corresponding_prior('luminosity_distance')
         self.assertEqual(new_prior.name, 'luminosity_distance')
 
     def test_luminosity_distance_to_redshift(self):
         prior = bilby.gw.prior.UniformComovingVolume(minimum=10, maximum=10000)
-        new_prior = prior.get_redshift_prior()
+        new_prior = prior.get_corresponding_prior('redshift')
         self.assertEqual(new_prior.name, 'redshift')
 
+    def test_luminosity_distance_to_comoving_distance(self):
+        prior = bilby.gw.prior.UniformComovingVolume(minimum=10, maximum=10000)
+        new_prior = prior.get_corresponding_prior('comoving_distance')
+        self.assertEqual(new_prior.name, 'comoving_distance')
+
 
 class TestAlignedSpin(unittest.TestCase):
 
@@ -124,5 +135,6 @@ class TestAlignedSpin(unittest.TestCase):
         max_difference = max(abs(analytic - prior.prob(chis)))
         self.assertAlmostEqual(max_difference, 0, 2)
 
+
 if __name__ == '__main__':
     unittest.main()

test/prior_test.py

@@ -133,7 +133,7 @@ class TestPriorClasses(unittest.TestCase):
             bilby.core.prior.PowerLaw(name='test', unit='unit', alpha=2, minimum=1, maximum=1e2),
             bilby.core.prior.Uniform(name='test', unit='unit', minimum=0, maximum=1),
             bilby.core.prior.LogUniform(name='test', unit='unit', minimum=5e0, maximum=1e2),
-            bilby.gw.prior.UniformComovingVolume(name='test', minimum=2e2, maximum=5e3),
+            bilby.gw.prior.UniformComovingVolume(name='redshift', minimum=0.1, maximum=1.0),
             bilby.core.prior.Sine(name='test', unit='unit'),
             bilby.core.prior.Cosine(name='test', unit='unit'),
             bilby.core.prior.Interped(name='test', unit='unit', xx=np.linspace(0, 10, 1000),
@@ -153,7 +153,7 @@ class TestPriorClasses(unittest.TestCase):
             bilby.core.prior.Lorentzian(name='test', unit='unit', alpha=0, beta=1),
             bilby.core.prior.Gamma(name='test', unit='unit', k=1, theta=1),
             bilby.core.prior.ChiSquared(name='test', unit='unit', nu=2),
-            bilby.gw.prior.AlignedSpin(name='test', unit='unit')
+            bilby.gw.prior.AlignedSpin(name='test', unit='unit'),
         ]
 
     def test_minimum_rescaling(self):
@@ -253,8 +253,8 @@ class TestPriorClasses(unittest.TestCase):
 
     def test_unit_setting(self):
         for prior in self.priors:
-            if isinstance(prior, bilby.gw.prior.UniformComovingVolume):
-                self.assertEqual('Mpc', prior.unit)
+            if isinstance(prior, bilby.gw.prior.Cosmological):
+                self.assertEqual(None, prior.unit)
             else:
                 self.assertEqual('unit', prior.unit)