Skip to content

Commit 8fa028b

Browse files
committed
feat(test): add test subject substring check
1 parent 2f25423 commit 8fa028b

File tree

8 files changed

+25
-9
lines changed

8 files changed

+25
-9
lines changed

test/bin_test.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ function results() result(test_results)
3939
test_description_t(string_t("partitioning all item across all bins without item loss"), check_all_items_ptr) &
4040
]
4141
#endif
42-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
42+
test_descriptions = pack(test_descriptions, &
43+
index(subject(), test_description_substring) /= 0 .or. &
44+
test_descriptions%contains_text(string_t(test_description_substring)))
4345
test_results = test_descriptions%run()
4446
end function
4547

test/command_line_test.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ function results() result(test_results)
3535
test_description_t(string_t("returning the value passed after a command-line flag"), check_flag_ptr) &
3636
]
3737
#endif
38-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
38+
test_descriptions = pack(test_descriptions, &
39+
index(subject(), test_description_substring) /= 0 .or. &
40+
test_descriptions%contains_text(string_t(test_description_substring)))
3941
test_results = test_descriptions%run()
4042
end function
4143

test/data_partition_test.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ function results() result(test_results)
6767
string_t("gathering dimension 1 of 2D real array onto result_image with dim argument"), check_gather_2D_real_array_ptr) &
6868
]
6969
#endif
70-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
70+
test_descriptions = pack(test_descriptions, &
71+
index(subject(), test_description_substring) /= 0 .or. &
72+
test_descriptions%contains_text(string_t(test_description_substring)))
7173
test_results = test_descriptions%run()
7274
end function
7375

test/formats_test.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ function results() result(test_results)
4545
test_description_t(string_t("yielding a new-line-separated list of integer numbers"), check_new_line_ptr) &
4646
]
4747
#endif
48-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
48+
test_descriptions = pack(test_descriptions, &
49+
index(subject(), test_description_substring) /= 0 .or. &
50+
test_descriptions%contains_text(string_t(test_description_substring)))
4951
test_results = test_descriptions%run()
5052

5153
end function

test/object_m_test.F90 renamed to test/object_test.F90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module object_m_test_m
2121

2222
pure function subject() result(specimen)
2323
character(len=:), allocatable :: specimen
24-
specimen = "The object_m type"
24+
specimen = "The object_t type"
2525
end function
2626

2727
function results() result(test_results)
@@ -43,7 +43,9 @@ function results() result(test_results)
4343
test_description_t(string_t("object being user_defined() after call to mark_as_defined"), check_mark_ptr) &
4444
]
4545
#endif
46-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
46+
test_descriptions = pack(test_descriptions, &
47+
index(subject(), test_description_substring) /= 0 .or. &
48+
test_descriptions%contains_text(string_t(test_description_substring)))
4749
test_results = test_descriptions%run()
4850

4951
end function

test/string_test.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ function results() result(test_results)
102102
test_description_t(string_t('extracting a file name extension'), extracts_file_name_ptr) &
103103
]
104104
#endif
105-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
105+
test_descriptions = pack(test_descriptions, &
106+
index(subject(), test_description_substring) /= 0 .or. &
107+
test_descriptions%contains_text(string_t(test_description_substring)))
106108
test_results = test_descriptions%run()
107109
end function
108110

test/test_result_test.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ function results() result(test_results)
4141
test_description_t(string_t("reporting failure if the test fails on one image"), check_single_ptr) &
4242
]
4343
#endif
44-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
44+
test_descriptions = pack(test_descriptions, &
45+
index(subject(), test_description_substring) /= 0 .or. &
46+
test_descriptions%contains_text(string_t(test_description_substring)))
4547
test_results = test_descriptions%run()
4648
end function
4749

test/user_defined_collectives_test.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ function results() result(test_results)
4141
(string_t("setting all arguments to .false. when previously .false. on image 1"), check_co_all_one_false_ptr) &
4242
]
4343
#endif
44-
test_descriptions = pack(test_descriptions, test_descriptions%contains_text(string_t(test_description_substring)))
44+
test_descriptions = pack(test_descriptions, &
45+
index(subject(), test_description_substring) /= 0 .or. &
46+
test_descriptions%contains_text(string_t(test_description_substring)))
4547
test_results = test_descriptions%run()
4648
end function
4749

0 commit comments

Comments
 (0)