tests: Incorporate recent Julienne improvements

* New `test_diagnosis_t` copy constructor allows the `ALSO` macros to accept
  either `test_diagnosis_t` or default logical
* This in turn allows removal of many uses of `.expect.`

Author: bonachea

test/prif_allocate_test.F90

@@ -15,7 +15,7 @@ module prif_allocate_test_m
   use prif, only : prif_deallocate_coarray, prif_deallocate_coarrays
 #endif
   use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
-    ,operator(.all.), operator(.also.), operator(.equalsExpected.), operator(.expect.), operator(//)
+    ,operator(.all.), operator(.also.), operator(.equalsExpected.), operator(//)
   use iso_c_binding, only: &
       c_ptr, c_int, c_int64_t, c_size_t, c_null_funptr, &
       c_f_pointer, c_null_ptr, c_loc, c_associated, c_intptr_t
@@ -72,15 +72,15 @@ function check_allocate_integer_scalar_coarray_with_corank1() result(diag)
 
     allocated_memory = c_null_ptr
     local_slice => null()
-    ALSO(.expect. (.not. associated(local_slice)))
+    ALSO(.not. associated(local_slice))
 
     data_size = storage_size(dummy_element)/8
     call prif_allocate_coarray( &
       lcobounds, ucobounds, data_size, c_null_funptr, &
       coarray_handle, allocated_memory)
 
     call c_f_pointer(allocated_memory, local_slice)
-    ALSO(.expect. associated(local_slice))
+    ALSO(associated(local_slice))
 
     local_slice = 42
     ALSO(local_slice .equalsExpected. 42)
@@ -172,7 +172,7 @@ function assert_aliased(h1, h2, offset) result(diag)
 
     call prif_set_context_data(h2, c_null_ptr)
     call prif_get_context_data(h1, c1)
-    ALSO(.expect. (.not. c_associated(c1)))
+    ALSO(.not. c_associated(c1))
 
   end function
 
@@ -199,7 +199,7 @@ function check_allocate_integer_array_coarray_with_corank2() result(diag)
 
     allocated_memory = c_null_ptr
     local_slice => null()
-    ALSO(.expect. (.not.associated(local_slice)))
+    ALSO(.not.associated(local_slice))
 
     data_size = 10*storage_size(dummy_element)/8
     call prif_allocate_coarray( &
@@ -210,7 +210,7 @@ function check_allocate_integer_array_coarray_with_corank2() result(diag)
     ALSO2(query_size .equalsExpected. data_size, "invalid prif_size_bytes")
 
     call c_f_pointer(allocated_memory, local_slice, [10])
-    ALSO(.expect. associated(local_slice))
+    ALSO(associated(local_slice))
 
     local_slice = [(i*i, i = 1, 10)]
     ALSO(.all. (local_slice .equalsExpected. [(i*i, i = 1, 10)]))

test/prif_atomic_test.F90

@@ -5,7 +5,7 @@ module prif_atomic_test_m
     use iso_c_binding, only: &
             c_ptr, c_int64_t, c_intptr_t, c_size_t, c_null_funptr, c_f_pointer, c_loc, c_sizeof
     use julienne_m, only: call_julienne_assert_, test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
-      ,operator(.also.), operator(.expect.), operator(.equalsExpected.), operator(.isAtLeast.), operator(.isAtMost.), operator(.lessThan.), operator(//)
+      ,operator(.also.), operator(.equalsExpected.), operator(.isAtLeast.), operator(.isAtMost.), operator(.lessThan.), operator(//)
     use prif
 #if FORCE_PRIF_0_5 || FORCE_PRIF_0_6
   use prif, only : prif_deallocate_coarray_ => prif_deallocate_coarray
@@ -401,7 +401,7 @@ function check_atomic_contended() result(diag)
             call prif_atomic_cas_logical_indirect(root, base_addr_logical, &
                                               old=value_logical, compare=tmp_logical, new=(.not. tmp_logical))
             if (value_logical .eqv. tmp_logical) exit ! success 
-            ALSO2(.expect. logical(value_logical .eqv. .not. tmp_logical), desc//"mid-swap sanity check")
+            ALSO2(logical(value_logical .eqv. .not. tmp_logical), desc//"mid-swap sanity check")
             tmp_logical = value_logical ! collision => retry
           end do
 

test/prif_co_reduce_test.F90

@@ -8,7 +8,6 @@ module prif_co_reduce_test_m
     ,operator(.also.) &
     ,operator(.approximates.) &
     ,operator(.equalsExpected.) &
-    ,operator(.expect.) &
     ,operator(.within.) &
     ,operator(//) &
     ,usher &
@@ -75,14 +74,14 @@ function check_logical() result(diag)
 
     val = .true.
     call prif_co_reduce(val, op, c_null_ptr)
-    ALSO(.expect. val)
+    ALSO(val)
 
     call prif_this_image_no_coarray(this_image=me)
     if (me == 1) then
       val = .false.
     end if
     call prif_co_reduce(val, op, c_null_ptr)
-    ALSO(.expect. (.not. val))
+    ALSO(.not. val)
   end function
 
   subroutine and_wrapper(arg1, arg2_and_out, count, cdata) bind(C)

test/prif_coarray_inquiry_test.F90

@@ -20,7 +20,6 @@ module prif_coarray_inquiry_test_m
     ,operator(.all.) &
     ,operator(.also.) &
     ,operator(.equalsExpected.) &
-    ,operator(.expect.) &
     ,usher &
     ,string_t &
     ,test_description_t &
@@ -77,7 +76,7 @@ function check_prif_local_data_pointer() result(diag)
               coarray_handle, &
               allocation_ptr)
       call prif_local_data_pointer(coarray_handle, local_ptr)
-      diag = .expect. c_associated(local_ptr, allocation_ptr)
+      diag = c_associated(local_ptr, allocation_ptr)
       call prif_deallocate_coarray(coarray_handle)
   end function
 
@@ -113,7 +112,7 @@ impure elemental function check_cobound(corank) result(diag)
       lcobounds, ucobounds, data_size, c_null_funptr, &
       coarray_handle, allocated_memory)
 
-    ALSO(.expect. c_associated(allocated_memory))
+    ALSO(c_associated(allocated_memory))
 
     call prif_size_bytes(coarray_handle, data_size=query_size)
     ALSO2(query_size .equalsExpected. data_size, "prif_size_bytes is valid")

test/prif_image_queries_test.F90

@@ -61,7 +61,7 @@ function valid_image_list(nums) result(diag)
 
       call prif_num_images(num_images=ni)
       diag = &
-         .expect. allocated(nums) .also. &
+          allocated(nums) .also. &
          (size(nums) .isAtMost. ni) .also. &
          (.all. (nums .isAtLeast. 1)) .also. &
          (.all. (nums .isAtMost. ni)) .also. &

test/prif_sync_images_test.F90

@@ -1,7 +1,7 @@
 module prif_sync_images_test_m
     use iso_c_binding, only: c_int
     use prif, only : prif_sync_images, prif_this_image_no_coarray, prif_num_images, prif_sync_all
-    use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, operator(.expect.), usher
+    use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, usher
 
     implicit none
     private

test/prif_types_test.F90

@@ -4,7 +4,7 @@ module prif_types_test_m
     use iso_fortran_env, only: int8
     use prif, only: prif_team_type, prif_event_type, prif_notify_type, prif_lock_type, prif_critical_type
     use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, string_t, usher &
-       ,operator(.all.), operator(.also.), operator(.expect.), operator(.equalsExpected.), operator(.greaterThan.), operator(.isAtMost.), operator(//)
+       ,operator(.all.), operator(.also.), operator(.equalsExpected.), operator(.greaterThan.), operator(.isAtMost.), operator(//)
 
     implicit none
     private
@@ -61,7 +61,7 @@ function check_team_type() result(diag)
         ! default initialization check
         pointer_wrap%info => tgt
         pointer_wrap = transfer(team, pointer_wrap)
-        ALSO2(.expect.(.not. associated(pointer_wrap%info)), "default initialization to null")
+        ALSO2(.not. associated(pointer_wrap%info), "default initialization to null")
     end function
 
     function check_event_type() result(diag)

test/test-utils.F90

@@ -17,6 +17,7 @@
 #endif
 
 #define ALSO(exp) ALSO2(exp, "expression: (" // CPP_STRINGIFY_SOURCE(exp) // ")")
-#define ALSO2(exp,desc) diag = diag .also. (exp) // NEW_LINE(' ') // \
-                        __FILE__ // ":" // CPP_LINE_STRING // ": FAILED: " // desc
+#define ALSO2(exp,desc) diag = diag .also. \
+                      ( test_diagnosis_t(exp, NEW_LINE('')) // \
+                        __FILE__ // ":" // CPP_LINE_STRING // ": FAILED: " // desc )