- parameter: unknow_file and unknown_line delete, were not used, initial values in type were set instead

- extended report_suite similar to test_case_report
- added one example in test_assert.F90 which gets an actual file_name and file_number as a parameter, for this /fpp (fortran preprocessor) has to be set

Author: J. Henneberg

src/assert_mod.F90

@@ -6,9 +6,6 @@ module assert_mod
 
   implicit none
 
-  character(12), parameter :: unknown_file = 'Unknown file'
-  integer, parameter :: unknown_line = 0
-
   interface assert_equal
     module procedure assert_equal_integer
     module procedure assert_equal_real4

src/test/test_assert.F90

@@ -116,8 +116,8 @@ program test_assert
 
   ! -> real8
   call test_case_create('real8', test_suite_great_than)
-  call assert_great_than(1.0D0, 1.0D0, suite=test_suite_great_than)
-  call assert_great_than(2.0D0, 1.0D0, suite=test_suite_great_than)
+  call assert_great_than(1.0D0, 1.0D0, __FILE__, __LINE__, test_suite_great_than)
+  call assert_great_than(2.0D0, 1.0D0, __FILE__, __LINE__, test_suite_great_than)
 
   ! report
   call test_suite_report(test_suite_great_than)

src/test_case_mod.F90

@@ -20,9 +20,9 @@ module test_case_mod
     character(30) :: assert_operator
     character(256) :: left_operand
     character(256) :: right_operand = ''
-    character(256) :: file_name
-    integer line_number
-    logical passed
+    character(256) :: file_name = 'Unknown file'
+    integer :: line_number	= -1
+    logical :: passed = .false.
     type(assert_result_type), pointer :: next => null()
   end type assert_result_type
 
@@ -138,13 +138,12 @@ subroutine test_case_report(name, suite)
           write(log_err_unit, *) 'Assertion #' // trim(to_string(assert_result%id)) // ' failed with reason: ' // &
             'x (' // trim(assert_result%left_operand) // ') ' // trim(assert_result%assert_operator) // &
             ' y (' // trim(assert_result%right_operand) // ')'
-          write(log_err_unit, *)
           write(log_err_unit, *) 'Check line: ', trim(assert_result%file_name), ':', trim(to_string(assert_result%line_number))
         else
           write(log_err_unit, *) 'Assertion #' // trim(to_string(assert_result%id)) // ' failed with reason: ' // &
             'x is not ' // trim(assert_result%assert_operator) // '!'
         end if
-        write(6, *)
+        write(log_err_unit, *)
       end if
       assert_result => assert_result%next
     end do
@@ -187,6 +186,23 @@ subroutine test_suite_report(suite)
 
         num_all_succeed_assert = num_all_succeed_assert + test_case%num_succeed_assert
         num_all_assert = num_all_assert + test_case%num_assert
+        
+        assert_result => test_case%assert_result_head
+        do while (associated(assert_result))
+          if (.not. assert_result%passed) then
+            if (assert_result%right_operand /= '') then
+              write(log_err_unit, *) 'Assertion #' // trim(to_string(assert_result%id)) // ' failed with reason: ' // &
+                'x (' // trim(assert_result%left_operand) // ') ' // trim(assert_result%assert_operator) // &
+                ' y (' // trim(assert_result%right_operand) // ')'
+              write(log_err_unit, *) 'Check line: ', trim(assert_result%file_name), ':', trim(to_string(assert_result%line_number))
+            else
+              write(log_err_unit, *) 'Assertion #' // trim(to_string(assert_result%id)) // ' failed with reason: ' // &
+                'x is not ' // trim(assert_result%assert_operator) // '!'
+            end if
+            write(log_err_unit, *)
+          end if
+          assert_result => assert_result%next
+        end do
 
         test_case => test_case%next
       end do