[lldb] Rewrite to assertEqual/assertNotEqual (NFC)

Using the more specific assert* methods results in more useful error message.

lldb/test/API/python_api/absolute_symbol/TestAbsoluteSymbol.py

@@ -77,4 +77,4 @@ class TestAbsoluteSymbol(TestBase):
         # prefix of ".absolute." followed by the symbol name as they interfere
         # with address lookups if they are treated like real sections.
         for section in module.sections:
-            self.assertTrue(section.GetName() != ".absolute.absolute")
+            self.assertNotEqual(section.GetName(), ".absolute.absolute")

lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py

@@ -42,12 +42,8 @@ class SBFrameFindValueTestCase(TestBase):
         self.frame = self.thread.frames[0]
         self.assertTrue(self.frame, "Frame 0 is valid.")
 
-        self.assertTrue(
-            self.frame.GetVariables(
-                True,
-                True,
-                False,
-                True).GetSize() == 2,
+        self.assertEqual(
+            self.frame.GetVariables(True, True, False, True).GetSize(), 2,
             "variable count is off")
         self.assertFalse(
             self.frame.FindValue(
@@ -55,12 +51,8 @@ class SBFrameFindValueTestCase(TestBase):
                 lldb.eValueTypeVariableArgument,
                 lldb.eDynamicCanRunTarget).IsValid(),
             "found something that should not be here")
-        self.assertTrue(
-            self.frame.GetVariables(
-                True,
-                True,
-                False,
-                True).GetSize() == 2,
+        self.assertEqual(
+            self.frame.GetVariables(True, True, False, True).GetSize(), 2,
             "variable count is off after failed FindValue()")
         self.assertTrue(
             self.frame.FindValue(
@@ -68,10 +60,6 @@ class SBFrameFindValueTestCase(TestBase):
                 lldb.eValueTypeVariableArgument,
                 lldb.eDynamicCanRunTarget).IsValid(),
             "FindValue() didn't find an argument")
-        self.assertTrue(
-            self.frame.GetVariables(
-                True,
-                True,
-                False,
-                True).GetSize() == 2,
+        self.assertEqual(
+            self.frame.GetVariables(True, True, False, True).GetSize(), 2,
             "variable count is off after successful FindValue()")

lldb/test/API/python_api/function_symbol/TestSymbolAPI.py

@@ -59,8 +59,8 @@ class SymbolAPITestCase(TestBase):
         self.assertEqual(symbol_line1.GetType(), lldb.eSymbolTypeCode)
         addr_line1 = symbol_line1.GetStartAddress()
         # And a section type of code, too.
-        self.assertTrue(addr_line1.GetSection().GetSectionType()
-                        == lldb.eSectionTypeCode)
+        self.assertEqual(addr_line1.GetSection().GetSectionType(),
+                         lldb.eSectionTypeCode)
 
         # Continue the inferior, the breakpoint 2 should be hit.
         process.Continue()
@@ -76,11 +76,11 @@ class SymbolAPITestCase(TestBase):
         self.assertEqual(symbol_line2.GetType(), lldb.eSymbolTypeCode)
         addr_line2 = symbol_line2.GetStartAddress()
         # And a section type of code, too.
-        self.assertTrue(addr_line2.GetSection().GetSectionType()
-                        == lldb.eSectionTypeCode)
+        self.assertEqual(addr_line2.GetSection().GetSectionType(),
+                         lldb.eSectionTypeCode)
 
         # Now verify that both addresses point to the same module.
         if self.TraceOn():
             print("UUID:", addr_line1.GetModule().GetUUIDString())
-        self.assertTrue(addr_line1.GetModule().GetUUIDString()
-                        == addr_line2.GetModule().GetUUIDString())
+        self.assertEqual(addr_line1.GetModule().GetUUIDString(),
+                         addr_line2.GetModule().GetUUIDString())

lldb/test/API/python_api/module_section/TestModuleAndSection.py

@@ -153,6 +153,5 @@ class ModuleAndSectionAPIsTestCase(TestBase):
             for source_name in source_name_list:
                 list = module.FindCompileUnits(lldb.SBFileSpec(source_name, False))
                 for sc in list:
-                    self.assertTrue(
-                        sc.GetCompileUnit().GetFileSpec().GetFilename() ==
-                        source_name)
+                    self.assertEqual(
+                        sc.GetCompileUnit().GetFileSpec().GetFilename(), source_name)

lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py

@@ -31,15 +31,15 @@ class TestReadMemCString(TestBase):
 
         empty_str_addr = frame.FindVariable("empty_string").GetValueAsUnsigned(err)
         self.assertSuccess(err)
-        self.assertTrue(empty_str_addr != lldb.LLDB_INVALID_ADDRESS)
+        self.assertNotEqual(empty_str_addr, lldb.LLDB_INVALID_ADDRESS)
 
         one_letter_str_addr = frame.FindVariable("one_letter_string").GetValueAsUnsigned(err)
         self.assertSuccess(err)
-        self.assertTrue(one_letter_str_addr != lldb.LLDB_INVALID_ADDRESS)
+        self.assertNotEqual(one_letter_str_addr, lldb.LLDB_INVALID_ADDRESS)
 
         invalid_memory_str_addr = frame.FindVariable("invalid_memory_string").GetValueAsUnsigned(err)
         self.assertSuccess(err)
-        self.assertTrue(invalid_memory_str_addr != lldb.LLDB_INVALID_ADDRESS)
+        self.assertNotEqual(invalid_memory_str_addr, lldb.LLDB_INVALID_ADDRESS)
 
         # Important:  An empty (0-length) c-string must come back as a Python string, not a
         # None object.

lldb/test/API/python_api/sbdata/TestSBData.py

@@ -118,10 +118,8 @@ class SBDataAPICase(TestBase):
         offset += 4
         self.assert_data(data.GetSignedInt32, offset, 7)
         offset += 8
-        self.assertTrue(
-            data.GetUnsignedInt32(
-                error,
-                offset) == 0,
+        self.assertEqual(
+            data.GetUnsignedInt32(error, offset), 0,
             'do not read beyond end')
         self.assertTrue(not error.Success())
         error.Clear()  # clear the error for the next test
@@ -287,22 +285,15 @@ class SBDataAPICase(TestBase):
             self.assert_data(data2.GetUnsignedInt64, 24, 4)
             self.assert_data(data2.GetUnsignedInt64, 32, 5)
 
-            self.assertTrue(
-                data2.uint64s == [
-                    1,
-                    2,
-                    3,
-                    4,
-                    5],
+            self.assertEqual(
+                data2.uint64s, [1, 2, 3, 4, 5],
                 'read_data_helper failure: data2 == [1,2,3,4,5]')
 
         for l in int_lists:
             data2 = lldb.SBData.CreateDataFromSInt32Array(
                 process.GetByteOrder(), process.GetAddressByteSize(), l)
-            self.assertTrue(
-                data2.sint32[
-                    0:2] == [
-                    2, -2], 'signed32 data2 = [2,-2]')
+            self.assertEqual(
+                data2.sint32[0:2], [2, -2], 'signed32 data2 = [2,-2]')
 
         data2.Append(
             lldb.SBData.CreateDataFromSInt64Array(
@@ -311,20 +302,16 @@ class SBDataAPICase(TestBase):
                 int_lists[0]))
         self.assert_data(data2.GetSignedInt32, 0, 2)
         self.assert_data(data2.GetSignedInt32, 4, -2)
-        self.assertTrue(
-            data2.sint64[
-                1:3] == [
-                2, -2], 'signed64 data2 = [2,-2]')
+        self.assertEqual(
+            data2.sint64[1:3], [2, -2], 'signed64 data2 = [2,-2]')
 
         for l in int_lists:
             data2 = lldb.SBData.CreateDataFromSInt64Array(
                 process.GetByteOrder(), process.GetAddressByteSize(), l)
             self.assert_data(data2.GetSignedInt64, 0, 2)
             self.assert_data(data2.GetSignedInt64, 8, -2)
-            self.assertTrue(
-                data2.sint64[
-                    0:2] == [
-                    2, -2], 'signed64 data2 = [2,-2]')
+            self.assertEqual(
+                data2.sint64[0:2], [2, -2], 'signed64 data2 = [2,-2]')
 
         for l in uint_lists:
             data2 = lldb.SBData.CreateDataFromUInt32Array(
@@ -339,54 +326,26 @@ class SBDataAPICase(TestBase):
 
         data2 = lldb.SBData.CreateDataFromSInt32Array(
             process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
-        self.assertTrue(
-            data2.sint32[
-                0:6] == [
-                1,
-                1,
-                0,
-                0,
-                1,
-                0],
+        self.assertEqual(
+            data2.sint32[0:6], [1, 1, 0, 0, 1, 0],
             'signed32 data2 = [1, 1, 0, 0, 1, 0]')
 
         data2 = lldb.SBData.CreateDataFromUInt32Array(
             process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
-        self.assertTrue(
-            data2.uint32[
-                0:6] == [
-                1,
-                1,
-                0,
-                0,
-                1,
-                0],
+        self.assertEqual(
+            data2.uint32[0:6], [1, 1, 0, 0, 1, 0],
             'unsigned32 data2 = [1, 1, 0, 0, 1, 0]')
 
         data2 = lldb.SBData.CreateDataFromSInt64Array(
             process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
-        self.assertTrue(
-            data2.sint64[
-                0:6] == [
-                1,
-                1,
-                0,
-                0,
-                1,
-                0],
+        self.assertEqual(
+            data2.sint64[0:6], [1, 1, 0, 0, 1, 0],
             'signed64 data2 = [1, 1, 0, 0, 1, 0]')
 
         data2 = lldb.SBData.CreateDataFromUInt64Array(
             process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
-        self.assertTrue(
-            data2.uint64[
-                0:6] == [
-                1,
-                1,
-                0,
-                0,
-                1,
-                0],
+        self.assertEqual(
+            data2.uint64[0:6], [1, 1, 0, 0, 1, 0],
             'signed64 data2 = [1, 1, 0, 0, 1, 0]')
 
         data2 = lldb.SBData.CreateDataFromDoubleArray(

lldb/test/API/python_api/value/TestValueAPI.py

@@ -158,10 +158,10 @@ class ValueAPITestCase(TestBase):
         self.assertFalse(lldb.value(frame0.FindVariable('bogus')))
         self.assertTrue(lldb.value(frame0.FindVariable('uinthex')))
 
-        self.assertTrue(int(lldb.value(frame0.FindVariable('uinthex')))
-                        == 3768803088, 'uinthex == 3768803088')
-        self.assertTrue(int(lldb.value(frame0.FindVariable('sinthex')))
-                        == -526164208, 'sinthex == -526164208')
+        self.assertEqual(int(lldb.value(frame0.FindVariable('uinthex'))),
+                         3768803088, 'uinthex == 3768803088')
+        self.assertEqual(int(lldb.value(frame0.FindVariable('sinthex'))),
+                         -526164208, 'sinthex == -526164208')
 
         # Check value_iter works correctly.
         for v in [
@@ -177,11 +177,9 @@ class ValueAPITestCase(TestBase):
             frame0.FindVariable('sinthex').GetValueAsUnsigned(), 3768803088,
             'unsigned sinthex == 3768803088')
 
-        self.assertTrue(
-            frame0.FindVariable('uinthex').GetValueAsSigned() == -
-            526164208,
+        self.assertEqual(
+            frame0.FindVariable('uinthex').GetValueAsSigned(), -526164208,
             'signed uinthex == -526164208')
-        self.assertTrue(
-            frame0.FindVariable('sinthex').GetValueAsSigned() == -
-            526164208,
+        self.assertEqual(
+            frame0.FindVariable('sinthex').GetValueAsSigned(), -526164208,
             'signed sinthex == -526164208')

lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py

@@ -47,8 +47,8 @@ class ValueVarUpdateTestCase(TestBase):
         if self.TraceOn():
             self.runCmd("frame variable")
 
-        self.assertTrue(
-            i_val != i.GetValueAsUnsigned(0),
+        self.assertNotEqual(
+            i_val, i.GetValueAsUnsigned(0),
             "GetValue() is saying a lie")
         self.assertTrue(
             i.GetValueDidChange(),