Modernized testAngle.py

Use more specific asserts where useful. Remove unneeded checks of angle != None.
lsst · May 24, 2017 · 0d64572 · 0d64572
1 parent 0a8195c
commit 0d64572
Showing 1 changed file with 16 additions and 20 deletions.
diff --git a/tests/testAngle.py b/tests/testAngle.py
@@ -104,26 +104,22 @@ def testComparison(self):
         print('a1', a1)
         print('a2', a2)
         print('a3', a3)
-        self.assertEqual(a1 == a3, True)
-        self.assertEqual(a1 != a2, True)
-        self.assertEqual(a1 <= a2, True)
-        self.assertEqual(a1 < a2, True)
-        self.assertEqual(a2 > a1, True)
-        self.assertEqual(a2 >= a1, True)
-
-        self.assertEqual(a1 != a3, False)
-        self.assertEqual(a1 == a2, False)
-        self.assertEqual(a1 >= a2, False)
-        self.assertEqual(a1 > a2, False)
-        self.assertEqual(a2 < a1, False)
-        self.assertEqual(a2 <= a1, False)
-
-        self.assertEqual(a1 == None, False)
-        self.assertEqual(None == a1, False)
-        self.assertEqual(a1 != None, True)
-        self.assertEqual(None != a1, True)
-        self.assertEqual(a1 == float(a1), True)
-        self.assertEqual(float(a1) == a1, True)
+        self.assertEqual(a1, a3)
+        self.assertNotEqual(a1, a2)
+        self.assertLessEqual(a1, a2)
+        self.assertLess(a1, a2)
+        self.assertGreater(a2, a1)
+        self.assertGreaterEqual(a2, a1)
+
+        self.assertFalse(a1 != a3)
+        self.assertFalse(a1 == a2)
+        self.assertFalse(a1 >= a2)
+        self.assertFalse(a1 > a2)
+        self.assertFalse(a2 < a1)
+        self.assertFalse(a2 <= a1)
+
+        self.assertTrue(a1 == float(a1))
+        self.assertTrue(float(a1) == a1)
 
     def testTrig(self):
         self.assertEqual(math.cos(self.d), -1.0)