Skip to content

Commit 2686923

Browse files
eleanorjboydeleanorjboyd
committed
round 2 changes
1 parent 14e95a8 commit 2686923

File tree

4 files changed

+188
-203
lines changed

4 files changed

+188
-203
lines changed

‎pythonFiles/tests/pytestadapter/expected_discovery_test_output.py‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22

3-
from .helpers import TEST_DATA_PATH, find_test_line_no
3+
from .helpers import TEST_DATA_PATH, find_test_line_number
44

55
# This is the expected output for the empty_discovery.py file.
66
# └──
@@ -31,7 +31,7 @@
3131
{
3232
"name": "test_function",
3333
"path": simple_test_file_path,
34-
"lineno": find_test_line_no(
34+
"lineno": find_test_line_number(
3535
"test_function",
3636
simple_test_file_path,
3737
),
@@ -50,7 +50,6 @@
5050
# ├── TestExample
5151
# │ └── test_true_unittest
5252
# └── test_true_pytest
53-
5453
unit_pytest_same_file_path = f"{TEST_DATA_PATH_STR}/unittest_pytest_same_file.py"
5554
unit_pytest_same_file_discovery_expected_output = {
5655
"name": ".data",
@@ -71,7 +70,7 @@
7170
{
7271
"name": "test_true_unittest",
7372
"path": unit_pytest_same_file_path,
74-
"lineno": find_test_line_no(
73+
"lineno": find_test_line_number(
7574
"test_true_unittest",
7675
unit_pytest_same_file_path,
7776
),
@@ -85,7 +84,7 @@
8584
{
8685
"name": "test_true_pytest",
8786
"path": unit_pytest_same_file_path,
88-
"lineno": find_test_line_no(
87+
"lineno": find_test_line_number(
8988
"test_true_pytest",
9089
unit_pytest_same_file_path,
9190
),
@@ -109,7 +108,6 @@
109108
# └── TestSubtractFunction
110109
# ├── test_subtract_negative_numbers
111110
# └── test_subtract_positive_numbers
112-
113111
unittest_folder_path = f"{TEST_DATA_PATH_STR}/unittest_folder"
114112
test_add_path = f"{TEST_DATA_PATH_STR}/unittest_folder/test_add.py"
115113
test_subtract_path = f"{TEST_DATA_PATH_STR}/unittest_folder/test_subtract.py"
@@ -138,7 +136,7 @@
138136
{
139137
"name": "test_add_negative_numbers",
140138
"path": test_add_path,
141-
"lineno": find_test_line_no(
139+
"lineno": find_test_line_number(
142140
"test_add_negative_numbers",
143141
test_add_path,
144142
),
@@ -149,7 +147,7 @@
149147
{
150148
"name": "test_add_positive_numbers",
151149
"path": test_add_path,
152-
"lineno": find_test_line_no(
150+
"lineno": find_test_line_number(
153151
"test_add_positive_numbers",
154152
test_add_path,
155153
),
@@ -176,7 +174,7 @@
176174
{
177175
"name": "test_subtract_negative_numbers",
178176
"path": test_subtract_path,
179-
"lineno": find_test_line_no(
177+
"lineno": find_test_line_number(
180178
"test_subtract_negative_numbers",
181179
test_subtract_path,
182180
),
@@ -187,7 +185,7 @@
187185
{
188186
"name": "test_subtract_positive_numbers",
189187
"path": test_subtract_path,
190-
"lineno": find_test_line_no(
188+
"lineno": find_test_line_number(
191189
"test_subtract_positive_numbers",
192190
test_subtract_path,
193191
),
@@ -244,7 +242,7 @@
244242
{
245243
"name": "test_top_function_t",
246244
"path": test_top_folder_path,
247-
"lineno": find_test_line_no(
245+
"lineno": find_test_line_number(
248246
"test_top_function_t",
249247
test_top_folder_path,
250248
),
@@ -255,7 +253,7 @@
255253
{
256254
"name": "test_top_function_f",
257255
"path": test_top_folder_path,
258-
"lineno": find_test_line_no(
256+
"lineno": find_test_line_number(
259257
"test_top_function_f",
260258
test_top_folder_path,
261259
),
@@ -280,7 +278,7 @@
280278
{
281279
"name": "test_bottom_function_t",
282280
"path": test_bottom_folder_path,
283-
"lineno": find_test_line_no(
281+
"lineno": find_test_line_number(
284282
"test_bottom_function_t",
285283
test_bottom_folder_path,
286284
),
@@ -291,7 +289,7 @@
291289
{
292290
"name": "test_bottom_function_f",
293291
"path": test_bottom_folder_path,
294-
"lineno": find_test_line_no(
292+
"lineno": find_test_line_number(
295293
"test_bottom_function_f",
296294
test_bottom_folder_path,
297295
),
@@ -355,7 +353,7 @@
355353
{
356354
"name": "test_function",
357355
"path": double_nested_test_nest_path,
358-
"lineno": find_test_line_no(
356+
"lineno": find_test_line_number(
359357
"test_function",
360358
double_nested_test_nest_path,
361359
),
@@ -395,7 +393,7 @@
395393
{
396394
"name": "test_adding[3+5-8]",
397395
"path": parameterize_tests_path,
398-
"lineno": find_test_line_no(
396+
"lineno": find_test_line_number(
399397
"test_adding[3+5-8]",
400398
parameterize_tests_path,
401399
),
@@ -406,7 +404,7 @@
406404
{
407405
"name": "test_adding[2+4-6]",
408406
"path": parameterize_tests_path,
409-
"lineno": find_test_line_no(
407+
"lineno": find_test_line_number(
410408
"test_adding[2+4-6]",
411409
parameterize_tests_path,
412410
),
@@ -417,7 +415,7 @@
417415
{
418416
"name": "test_adding[6+9-16]",
419417
"path": parameterize_tests_path,
420-
"lineno": find_test_line_no(
418+
"lineno": find_test_line_number(
421419
"test_adding[6+9-16]",
422420
parameterize_tests_path,
423421
),
@@ -448,7 +446,7 @@
448446
{
449447
"name": "text_docstring.txt",
450448
"path": text_docstring_path,
451-
"lineno": find_test_line_no(
449+
"lineno": find_test_line_number(
452450
"text_docstring.txt",
453451
text_docstring_path,
454452
),

0 commit comments

Comments
 (0)