feat(test_diagnosis): .and. aggregates diagnoses

This commit adds support and a corresponding unit test for
constructing a test_diagnosis_t object from a test_diagnosis_t
expression of the form

  (0 .lessThanOrEqualTo. 1) .and. (2 .equalsExpected. 2)

where the two .and. operands are test_diagnosis_t objects, which in
the above case happen to be the result expression evaluations.

Author: rouson

src/julienne/julienne_test_diagnosis_m.F90

@@ -11,6 +11,7 @@ module julienne_test_diagnosis_m
   private
   public :: test_diagnosis_t
   public :: operator(.all.)
+  public :: operator(.and.)
   public :: operator(.approximates.)
   public :: operator(.within.)
   public :: operator(.equalsExpected.)
@@ -56,6 +57,16 @@ pure module function aggregate_diagnosis(diagnoses) result(diagnosis)
 
   end interface
 
+  interface operator(.and.)
+     
+    elemental module function and(lhs, rhs) result(diagnosis)
+      implicit none
+      type(test_diagnosis_t), intent(in) :: lhs, rhs
+      type(test_diagnosis_t) diagnosis
+    end function
+
+  end interface
+
   interface operator(.approximates.)
 
     elemental module function approximates_real(actual, expected) result(operands)

src/julienne/julienne_test_diagnosis_s.F90

@@ -10,6 +10,10 @@
   implicit none
 contains
 
+  module procedure and
+     diagnosis = .all. ([lhs,rhs])
+  end procedure 
+
   module procedure aggregate_diagnosis
     character(len=*), parameter :: new_line_indent = new_line('') // "        "
     integer i

src/julienne_m.f90

@@ -13,6 +13,7 @@ module julienne_m
   use julienne_test_diagnosis_m, only : &
      test_diagnosis_t &
     ,operator(.all.) &
+    ,operator(.and.) &
     ,operator(.approximates.) &
     ,operator(.within.) &
     ,operator(.equalsExpected.) &

test/test_diagnosis_test_m.F90

@@ -17,6 +17,7 @@ module test_diagnosis_test_m
     ,diagnosis_function_i &
 #endif
     ,operator(.all.) &
+    ,operator(.and.) &
     ,operator(.equalsExpected.) &
     ,operator(.approximates.) &
     ,operator(.within.) &
@@ -58,6 +59,7 @@ function results() result(test_results)
       ,test_description_t("contruction from a integer expression of the form 'i .greaterThan. j", check_greater_than_integer) &
       ,test_description_t("contruction from a integer expression of the form '[i,j] .lessThanOrEqualTo. k", check_less_than_or_equal_to_integer) &
       ,test_description_t("contruction from a integer expression of the form '[i,j] .greaterThanOrEqualTo. k", check_greater_than_or_equal_to_integer) &
+      ,test_description_t("contruction from a test_diagnostics_t expression of the form 't .and. u'", check_and_operator) &
     ] )
 #else
      ! Work around missing Fortran 2008 feature: associating a procedure actual argument with a procedure pointer dummy argument:
@@ -68,8 +70,9 @@ function results() result(test_results)
        ,check_less_than_real_ptr               , check_greater_than_real_ptr &
        ,check_less_than_double_ptr             , check_greater_than_double_ptr &
        ,check_less_than_integer_ptr            , check_greater_than_integer_ptr &
-       ,check_less_than_or_equal_to_integer_ptr, check_greater_than_or_equal_to_integer_ptr
-       
+       ,check_less_than_or_equal_to_integer_ptr, check_greater_than_or_equal_to_integer_ptr &
+       ,check_and_operator_ptr
+
      check_approximates_real_ptr                => check_approximates_real
      check_approximates_double_ptr             => check_approximates_double
      check_equals_integer_ptr                   => check_equals_integer
@@ -81,6 +84,7 @@ function results() result(test_results)
      check_greater_than_double_ptr              => check_greater_than_double
      check_greater_than_integer_ptr             => check_greater_than_integer
      check_greater_than_or_equal_to_integer_ptr => check_greater_than_or_equal_to_integer
+     check_and_operator_ptr                     => check_and_operator
 
      descriptions = [ &
        test_description_t("contruction from a real expression of the form `x .approximates. y .within. tolerance`"            , check_approximates_real_ptr) &
@@ -89,11 +93,12 @@ function results() result(test_results)
       ,test_description_t("contruction from a real expression of the form 'x .lessThan. y"                                    , check_less_than_real_ptr) &
       ,test_description_t("contruction from a double precision expression of the form 'x .lessThan. y"                        , check_less_than_double_ptr) &
       ,test_description_t("contruction from a integer expression of the form 'i .lessThan. j"                                 , check_less_than_integer_ptr) &
-      ,test_description_t("contruction from a integer expression of the form 'i .lessThanOrEqualTo. j"                        ) & ! skip check_less_than_or_equal_to_integer_ptr
+      ,test_description_t("contruction from a integer expression of the form 'i .lessThanOrEqualTo. j"   ) & ! skip check_less_than_or_equal_to_integer_ptr
       ,test_description_t("contruction from a real expression of the form 'x .greaterThan. y"                                 , check_greater_than_real_ptr) &
       ,test_description_t("contruction from a double precision expression of the form 'x .greaterThan. y"                     , check_greater_than_double_ptr) &
       ,test_description_t("contruction from a integer expression of the form 'i .greaterThan. j"                              , check_greater_than_integer_ptr) &
-      ,test_description_t("contruction from a integer expression of the form 'i .greaterThanOrEqualTo. j"                     ) & ! skip check_greater_than_or_equal_to_integer_ptr
+      ,test_description_t("contruction from a integer expression of the form 'i .greaterThanOrEqualTo. j") & ! skip check_greater_than_or_equal_to_integer_ptr
+      ,test_description_t("contruction from a test_diagnostics_t expression of the form 't .and. u'"     ) & ! skip check_and_operator_ptr
      ]
 #endif
 
@@ -187,4 +192,10 @@ function check_greater_than_or_equal_to_integer() result(test_diagnosis)
     test_diagnosis = .all. ([1,2] .greaterThanOrEqualTo. expected_min)
   end function
 
+  function check_and_operator() result(test_diagnosis)
+    type(test_diagnosis_t) test_diagnosis
+    integer, parameter :: expected_min = 1
+    test_diagnosis = (2 .greaterThanOrEqualTo. expected_min) .and. (1 .equalsExpected. 1)
+  end function
+
 end module test_diagnosis_test_m