You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This commit adds support and a corresponding unit test for
constructing a test_diagnosis_t object from expressions that
evaluate to vector test_diagnosis_t objects:
.all. ((2 .equalsExpected. [2,2,2]) .and. ([0,1,2] .equalsExpected. [0,1,2]))
where the two .and. operands are one-dimensional test_diagnosis_t arrays.
Copy file name to clipboardExpand all lines: test/test_diagnosis_test_m.F90
+15-5Lines changed: 15 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -59,7 +59,8 @@ function results() result(test_results)
59
59
,test_description_t("contruction from a integer expression of the form 'i .greaterThan. j", check_greater_than_integer) &
60
60
,test_description_t("contruction from a integer expression of the form '[i,j] .lessThanOrEqualTo. k", check_less_than_or_equal_to_integer) &
61
61
,test_description_t("contruction from a integer expression of the form '[i,j] .greaterThanOrEqualTo. k", check_greater_than_or_equal_to_integer) &
62
-
,test_description_t("contruction from a test_diagnostics_t expression of the form 't .and. u'", check_and_operator) &
62
+
,test_description_t("contruction from a scalar test_diagnostics_t expression of the form 't .and. u'", check_and_with_scalar_operands) &
63
+
,test_description_t("contruction from vector test_diagnostics_t expressions with operands like 'i .equalsExpected. [j,k]'", check_and_with_vector_operands) &
63
64
] )
64
65
#else
65
66
! Work around missing Fortran 2008 feature: associating a procedure actual argument with a procedure pointer dummy argument:
@@ -71,7 +72,8 @@ function results() result(test_results)
test_description_t("contruction from a real expression of the form `x .approximates. y .within. tolerance`" , check_approximates_real_ptr) &
@@ -98,7 +101,9 @@ function results() result(test_results)
98
101
,test_description_t("contruction from a double precision expression of the form 'x .greaterThan. y" , check_greater_than_double_ptr) &
99
102
,test_description_t("contruction from a integer expression of the form 'i .greaterThan. j" , check_greater_than_integer_ptr) &
100
103
,test_description_t("contruction from a integer expression of the form 'i .greaterThanOrEqualTo. j") & ! skip check_greater_than_or_equal_to_integer_ptr
101
-
,test_description_t("contruction from a test_diagnostics_t expression of the form 't .and. u'" ) & ! skip check_and_operator_ptr
104
+
,test_description_t("contruction from a scalar test_diagnostics_t expression with operands like 'i .equalsExpected. j'" ) & ! skip check_and_with_scalar_operands_ptr
105
+
,test_description_t("contruction from test_diagnostics_t vector expressions with operands like 'i .equalsExpected. [j,k]'") & ! skip check_and_with_vector_operands_ptr
106
+
check_and_with_vector_operands
102
107
]
103
108
#endif
104
109
@@ -192,10 +197,15 @@ function check_greater_than_or_equal_to_integer() result(test_diagnosis)
0 commit comments