caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lldb] Replace assertTrue(a == b, "msg") with assertEquals(a, b, "msg") in the test suite

Browse Source 
Summary:
The error message from the construct `assertTrue(a == b, "msg") ` are nearly always completely useless for actually debugging the issue.
This patch is just replacing this construct (and similar ones like `assertTrue(a != b, ...)` with the proper call to assertEqual or assertNotEquals.

This patch was mostly written by a shell script with some manual verification afterwards:
```
lang=python
import sys

def sanitize_line(line):
  if line.strip().startswith("self.assertTrue(") and " == " in line:
    line = line.replace("self.assertTrue(", "self.assertEquals(")
    line = line.replace(" == ", ", ", 1)
  if line.strip().startswith("self.assertTrue(") and " != " in line:
    line = line.replace("self.assertTrue(", "self.assertNotEqual(")
    line = line.replace(" != ", ", ", 1)
  return line

for a in sys.argv[1:]:
  with open(a, "r") as f:
    lines = f.readlines()
  with open(a, "w") as f:
    for line in lines:
      f.write(sanitize_line(line))
```

Reviewers: labath, JDevlieghere

Reviewed By: labath

Subscribers: abidh, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D74475
This commit is contained in:
Raphael Isemann
2020-02-13 13:40:22 +01:00
parent 70e6ed1db7
commit b3a0c4d7dc
80 changed files with 264 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py
View File

@@ -46,7 +46,7 @@ class SBTypeMemberFunctionsTest(TestBase):
self.assertTrue(process, PROCESS_IS_VALID)
# Get Frame #0.
self.assertTrue(process.GetState() == lldb.eStateStopped)
self.assertEquals(process.GetState(), lldb.eStateStopped)
thread = lldbutil.get_stopped_thread(
process, lldb.eStopReasonBreakpoint)
self.assertTrue(

2
lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py
View File

@@ -40,7 +40,7 @@ class SBFrameFindValueTestCase(TestBase):
threads = lldbutil.get_threads_stopped_at_breakpoint(
process, breakpoint)
self.assertTrue(len(threads) == 1)
self.assertEquals(len(threads), 1)
self.thread = threads[0]
self.frame = self.thread.frames[0]
self.assertTrue(self.frame, "Frame 0 is valid.")

2
lldb/test/API/python_api/name_lookup/TestNameLookup.py
View File

@@ -55,7 +55,7 @@ class TestNameLookup(TestBase):
self.assertGreaterEqual(len(mangled_to_symbol), 6)
for mangled in mangled_to_symbol.keys():
symbol_contexts = target.FindFunctions(mangled, lldb.eFunctionNameTypeFull)
self.assertTrue(symbol_contexts.GetSize() == 1)
self.assertEquals(symbol_contexts.GetSize(), 1)
for symbol_context in symbol_contexts:
self.assertTrue(symbol_context.GetFunction().IsValid())
self.assertTrue(symbol_context.GetSymbol().IsValid())

6
lldb/test/API/python_api/objc_type/TestObjCType.py
View File

@@ -40,7 +40,7 @@ class ObjCSBTypeTestCase(TestBase):
self.assertTrue(process, PROCESS_IS_VALID)
# Get Frame #0.
self.assertTrue(process.GetState() == lldb.eStateStopped)
self.assertEquals(process.GetState(), lldb.eStateStopped)
thread = lldbutil.get_stopped_thread(
process, lldb.eStopReasonBreakpoint)
self.assertTrue(
@@ -60,9 +60,9 @@ class ObjCSBTypeTestCase(TestBase):
aFooType = aBarType.GetDirectBaseClassAtIndex(0)
self.assertTrue(aFooType.IsValid(), "Foo should be a valid data type")
self.assertTrue(aFooType.GetName() == "Foo", "Foo has the right name")
self.assertEquals(aFooType.GetName(), "Foo", "Foo has the right name")
self.assertTrue(aBarType.GetNumberOfFields() == 1, "Bar has a field")
self.assertEquals(aBarType.GetNumberOfFields(), 1, "Bar has a field")
aBarField = aBarType.GetFieldAtIndex(0)
self.assertTrue(

4
lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py
View File

@@ -63,7 +63,7 @@ class SBValuePersistTestCase(TestBase):
self.assertTrue(
barPersist.GetPointeeData().sint32[0] == 4,
"barPersist != 4")
self.assertTrue(bazPersist.GetSummary() == '"85"', "bazPersist != 85")
self.assertEquals(bazPersist.GetSummary(), '"85"', "bazPersist != 85")
self.runCmd("continue")
@@ -77,6 +77,6 @@ class SBValuePersistTestCase(TestBase):
self.assertTrue(
barPersist.GetPointeeData().sint32[0] == 4,
"barPersist != 4")
self.assertTrue(bazPersist.GetSummary() == '"85"', "bazPersist != 85")
self.assertEquals(bazPersist.GetSummary(), '"85"', "bazPersist != 85")
self.expect("expr *(%s)" % (barPersist.GetName()), substrs=['= 4'])

16
lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
View File

@@ -60,7 +60,7 @@ class ChangeValueAPITestCase(TestBase):
self.assertTrue(process, PROCESS_IS_VALID)
# Get Frame #0.
self.assertTrue(process.GetState() == lldb.eStateStopped)
self.assertEquals(process.GetState(), lldb.eStateStopped)
thread = lldbutil.get_stopped_thread(
process, lldb.eStopReasonBreakpoint)
self.assertTrue(
@@ -76,7 +76,7 @@ class ChangeValueAPITestCase(TestBase):
self.assertTrue(val_value.IsValid(), "Got the SBValue for val")
actual_value = val_value.GetValueAsSigned(error, 0)
self.assertTrue(error.Success(), "Got a value from val")
self.assertTrue(actual_value == 100, "Got the right value from val")
self.assertEquals(actual_value, 100, "Got the right value from val")
result = val_value.SetValueFromCString("12345")
self.assertTrue(result, "Setting val returned True.")
@@ -99,7 +99,7 @@ class ChangeValueAPITestCase(TestBase):
self.assertTrue(
error.Success(),
"Got an unsigned value for second_val")
self.assertTrue(actual_value == 5555)
self.assertEquals(actual_value, 5555)
result = mine_second_value.SetValueFromCString("98765")
self.assertTrue(result, "Success setting mine.second_value.")
@@ -107,7 +107,7 @@ class ChangeValueAPITestCase(TestBase):
self.assertTrue(
error.Success(),
"Got a changed value from mine.second_val")
self.assertTrue(actual_value == 98765,
self.assertEquals(actual_value, 98765,
"Got the right changed value from mine.second_val")
# Next do the same thing with the pointer version.
@@ -120,7 +120,7 @@ class ChangeValueAPITestCase(TestBase):
self.assertTrue(
error.Success(),
"Got an unsigned value for ptr->second_val")
self.assertTrue(actual_value == 6666)
self.assertEquals(actual_value, 6666)
result = ptr_second_value.SetValueFromCString("98765")
self.assertTrue(result, "Success setting ptr->second_value.")
@@ -128,7 +128,7 @@ class ChangeValueAPITestCase(TestBase):
self.assertTrue(
error.Success(),
"Got a changed value from ptr->second_val")
self.assertTrue(actual_value == 98765,
self.assertEquals(actual_value, 98765,
"Got the right changed value from ptr->second_val")
# gcc may set multiple locations for breakpoint
@@ -138,7 +138,7 @@ class ChangeValueAPITestCase(TestBase):
# values as well...
process.Continue()
self.assertTrue(process.GetState() == lldb.eStateStopped)
self.assertEquals(process.GetState(), lldb.eStateStopped)
thread = lldbutil.get_stopped_thread(
process, lldb.eStopReasonBreakpoint)
self.assertTrue(
@@ -171,7 +171,7 @@ class ChangeValueAPITestCase(TestBase):
process.Continue()
self.assertTrue(process.GetState() == lldb.eStateStopped)
self.assertEquals(process.GetState(), lldb.eStateStopped)
thread = lldbutil.get_stopped_thread(
process, lldb.eStopReasonBreakpoint)
self.assertTrue(

2
lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
View File

@@ -28,7 +28,7 @@ class ValueAPIEmptyClassTestCase(TestBase):
self.assertTrue(process, PROCESS_IS_VALID)
# Get Frame #0.
self.assertTrue(process.GetState() == lldb.eStateStopped)
self.assertEquals(process.GetState(), lldb.eStateStopped)
thread = lldbutil.get_stopped_thread(
process, lldb.eStopReasonBreakpoint)
self.assertTrue(