Skip to content

Commit fa2eaf8

Browse files
committed
Merge branch 'changes'
2 parents e5178bc + bb5ae0f commit fa2eaf8

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/test/test_assert.F90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ program test_assert
4141
call assert_approximate(reshape([1.0D0, 1.0D0, 1.0D0, 1.0D0], [2, 2]), reshape([1.0D0, 1.01D0, 1.0D0, 1.0D0], [2, 2]), eps=0.01D0, suite=test_suite_approximate)
4242

4343
call test_suite_report(test_suite_approximate)
44-
call test_case_final(test_suite_approximate)
44+
call test_suite_final(test_suite_approximate)
4545

4646
! test assert_false/_true routines
4747
test_suite_boolean%name = 'Boolean'
@@ -57,7 +57,7 @@ program test_assert
5757
call assert_true(.true., __FILE__, __LINE__, test_suite_boolean)
5858

5959
call test_suite_report(test_suite_boolean)
60-
call test_case_final(test_suite_boolean)
60+
call test_suite_final(test_suite_boolean)
6161

6262
! test assert_equal routines
6363
test_suite_equal%name = 'Equal'
@@ -128,7 +128,7 @@ program test_assert
128128
call assert_equal(reshape([1.0D0, 1.0D0, 1.0D0, 1.0D0], [2, 2]), reshape([1.0D0, 1.0D0, 1.0D0, 1.0D0], [2, 2]), __FILE__, __LINE__, test_suite_equal)
129129

130130
call test_suite_report(test_suite_equal)
131-
call test_case_final(test_suite_equal)
131+
call test_suite_final(test_suite_equal)
132132

133133
! test assert_great_than routines
134134
test_suite_great_than%name = 'great_then'
@@ -191,6 +191,6 @@ program test_assert
191191
call assert_great_than(reshape([1.0D0, 1.0D0, 1.0D0, 1.0D0], [2, 2]), reshape([0.0D0, 0.0D0, 0.0D0, 0.0D0], [2, 2]), __FILE__, __LINE__, test_suite_great_than)
192192

193193
call test_suite_report(test_suite_great_than)
194-
call test_case_final(test_suite_great_than)
194+
call test_suite_final(test_suite_great_than)
195195

196196
end program test_assert

src/test_case_mod.F90

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ module test_case_mod
77

88
private
99

10-
public test_case_init
10+
public test_suite_init
11+
public test_suite_final
12+
public test_suite_report
1113
public test_case_create
1214
public test_case_append_assert
1315
public test_case_report
14-
public test_suite_report
15-
public test_case_final
1616
public test_suite_type
1717

1818
type assert_result_type
@@ -46,13 +46,15 @@ module test_case_mod
4646

4747
contains
4848

49-
subroutine test_case_init()
49+
subroutine test_suite_init(name)
50+
51+
character(*), intent(in) :: name
5052

51-
default_test_suite%name = "Default test suite"
53+
default_test_suite%name = name
5254

53-
end subroutine test_case_init
55+
end subroutine test_suite_init
5456

55-
subroutine test_case_final(suite)
57+
subroutine test_suite_final(suite)
5658

5759
type(test_suite_type), optional, target :: suite
5860
type(test_suite_type), pointer :: dummy_suite
@@ -81,7 +83,7 @@ subroutine test_case_final(suite)
8183
end do
8284
nullify(dummy_suite%test_case_tail)
8385

84-
end subroutine test_case_final
86+
end subroutine test_suite_final
8587

8688
subroutine test_case_create(name, suite)
8789

0 commit comments

Comments
 (0)