Skip to content

Commit 95fe3bd

Browse files
committed
Remove constructor from testParameters
1 parent ce75128 commit 95fe3bd

File tree

2 files changed

+2
-49
lines changed

2 files changed

+2
-49
lines changed

episodes/6-testing-parallel-code/challenge/test/test_exchange_boundaries.pf

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module test_exchange_boundaries
88
public
99

1010
!> Type to bundle inputs and expected outputs of game_of_life::exchange_boundaries
11-
@testParameter(constructor=new_exchange_boundaries_test_params)
11+
@testParameter
1212
type, extends(MPITestParameter) :: exchange_boundaries_test_params
1313
integer, dimension(:,:,:), allocatable :: input_board, expected_output_board
1414
integer :: ncols, nrows
@@ -152,26 +152,6 @@ contains
152152
! Constructors
153153
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
154154

155-
function new_exchange_boundaries_test_params(input_board, expected_output_board, ncols, nrows, neighbours) result(new_params)
156-
integer, dimension(:,:,:), allocatable, intent(in) :: input_board, expected_output_board
157-
integer, intent(in) :: ncols, nrows
158-
integer, dimension(:,:), allocatable, intent(in) :: neighbours
159-
160-
type(exchange_boundaries_test_params) :: new_params
161-
162-
allocate(new_params%input_board(size(input_board, 1), size(input_board, 2), size(input_board, 3)))
163-
allocate(new_params%expected_output_board(size(expected_output_board, 1), size(expected_output_board, 2), &
164-
size(expected_output_board, 3)))
165-
allocate(new_params%neighbours(size(neighbours, 1), size(neighbours, 2)))
166-
167-
new_params%input_board = input_board
168-
new_params%expected_output_board = expected_output_board
169-
new_params%ncols = ncols
170-
new_params%nrows = nrows
171-
new_params%neighbours = neighbours
172-
173-
end function new_exchange_boundaries_test_params
174-
175155
function newTest(testParameter) result(tst)
176156
type(exchange_boundaries_test_case) :: tst
177157
type(exchange_boundaries_test_params), intent(in) :: testParameter

episodes/6-testing-parallel-code/challenge/test/test_get_local_grid_info.pf

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module test_get_local_grid_info
88
public
99

1010
!> Type to bundle inputs and expected outputs of game_of_life::get_local_grid_info
11-
@testParameter(constructor=new_get_local_grid_info_test_params)
11+
@testParameter
1212
type, extends(MPITestParameter) :: get_local_grid_info_test_params
1313
integer, allocatable :: ncols_per_rank(:), nrows_per_rank(:), coords(:,:), neighbours(:,:),col_start(:),row_start(:), &
1414
local_ncols(:), local_nrows(:)
@@ -207,33 +207,6 @@ contains
207207
! Constructors
208208
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
209209

210-
function new_get_local_grid_info_test_params(ncols_per_rank, nrows_per_rank, coords, neighbours,col_start,row_start, local_ncols, &
211-
local_nrows) result(new_params)
212-
integer, allocatable, intent(in) :: ncols_per_rank(:), nrows_per_rank(:), coords(:,:), neighbours(:,:),col_start(:),row_start(:), &
213-
local_ncols(:), local_nrows(:)
214-
215-
type(get_local_grid_info_test_params) new_params
216-
217-
allocate(new_params%ncols_per_rank(size(ncols_per_rank, 1)))
218-
allocate(new_params%nrows_per_rank(size(nrows_per_rank, 1)))
219-
allocate(new_params%coords(size(coords, 1), size(coords, 2)))
220-
allocate(new_params%neighbours(size(neighbours, 1), size(neighbours, 2)))
221-
allocate(new_params%col_start(size(col_start, 1)))
222-
allocate(new_params%row_start(size(row_start, 1)))
223-
allocate(new_params%local_ncols(size(local_ncols, 1)))
224-
allocate(new_params%local_nrows(size(local_nrows, 1)))
225-
226-
new_params%ncols_per_rank = ncols_per_rank
227-
new_params%nrows_per_rank = nrows_per_rank
228-
new_params%coords = coords
229-
new_params%neighbours = neighbours
230-
new_params%col_start =col_start
231-
new_params%row_start =row_start
232-
new_params%local_ncols = local_ncols
233-
new_params%local_nrows = local_nrows
234-
235-
end function new_get_local_grid_info_test_params
236-
237210
function newTest(testParameter) result(tst)
238211
type(get_local_grid_info_test_case) :: tst
239212
type(get_local_grid_info_test_params), intent(in) :: testParameter

0 commit comments

Comments
 (0)