Success reporing consistent with existing tests

Author: milancurcic

test/test_dense_layer.f90

@@ -1,5 +1,4 @@
 program test_dense_layer
-  use iso_fortran_env, only: stderr => error_unit
   use nf, only: dense, layer, relu
   use tuff, only: test, test_result
   implicit none
@@ -11,7 +10,7 @@ program test_dense_layer
   layer3 = dense(20)
   call layer3 % init(layer1)
 
-  tests = test("Dense layer", [ &
+  tests = test("test_dense_layer", [ &
     test("layer name is set", layer1 % name == 'dense'), & 
     test("layer shape is correct", all(layer1 % layer_shape == [10])), &
     test("layer is initialized", layer3 % initialized), &

test/test_dense_network.f90

@@ -1,33 +1,40 @@
 program test_dense_network
   use iso_fortran_env, only: stderr => error_unit
-  use nf, only: dense, input, network
-  use nf_optimizers, only: sgd
+  use nf, only: dense, input, network, sgd
+  use tuff, only: test, test_result
   implicit none
   type(network) :: net
-  logical :: ok = .true.
+  type(test_result) :: tests
 
   ! Minimal 2-layer network
   net = network([ &
     input(1), &
     dense(1) &
   ])
 
-  if (.not. size(net % layers) == 2) then
-    write(stderr, '(a)') 'dense network should have 2 layers.. failed'
-    ok = .false.
-  end if
+  tests = test("test_dense_network", [ &
+    test("network has 2 layers", size(net % layers) == 2), &
+    test("network predicts 0.5 for input 0", all(net % predict([0.]) == 0.5)), &
+    test(simple_training), &
+    test(larger_network_size) &
+  ])
 
-  if (.not. all(net % predict([0.]) == 0.5)) then
-    write(stderr, '(a)') &
-      'dense network should output exactly 0.5 for input 0.. failed'
-    ok = .false.
-  end if
+contains
 
-  training: block
+  type(test_result) function simple_training() result(res)
     real :: x(1), y(1)
     real :: tolerance = 1e-3
     integer :: n
-    integer, parameter :: num_iterations = 1000 
+    integer, parameter :: num_iterations = 1000
+    type(network) :: net 
+
+    res % name = 'simple training'
+
+    ! Minimal 2-layer network
+    net = network([ &
+      input(1), &
+      dense(1) &
+    ])
 
     x = [0.123]
     y = [0.765]
@@ -39,32 +46,25 @@ program test_dense_network
       if (all(abs(net % predict(x) - y) < tolerance)) exit
     end do
 
-    if (.not. n <= num_iterations) then
-      write(stderr, '(a)') &
-        'dense network should converge in simple training.. failed'
-      ok = .false.
-    end if
+    res % ok = n <= num_iterations
 
-  end block training
+  end function simple_training
 
-  ! A bit larger multi-layer network
-  net = network([ &
-    input(784), &
-    dense(30), &
-    dense(20), &
-    dense(10) &
-  ])
+  type(test_result) function larger_network_size() result(res)
+    type(network) :: net 
+
+    res % name = 'larger network training'
+
+    ! A bit larger multi-layer network
+    net = network([ &
+      input(784), &
+      dense(30), &
+      dense(20), &
+      dense(10) &
+    ])
 
-  if (.not. size(net % layers) == 4) then
-    write(stderr, '(a)') 'dense network should have 4 layers.. failed'
-    ok = .false.
-  end if
+    res % ok = size(net % layers) == 4
 
-  if (ok) then
-    print '(a)', 'test_dense_network: All tests passed.'
-  else
-    write(stderr, '(a)') 'test_dense_network: One or more tests failed.'
-    stop 1
-  end if
+  end function larger_network_size
 
-end program test_dense_network
+end program test_dense_network

test/tuff.f90

@@ -13,9 +13,7 @@ module tuff
   end type test_result
 
   interface test
-    module procedure test_logical
-    module procedure test_func
-    module procedure test_array
+    module procedure test_logical, test_func, test_array
   end interface test
 
   abstract interface
@@ -64,8 +62,9 @@ type(test_result) function test_array(name, tests) result(suite)
     type(test_result), intent(in) :: tests(:)
     suite % ok = all(tests % ok)
     suite % elapsed = sum(tests % elapsed)
-    if (.not. suite % ok) then
-      ! Report to stderr only on failure.
+    if (suite % ok) then
+      write(stdout, '(a)') trim(name) // ": All tests passed."
+    else
       write(stderr, '(i0,a,i0,a)') count(.not. tests % ok), '/', size(tests), &
         " tests failed in suite: " // trim(name)
     end if