Skip to content

Commit a4ad052

Browse files
JDevlieghereJDevlieghere
committed
[lldb-dap] Replace assertEquals with assertEqual (NFC)
Fixes new test that were added or modified after #82073. Also fixes a formatting issue.
1 parent dc8d70a commit a4ad052

File tree

2 files changed

+57
-49
lines changed

2 files changed

+57
-49
lines changed

‎lldb/test/API/tools/lldb-dap/databreakpoint/TestDAP_setDataBreakpoints.py

+31-31
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ def test_duplicate_start_addresses(self):
2727
response_x = self.dap_server.request_dataBreakpointInfo(0, "&x")
2828
response_arr_2 = self.dap_server.request_dataBreakpointInfo(0, "arr+2")
2929
# Test response from dataBreakpointInfo request.
30-
self.assertEquals(response_x["body"]["dataId"].split("/")[1], "4")
31-
self.assertEquals(response_x["body"]["accessTypes"], self.accessTypes)
32-
self.assertEquals(response_arr_2["body"]["dataId"].split("/")[1], "4")
33-
self.assertEquals(response_arr_2["body"]["accessTypes"], self.accessTypes)
30+
self.assertEqual(response_x["body"]["dataId"].split("/")[1], "4")
31+
self.assertEqual(response_x["body"]["accessTypes"], self.accessTypes)
32+
self.assertEqual(response_arr_2["body"]["dataId"].split("/")[1], "4")
33+
self.assertEqual(response_arr_2["body"]["accessTypes"], self.accessTypes)
3434
# The first one should be overwritten by the third one as they start at
3535
# the same address. This is indicated by returning {verified: False} for
3636
# the first one.
@@ -40,22 +40,22 @@ def test_duplicate_start_addresses(self):
4040
{"dataId": response_x["body"]["dataId"], "accessType": "write"},
4141
]
4242
set_response = self.dap_server.request_setDataBreakpoint(dataBreakpoints)
43-
self.assertEquals(
43+
self.assertEqual(
4444
set_response["body"]["breakpoints"],
4545
[{"verified": False}, {"verified": True}, {"verified": True}],
4646
)
4747

4848
self.continue_to_next_stop()
4949
x_val = self.dap_server.get_local_variable_value("x")
5050
i_val = self.dap_server.get_local_variable_value("i")
51-
self.assertEquals(x_val, "2")
52-
self.assertEquals(i_val, "1")
51+
self.assertEqual(x_val, "2")
52+
self.assertEqual(i_val, "1")
5353

5454
self.continue_to_next_stop()
5555
arr_2 = self.dap_server.get_local_variable_child("arr", "[2]")
5656
i_val = self.dap_server.get_local_variable_value("i")
57-
self.assertEquals(arr_2["value"], "42")
58-
self.assertEquals(i_val, "2")
57+
self.assertEqual(arr_2["value"], "42")
58+
self.assertEqual(i_val, "2")
5959

6060
@skipIfWindows
6161
@skipIfRemote
@@ -72,31 +72,31 @@ def test_expression(self):
7272
response_x = self.dap_server.request_dataBreakpointInfo(0, "&x")
7373
response_arr_2 = self.dap_server.request_dataBreakpointInfo(0, "arr+2")
7474
# Test response from dataBreakpointInfo request.
75-
self.assertEquals(response_x["body"]["dataId"].split("/")[1], "4")
76-
self.assertEquals(response_x["body"]["accessTypes"], self.accessTypes)
77-
self.assertEquals(response_arr_2["body"]["dataId"].split("/")[1], "4")
78-
self.assertEquals(response_arr_2["body"]["accessTypes"], self.accessTypes)
75+
self.assertEqual(response_x["body"]["dataId"].split("/")[1], "4")
76+
self.assertEqual(response_x["body"]["accessTypes"], self.accessTypes)
77+
self.assertEqual(response_arr_2["body"]["dataId"].split("/")[1], "4")
78+
self.assertEqual(response_arr_2["body"]["accessTypes"], self.accessTypes)
7979
dataBreakpoints = [
8080
{"dataId": response_x["body"]["dataId"], "accessType": "write"},
8181
{"dataId": response_arr_2["body"]["dataId"], "accessType": "write"},
8282
]
8383
set_response = self.dap_server.request_setDataBreakpoint(dataBreakpoints)
84-
self.assertEquals(
84+
self.assertEqual(
8585
set_response["body"]["breakpoints"],
8686
[{"verified": True}, {"verified": True}],
8787
)
8888

8989
self.continue_to_next_stop()
9090
x_val = self.dap_server.get_local_variable_value("x")
9191
i_val = self.dap_server.get_local_variable_value("i")
92-
self.assertEquals(x_val, "2")
93-
self.assertEquals(i_val, "1")
92+
self.assertEqual(x_val, "2")
93+
self.assertEqual(i_val, "1")
9494

9595
self.continue_to_next_stop()
9696
arr_2 = self.dap_server.get_local_variable_child("arr", "[2]")
9797
i_val = self.dap_server.get_local_variable_value("i")
98-
self.assertEquals(arr_2["value"], "42")
99-
self.assertEquals(i_val, "2")
98+
self.assertEqual(arr_2["value"], "42")
99+
self.assertEqual(i_val, "2")
100100

101101
@skipIfWindows
102102
@skipIfRemote
@@ -117,31 +117,31 @@ def test_functionality(self):
117117
)
118118

119119
# Test response from dataBreakpointInfo request.
120-
self.assertEquals(response_x["body"]["dataId"].split("/")[1], "4")
121-
self.assertEquals(response_x["body"]["accessTypes"], self.accessTypes)
122-
self.assertEquals(response_arr_2["body"]["dataId"].split("/")[1], "4")
123-
self.assertEquals(response_arr_2["body"]["accessTypes"], self.accessTypes)
120+
self.assertEqual(response_x["body"]["dataId"].split("/")[1], "4")
121+
self.assertEqual(response_x["body"]["accessTypes"], self.accessTypes)
122+
self.assertEqual(response_arr_2["body"]["dataId"].split("/")[1], "4")
123+
self.assertEqual(response_arr_2["body"]["accessTypes"], self.accessTypes)
124124
dataBreakpoints = [
125125
{"dataId": response_x["body"]["dataId"], "accessType": "write"},
126126
{"dataId": response_arr_2["body"]["dataId"], "accessType": "write"},
127127
]
128128
set_response = self.dap_server.request_setDataBreakpoint(dataBreakpoints)
129-
self.assertEquals(
129+
self.assertEqual(
130130
set_response["body"]["breakpoints"],
131131
[{"verified": True}, {"verified": True}],
132132
)
133133

134134
self.continue_to_next_stop()
135135
x_val = self.dap_server.get_local_variable_value("x")
136136
i_val = self.dap_server.get_local_variable_value("i")
137-
self.assertEquals(x_val, "2")
138-
self.assertEquals(i_val, "1")
137+
self.assertEqual(x_val, "2")
138+
self.assertEqual(i_val, "1")
139139

140140
self.continue_to_next_stop()
141141
arr_2 = self.dap_server.get_local_variable_child("arr", "[2]")
142142
i_val = self.dap_server.get_local_variable_value("i")
143-
self.assertEquals(arr_2["value"], "42")
144-
self.assertEquals(i_val, "2")
143+
self.assertEqual(arr_2["value"], "42")
144+
self.assertEqual(i_val, "2")
145145
self.dap_server.request_setDataBreakpoint([])
146146

147147
# Test hit condition
@@ -156,10 +156,10 @@ def test_functionality(self):
156156
}
157157
]
158158
set_response = self.dap_server.request_setDataBreakpoint(dataBreakpoints)
159-
self.assertEquals(set_response["body"]["breakpoints"], [{"verified": True}])
159+
self.assertEqual(set_response["body"]["breakpoints"], [{"verified": True}])
160160
self.continue_to_next_stop()
161161
x_val = self.dap_server.get_local_variable_value("x")
162-
self.assertEquals(x_val, "3")
162+
self.assertEqual(x_val, "3")
163163

164164
# Test condition
165165
dataBreakpoints = [
@@ -170,7 +170,7 @@ def test_functionality(self):
170170
}
171171
]
172172
set_response = self.dap_server.request_setDataBreakpoint(dataBreakpoints)
173-
self.assertEquals(set_response["body"]["breakpoints"], [{"verified": True}])
173+
self.assertEqual(set_response["body"]["breakpoints"], [{"verified": True}])
174174
self.continue_to_next_stop()
175175
x_val = self.dap_server.get_local_variable_value("x")
176-
self.assertEquals(x_val, "10")
176+
self.assertEqual(x_val, "10")

‎lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py

+26-18
Original file line numberDiff line numberDiff line change
@@ -254,18 +254,22 @@ def do_test_scopes_variables_setVariable_evaluate(
254254
"pt": {
255255
"equals": {"type": "PointType"},
256256
"startswith": {
257-
"result": "{x:11, y:22, buffer:{...}}"
258-
if enableAutoVariableSummaries
259-
else "PointType @ 0x"
257+
"result": (
258+
"{x:11, y:22, buffer:{...}}"
259+
if enableAutoVariableSummaries
260+
else "PointType @ 0x"
261+
)
260262
},
261263
"hasVariablesReference": True,
262264
},
263265
"pt.buffer": {
264266
"equals": {"type": "int[16]"},
265267
"startswith": {
266-
"result": "{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...}"
267-
if enableAutoVariableSummaries
268-
else "int[16] @ 0x"
268+
"result": (
269+
"{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...}"
270+
if enableAutoVariableSummaries
271+
else "int[16] @ 0x"
272+
)
269273
},
270274
"hasVariablesReference": True,
271275
},
@@ -528,19 +532,23 @@ def do_test_scopes_and_evaluate_expansion(self, enableAutoVariableSummaries: boo
528532
"watch": {
529533
"equals": {"type": "PointType"},
530534
"startswith": {
531-
"result": "{x:11, y:22, buffer:{...}}"
532-
if enableAutoVariableSummaries
533-
else "PointType @ 0x"
535+
"result": (
536+
"{x:11, y:22, buffer:{...}}"
537+
if enableAutoVariableSummaries
538+
else "PointType @ 0x"
539+
)
534540
},
535541
"missing": ["indexedVariables"],
536542
"hasVariablesReference": True,
537543
},
538544
"variables": {
539545
"equals": {"type": "PointType"},
540546
"startswith": {
541-
"result": "{x:11, y:22, buffer:{...}}"
542-
if enableAutoVariableSummaries
543-
else "PointType @ 0x"
547+
"result": (
548+
"{x:11, y:22, buffer:{...}}"
549+
if enableAutoVariableSummaries
550+
else "PointType @ 0x"
551+
)
544552
},
545553
"missing": ["indexedVariables"],
546554
"hasVariablesReference": True,
@@ -777,20 +785,20 @@ def test_value_format(self):
777785
# Verify locals value format decimal
778786
is_hex = False
779787
var_pt_x = self.dap_server.get_local_variable_child("pt", "x", is_hex=is_hex)
780-
self.assertEquals(var_pt_x["value"], "11")
788+
self.assertEqual(var_pt_x["value"], "11")
781789
var_pt_y = self.dap_server.get_local_variable_child("pt", "y", is_hex=is_hex)
782-
self.assertEquals(var_pt_y["value"], "22")
790+
self.assertEqual(var_pt_y["value"], "22")
783791

784792
# Verify locals value format hexical
785793
is_hex = True
786794
var_pt_x = self.dap_server.get_local_variable_child("pt", "x", is_hex=is_hex)
787-
self.assertEquals(var_pt_x["value"], "0x0000000b")
795+
self.assertEqual(var_pt_x["value"], "0x0000000b")
788796
var_pt_y = self.dap_server.get_local_variable_child("pt", "y", is_hex=is_hex)
789-
self.assertEquals(var_pt_y["value"], "0x00000016")
797+
self.assertEqual(var_pt_y["value"], "0x00000016")
790798

791799
# Toggle and verify locals value format decimal again
792800
is_hex = False
793801
var_pt_x = self.dap_server.get_local_variable_child("pt", "x", is_hex=is_hex)
794-
self.assertEquals(var_pt_x["value"], "11")
802+
self.assertEqual(var_pt_x["value"], "11")
795803
var_pt_y = self.dap_server.get_local_variable_child("pt", "y", is_hex=is_hex)
796-
self.assertEquals(var_pt_y["value"], "22")
804+
self.assertEqual(var_pt_y["value"], "22")

0 commit comments

Comments
 (0)