More concise testing with tuff

Author: milancurcic

test/test_dense_layer.f90

@@ -1,58 +1,24 @@
 program test_dense_layer
   use iso_fortran_env, only: stderr => error_unit
-  use nf, only: dense, layer
-  use nf_activation, only: relu
+  use nf, only: dense, layer, relu
+  use tuff, only: test, test_result
   implicit none
-  type(layer) :: layer1, layer2
-  logical :: ok = .true.
+  type(layer) :: layer1, layer2, layer3
+  type(test_result) :: tests
 
   layer1 = dense(10)
-
-  if (.not. layer1 % name == 'dense') then
-    ok = .false.
-    write(stderr, '(a)') 'dense layer has its name set correctly.. failed'
-  end if
-
-  if (.not. all(layer1 % layer_shape == [10])) then
-    ok = .false.
-    write(stderr, '(a)') 'dense layer is created with requested size.. failed'
-  end if
-
-  if (layer1 % initialized) then
-    ok = .false.
-    write(stderr, '(a)') 'dense layer should not be marked as initialized yet.. failed'
-  end if
-
-  if (.not. layer1 % activation == 'sigmoid') then
-    ok = .false.
-    write(stderr, '(a)') 'dense layer is defaults to sigmoid activation.. failed'
-  end if
-
-  layer1 = dense(10, activation=relu())
-
-  if (.not. layer1 % activation == 'relu') then
-    ok = .false.
-    write(stderr, '(a)') 'dense layer is created with the specified activation.. failed'
-  end if
-
-  layer2 = dense(20)
-  call layer2 % init(layer1)
-
-  if (.not. layer2 % initialized) then
-    ok = .false.
-    write(stderr, '(a)') 'dense layer should now be marked as initialized.. failed'
-  end if
-
-  if (.not. all(layer2 % input_layer_shape == [10])) then
-    ok = .false.
-    write(stderr, '(a)') 'dense layer should have a correct input layer shape.. failed'
-  end if
-
-  if (ok) then
-    print '(a)', 'test_dense_layer: All tests passed.'
-  else
-    write(stderr, '(a)') 'test_dense_layer: One or more tests failed.'
-    stop 1
-  end if
+  layer2 = dense(10, activation=relu())
+  layer3 = dense(20)
+  call layer3 % init(layer1)
+
+  tests = 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("layer's default activation is sigmoid", layer1 % activation == 'sigmoid'), &
+    test("user set activation works", layer2 % activation == 'relu'), &
+    test("layer initialized after init", layer3 % initialized), &
+    test("layer input shape is set after init", all(layer3 % input_layer_shape == [10])) &
+  ])  
 
 end program test_dense_layer

test/tuff.f90

@@ -0,0 +1,74 @@
+module tuff
+  ! Testing Unframework for Fortran (TUFF)
+  use iso_fortran_env, only: stderr => error_unit, stdout => output_unit
+  implicit none
+
+  private
+  public :: test, test_result
+
+  type :: test_result
+    character(:), allocatable :: name
+    logical :: ok = .true.
+    real :: elapsed = 0.
+  end type test_result
+
+  interface test
+    module procedure test_logical
+    module procedure test_func
+    module procedure test_array
+  end interface test
+
+  abstract interface
+    function func() result(res)
+      import :: test_result
+      type(test_result) :: res
+    end function func
+  end interface
+
+contains
+
+  type(test_result) function test_logical(name, cond) result(res)
+    ! Test a single logical expression.
+    character(*), intent(in) :: name
+    logical, intent(in) :: cond
+    res % name = name
+    res % ok = .true.
+    res % elapsed = 0.
+    if (.not. cond) then
+      write(stderr, '(a)') 'Test ' // trim(name) // ' failed.'
+      res % ok = .false.
+    end if
+  end function test_logical
+
+
+  type(test_result) function test_func(f) result(res)
+    ! Test a user-provided function f that returns a test_result.
+    ! f is responsible for setting the test name and the ok field. 
+    procedure(func) :: f
+    real :: t1, t2
+    res % name = ''
+    call cpu_time(t1)
+    res = f()
+    call cpu_time(t2)
+    res % elapsed = t2 - t1
+    if (len_trim(res % name) == 0) res % name = 'Anonymous test'
+    if (.not. res % ok) then
+      write(stderr, '(a, f6.3)') 'Test failed: ' //  trim(res % name)
+    end if
+  end function test_func
+
+
+  type(test_result) function test_array(name, tests) result(suite)
+    ! Test a suite of tests, each of which is a test_result.
+    character(*), intent(in) :: name
+    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.
+      write(stderr, '(i0,a,i0,a)') count(.not. tests % ok), '/', size(tests), &
+        " tests failed in suite: " // trim(name)
+    end if
+  end function test_array
+
+end module tuff