Merge pull request #32 from sourceryinstitute/tallies

Report test tallies

Author: rouson

src/test_m.F90 renamed to src/test_m.f90

@@ -33,10 +33,11 @@ function results_interface() result(test_results)
 
   interface
 
-    module subroutine report(test)
-      !! Report test results
+    module subroutine report(test, passes, tests)
+      !! Print the test results and increment the tallies of passing tests and total tests
       implicit none
       class(test_t), intent(in) :: test
+      integer, intent(inout) :: passes, tests
     end subroutine
 
   end interface

src/test_result_m.f90

@@ -12,6 +12,7 @@ module test_result_m
     logical passed_ 
   contains
     procedure :: characterize
+    procedure :: passed
   end type
 
   interface test_result_t
@@ -35,6 +36,13 @@ pure module function characterize(self) result(characterization)
       character(len=:), allocatable :: characterization
     end function
 
+    elemental module function passed(self) result(test_passed)
+      !! The result is a character description of the test and its outcome
+      implicit none
+      class(test_result_t), intent(in) :: self
+      logical test_passed
+    end function
+
   end interface
 
 end module test_result_m

src/test_result_s.f90

@@ -12,4 +12,8 @@
       characterization = merge("passes on ", "FAILS on  ", self%passed_) // self%description_ // "."
     end procedure
 
+    module procedure passed
+      test_passed = self%passed_
+    end procedure
+
 end submodule test_result_s

src/test_s.F90

@@ -0,0 +1,26 @@
+submodule(test_m) test_s
+  implicit none
+
+contains
+
+  module procedure report
+    integer i
+
+    associate(test_results => test%results())
+      print *
+      print *, test%subject()
+      associate(num_tests => size(test_results))
+        tests = tests + num_tests
+        do i=1,num_tests
+          print *,"   ",test_results(i)%characterize()
+        end do
+        associate(num_passes => count(test_results%passed()))
+          print '(a,2(i0,a))'," ",num_passes," of ", num_tests," tests pass."
+          passes = passes + num_passes
+        end associate
+      end associate
+    end associate
+
+  end procedure
+
+end submodule test_s

src/test_s.f90

@@ -5,13 +5,19 @@ program main
   use formats_test, only : formats_test_t  
   implicit none
 
-  type(data_partition_test_t) data_partition_test
   type(collectives_test_t) collectives_test
-  type(object_test_t) object_test
+  type(data_partition_test_t) data_partition_test
   type(formats_test_t) formats_test
+  type(object_test_t) object_test
+
+  integer :: passes=0, tests=0
+
+  call data_partition_test%report(passes, tests)
+  call collectives_test%report(passes, tests)
+  call object_test%report(passes, tests)
+  call formats_test%report(passes, tests)
+
+  print *
+  print *,"_________ In total, ",passes," of ",tests, " tests pass. _________"
 
-  call data_partition_test%report()
-  call collectives_test%report()
-  call object_test%report()
-  call formats_test%report()
 end program

test/main.f90

@@ -25,7 +25,7 @@ pure function subject() result(specimen)
     specimen = "The object_m type" 
   end function
 
-  pure function results() result(test_results)
+  function results() result(test_results)
     type(test_result_t), allocatable :: test_results(:)
 
     test_results = [ &