Improve assertion checking.

This replaces lots of self.assertTrue() assertions with more specific
assertions, such as replacing assertTrue(x == y) with assertEqual(x, y).

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/test_message.py b/tests/test_message.py
index 34512f0..b799586 100644
--- a/tests/test_message.py
+++ b/tests/test_message.py
@@ -96,28 +96,28 @@ class MessageTestCase(unittest.TestCase):
     def test_comparison_eq1(self):
         q1 = dns.message.from_text(query_text)
         q2 = dns.message.from_text(query_text)
-        self.assertTrue(q1 == q2)
+        self.assertEqual(q1, q2)
 
     def test_comparison_ne1(self):
         q1 = dns.message.from_text(query_text)
         q2 = dns.message.from_text(query_text)
         q2.id = 10
-        self.assertTrue(q1 != q2)
+        self.assertNotEqual(q1, q2)
 
     def test_comparison_ne2(self):
         q1 = dns.message.from_text(query_text)
         q2 = dns.message.from_text(query_text)
         q2.question = []
-        self.assertTrue(q1 != q2)
+        self.assertNotEqual(q1, q2)
 
     def test_comparison_ne3(self):
         q1 = dns.message.from_text(query_text)
-        self.assertTrue(q1 != 1)
+        self.assertNotEqual(q1, 1)
 
     def test_EDNS_to_wire1(self):
         q = dns.message.from_text(query_text)
         w = q.to_wire()
-        self.assertTrue(w == goodwire)
+        self.assertEqual(w, goodwire)
 
     def test_EDNS_from_wire1(self):
         m = dns.message.from_wire(goodwire)
@@ -126,11 +126,11 @@ class MessageTestCase(unittest.TestCase):
     def test_EDNS_to_wire2(self):
         q = dns.message.from_text(query_text_2)
         w = q.to_wire()
-        self.assertTrue(w == goodwire3)
+        self.assertEqual(w, goodwire3)
 
     def test_EDNS_from_wire2(self):
         m = dns.message.from_wire(goodwire3)
-        self.assertTrue(str(m) == query_text_2)
+        self.assertEqual(str(m), query_text_2)
 
     def test_TooBig(self):
         def bad():
@@ -147,7 +147,7 @@ class MessageTestCase(unittest.TestCase):
     def test_answer1(self):
         a = dns.message.from_text(answer_text)
         wire = a.to_wire(want_shuffle=False)
-        self.assertTrue(wire == goodwire2)
+        self.assertEqual(wire, goodwire2)
 
     def test_TrailingJunk(self):
         def bad():
@@ -171,34 +171,34 @@ class MessageTestCase(unittest.TestCase):
     def test_ExtendedRcodeSetting(self):
         m = dns.message.make_query('foo', 'A')
         m.set_rcode(4095)
-        self.assertTrue(m.rcode() == 4095)
+        self.assertEqual(m.rcode(), 4095)
         m.set_rcode(2)
-        self.assertTrue(m.rcode() == 2)
+        self.assertEqual(m.rcode(), 2)
 
     def test_EDNSVersionCoherence(self):
         m = dns.message.make_query('foo', 'A')
         m.use_edns(1)
-        self.assertTrue((m.ednsflags >> 16) & 0xFF == 1)
+        self.assertEqual((m.ednsflags >> 16) & 0xFF, 1)
 
     def test_SettingNoEDNSOptionsImpliesNoEDNS(self):
         m = dns.message.make_query('foo', 'A')
-        self.assertTrue(m.edns == -1)
+        self.assertEqual(m.edns, -1)
 
     def test_SettingEDNSFlagsImpliesEDNS(self):
         m = dns.message.make_query('foo', 'A', ednsflags=dns.flags.DO)
-        self.assertTrue(m.edns == 0)
+        self.assertEqual(m.edns, 0)
 
     def test_SettingEDNSPayloadImpliesEDNS(self):
         m = dns.message.make_query('foo', 'A', payload=4096)
-        self.assertTrue(m.edns == 0)
+        self.assertEqual(m.edns, 0)
 
     def test_SettingEDNSRequestPayloadImpliesEDNS(self):
         m = dns.message.make_query('foo', 'A', request_payload=4096)
-        self.assertTrue(m.edns == 0)
+        self.assertEqual(m.edns, 0)
 
     def test_SettingOptionsImpliesEDNS(self):
         m = dns.message.make_query('foo', 'A', options=[])
-        self.assertTrue(m.edns == 0)
+        self.assertEqual(m.edns, 0)
 
     def test_FindRRset(self):
         a = dns.message.from_text(answer_text)
@@ -206,7 +206,7 @@ class MessageTestCase(unittest.TestCase):
         rrs1 = a.find_rrset(a.answer, n, dns.rdataclass.IN, dns.rdatatype.SOA)
         rrs2 = a.find_rrset(dns.message.ANSWER, n, dns.rdataclass.IN,
                             dns.rdatatype.SOA)
-        self.assertTrue(rrs1 == rrs2)
+        self.assertEqual(rrs1, rrs2)
 
     def test_CleanTruncated(self):
         def bad():