test(julienne): append to diagnostics strings

This commit appends the text from veggies assertions  "message"
argument to test diagnoses in the corresponding Julienne tests.
For example, a veggies assertion of the form

assert_equals(actual, expected, message)

becomes a Julienne test diagnosis of the following form:

(actual .equalsExpected. expected) // message

Author: rouson

test/julienne/prif_co_broadcast_test_m.F90

@@ -2,7 +2,14 @@
 
 module prif_co_broadcast_test_m
   use prif, only : prif_co_broadcast, prif_num_images, prif_this_image_no_coarray
-  use julienne_m, only : test_description_t, test_diagnosis_t, test_result_t , test_t, operator(.expect.), operator(.equalsExpected.)
+  use julienne_m, only : &
+     test_description_t &
+    ,test_diagnosis_t &
+    ,test_result_t &
+    ,test_t &
+    ,operator(//) &
+    ,operator(.expect.) &
+    ,operator(.equalsExpected.)
 #if ! HAVE_PROCEDURE_ACTUAL_FOR_POINTER_DUMMY
   use julienne_m, only : diagnosis_function_i
 #endif
@@ -95,7 +102,7 @@ function broadcast_derived_type() result(test_diagnosis)
     object = object_t(me, .false., "gooey", me*(1.,0.))
     call prif_co_broadcast(object, source_image=ni)
     associate(expected_object => object_t(ni, .false., "gooey", ni*(1.,0.)))
-      test_diagnosis = .expect. (object == expected_object)
+      test_diagnosis = .expect. (object == expected_object) // "co_broadcast derived type"
     end associate
   end function
 

test/julienne/prif_coarray_inquiry_test_m.F90

@@ -9,7 +9,8 @@ module prif_coarray_inquiry_test_m
       prif_ucobound_no_dim, prif_ucobound_with_dim, &
       prif_coshape
   use julienne_m, only: &
-     operator(.all.) &
+     operator(//) &
+    ,operator(.all.) &
     ,operator(.also.) &
     ,operator(.equalsExpected.) &
     ,operator(.expect.) &
@@ -126,24 +127,24 @@ impure elemental function check_cobound(corank) result(test_diagnosis)
     test_diagnosis = .expect. c_associated(allocated_memory)
 
     call prif_size_bytes(coarray_handle, data_size=query_size)
-    test_diagnosis = test_diagnosis .also. (query_size .equalsExpected.  data_size) ! "prif_size_bytes is valid"
+    test_diagnosis = test_diagnosis .also. (query_size .equalsExpected.  data_size) // "prif_size_bytes is valid"
 
     call prif_lcobound_no_dim(coarray_handle, tmp_bounds)
-    test_diagnosis = test_diagnosis .also. (.all. (tmp_bounds .equalsExpected. lcobounds)) ! "prif_lcobound_no_dim is valid"
+    test_diagnosis = test_diagnosis .also. (.all. (tmp_bounds .equalsExpected. lcobounds)) // "prif_lcobound_no_dim is valid"
 
     call prif_ucobound_no_dim(coarray_handle, tmp_bounds)
-    test_diagnosis = test_diagnosis .also. (.all. (tmp_bounds .equalsExpected. ucobounds)) ! "prif_ucobound_no_dim is valid"
+    test_diagnosis = test_diagnosis .also. (.all. (tmp_bounds .equalsExpected. ucobounds)) // "prif_ucobound_no_dim is valid"
 
     do i = 1, corank
       call prif_lcobound_with_dim(coarray_handle, i, tmp_bound)
-      test_diagnosis = test_diagnosis .also. (tmp_bound .equalsExpected. lcobounds(i)) ! "prif_lcobound_with_dim is valid"
+      test_diagnosis = test_diagnosis .also. (tmp_bound .equalsExpected. lcobounds(i)) // "prif_lcobound_with_dim is valid"
 
       call prif_ucobound_with_dim(coarray_handle, i, tmp_bound)
-      test_diagnosis = test_diagnosis .also. (tmp_bound .equalsExpected. ucobounds(i)) ! "prif_ucobound_with_dim is valid"
+      test_diagnosis = test_diagnosis .also. (tmp_bound .equalsExpected. ucobounds(i)) // "prif_ucobound_with_dim is valid"
     end do
 
     call prif_coshape(coarray_handle, sizes)
-    test_diagnosis = test_diagnosis .also. (.all. ((ucobounds - lcobounds + 1) .equalsExpected. sizes)) ! "prif_coshape is valid"
+    test_diagnosis = test_diagnosis .also. (.all. ((ucobounds - lcobounds + 1) .equalsExpected. sizes)) // "prif_coshape is valid"
 
     call prif_deallocate_coarray([coarray_handle])
   end function

test/julienne/prif_image_queries_test_m.F90

@@ -5,7 +5,8 @@ module prif_image_queries_test_m
     use prif, only : prif_image_status, prif_stopped_images, prif_failed_images, PRIF_STAT_FAILED_IMAGE, PRIF_STAT_STOPPED_IMAGE
     use prif, only : prif_num_images
     use julienne_m, only: &
-       operator(.all.) &
+       operator(//) &
+      ,operator(.all.) &
       ,operator(.also.) &
       ,operator(.isAtLeast.) &
       ,operator(.isAtMost.) &
@@ -73,7 +74,8 @@ function check_image_status() result(test_diagnosis)
       integer(c_int) :: image_status
 
       call prif_image_status(1, image_status=image_status)
-      test_diagnosis = .expect. (any(image_status == [0, PRIF_STAT_FAILED_IMAGE, PRIF_STAT_STOPPED_IMAGE])) ! TODO: replace with .any. once Juliennes supports it
+      test_diagnosis = .expect. (any(image_status == [0, PRIF_STAT_FAILED_IMAGE, PRIF_STAT_STOPPED_IMAGE])) & ! TODO: replace with .any. once Juliennes supports it
+                        // "permitted image status"
   end function
 
   function valid_image_list(nums) result(test_diagnosis)
@@ -87,7 +89,7 @@ function valid_image_list(nums) result(test_diagnosis)
          .also. (size(nums) .isAtMost. ni) &
          .also. (.all. (nums .isAtLeast. 1)) &
          .also. (.all. (nums .isAtMost. ni)) &
-         .also. (.all. (nums(1:size(nums)-1) .lessThan. nums(2:size(nums))))
+         .also. (.all. (nums(1:size(nums)-1) .lessThan. nums(2:size(nums)))) // "valid stopped image"
   end function
 
   function check_stopped_images() result(test_diagnosis)

test/julienne/prif_num_images_test_m.F90

@@ -2,7 +2,13 @@
 
 module prif_num_images_test_m
   use prif, only : prif_num_images
-  use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, operator(.isAtLeast.)
+  use julienne_m, only:  &
+     operator(//) &
+    ,operator(.isAtLeast.) &
+    ,test_description_t &
+    ,test_diagnosis_t &
+    ,test_result_t &
+    ,test_t
 #if ! HAVE_PROCEDURE_ACTUAL_FOR_POINTER_DUMMY
   use julienne_m, only: diagnosis_function_i
 #endif
@@ -54,7 +60,7 @@ function check_num_images_valid() result(test_diagnosis)
     type(test_diagnosis_t) test_diagnosis
     integer num_imgs
     call prif_num_images(num_images=num_imgs)
-    test_diagnosis = num_imgs .isAtLeast. 1
+    test_diagnosis = (num_imgs .isAtLeast. 1) // "positive number of images"
   end function
 
 end module prif_num_images_test_m

test/julienne/prif_this_image_no_coarray_test_m.F90

@@ -2,7 +2,14 @@
 
 module prif_this_image_no_coarray_test_m
   use prif, only : prif_this_image_no_coarray, prif_num_images, prif_co_sum
-  use julienne_m, only: test_description_t, test_diagnosis_t, test_result_t, test_t, operator(.all.), operator(.equalsExpected.)
+  use julienne_m, only: &
+     operator(//) &
+    ,operator(.all.) &
+    ,operator(.equalsExpected.) &
+    ,test_description_t &
+    ,test_diagnosis_t &
+    ,test_result_t &
+    ,test_t
 #if ! HAVE_PROCEDURE_ACTUAL_FOR_POINTER_DUMMY
   use julienne_m, only: diagnosis_function_i
 #endif
@@ -58,7 +65,7 @@ function check_this_image_set() result(test_diagnosis)
     call prif_num_images(num_images=ni)
     image_numbers = [(merge(0, me, me/=i), i = 1, ni)]
     call prif_co_sum(image_numbers)
-    test_diagnosis = .all. (image_numbers .equalsExpected. [(i, i = 1, ni)]) 
+    test_diagnosis = .all. (image_numbers .equalsExpected. [(i, i = 1, ni)]) // "correct image set"
   end function
 
 end module prif_this_image_no_coarray_test_m