Skip to content

Commit 7dc350a

Browse files
committed
Improve the rendering of test_diagnosis_t // string
This concatenation now automatically inserts a ": " delimiter between the resulting diagnostic strings, to provide more natural behavior for clients who shouldn't need to provide strings that begin with a delimiter
1 parent 7192e87 commit 7dc350a

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/julienne/julienne_test_diagnosis_s.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
if (lhs%test_passed_) then
2626
lhs_cat_rhs = lhs
2727
else
28-
lhs_cat_rhs = test_diagnosis_t(lhs%test_passed_, lhs%diagnostics_string_ // rhs)
28+
lhs_cat_rhs = test_diagnosis_t(lhs%test_passed_, lhs%diagnostics_string_ // ": " // rhs)
2929
end if
3030
end procedure
3131

3232
module procedure append_character_if_test_failed
3333
if (lhs%test_passed_) then
3434
lhs_cat_rhs = lhs
3535
else
36-
lhs_cat_rhs = test_diagnosis_t(lhs%test_passed_, lhs%diagnostics_string_ // rhs)
36+
lhs_cat_rhs = test_diagnosis_t(lhs%test_passed_, lhs%diagnostics_string_ // ": " // rhs)
3737
end if
3838
end procedure
3939

test/modules/test_diagnosis_test_m.F90

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -259,20 +259,20 @@ function check_string_concatentation() result(test_diagnosis)
259259
type(test_diagnosis_t) test_diagnosis
260260

261261
#ifndef __GFORTRAN__
262-
associate(diagnosis_cat_string => test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // string_t(" yada yada"))
263-
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah yada yada"
262+
associate(diagnosis_cat_string => test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // string_t("yada yada"))
263+
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah: yada yada"
264264
end associate
265-
associate(diagnosis_do_not_cat_string => test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // string_t(" yada yada"))
265+
associate(diagnosis_do_not_cat_string => test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // string_t("yada yada"))
266266
test_diagnosis = test_diagnosis .also. (diagnosis_do_not_cat_string%diagnostics_string() .equalsExpected. "blah blah")
267267
end associate
268268
#else
269269
block
270270
type(test_diagnosis_t) diagnosis_cat_string, diagnosis_do_not_cat_string
271271

272-
diagnosis_cat_string = test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // string_t(" yada yada")
273-
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah yada yada"
272+
diagnosis_cat_string = test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // string_t("yada yada")
273+
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah: yada yada"
274274

275-
diagnosis_do_not_cat_string = test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // string_t(" yada yada")
275+
diagnosis_do_not_cat_string = test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // string_t("yada yada")
276276
test_diagnosis = test_diagnosis .also. (diagnosis_do_not_cat_string%diagnostics_string() .equalsExpected. "blah blah")
277277
end block
278278
#endif
@@ -281,20 +281,20 @@ function check_string_concatentation() result(test_diagnosis)
281281
function check_character_concatentation() result(test_diagnosis)
282282
type(test_diagnosis_t) test_diagnosis
283283
#ifndef __GFORTRAN__
284-
associate(diagnosis_cat_string => test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // " yada yada")
285-
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah yada yada"
284+
associate(diagnosis_cat_string => test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // "yada yada")
285+
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah: yada yada"
286286
end associate
287-
associate(diagnosis_do_not_cat_string => test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // " yada yada")
287+
associate(diagnosis_do_not_cat_string => test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // "yada yada")
288288
test_diagnosis = test_diagnosis .also. (diagnosis_do_not_cat_string%diagnostics_string() .equalsExpected. "blah blah")
289289
end associate
290290
#else
291291
block
292292
type(test_diagnosis_t) diagnosis_cat_string, diagnosis_do_not_cat_string
293293

294-
diagnosis_cat_string = test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // " yada yada"
295-
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah yada yada"
294+
diagnosis_cat_string = test_diagnosis_t(test_passed=.false., diagnostics_string="blah blah") // "yada yada"
295+
test_diagnosis = diagnosis_cat_string%diagnostics_string() .equalsExpected. "blah blah: yada yada"
296296

297-
diagnosis_do_not_cat_string = test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // " yada yada"
297+
diagnosis_do_not_cat_string = test_diagnosis_t(test_passed=.true., diagnostics_string="blah blah") // "yada yada"
298298
test_diagnosis = test_diagnosis .also. (diagnosis_do_not_cat_string%diagnostics_string() .equalsExpected. "blah blah")
299299
end block
300300
#endif

0 commit comments

Comments
 (0)