Skip to content

Commit 29e1822

Browse files
committed
Slightly reduce allocations in tests (#362)
1 parent 12d9479 commit 29e1822

File tree

1 file changed

+32
-15
lines changed

1 file changed

+32
-15
lines changed

Diff for: test/test_blockarrays.jl

+32-15
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,56 @@ end
1717
@testset "BlockArray Constructors" begin
1818
ret = BlockArray{Float64}(undef, 1:3)
1919
fill!(ret, 0)
20-
@test Array(ret) == zeros(6)
20+
@test size(ret) == (6,)
21+
@test all(iszero, ret)
2122

2223
ret = BlockVector{Float64}(undef, 1:3)
2324
fill!(ret, 0)
24-
@test Array(ret) == zeros(6)
25+
@test size(ret) == (6,)
26+
@test all(iszero, ret)
2527

2628
ret = BlockArray{Float64,1,Vector{Vector{Float64}}}(undef, 1:3)
2729
fill!(ret, 0)
28-
@test Array(ret) == zeros(6)
30+
@test size(ret) == (6,)
31+
@test all(iszero, ret)
2932

3033
ret = BlockArray{Float64,1,Vector{OffsetVector{Float64,Vector{Float64}}}}(undef, 1:3)
3134
fill!(ret, 0)
3235
@test blocks(ret) isa Vector{OffsetVector{Float64,Vector{Float64}}}
33-
@test Array(ret) == zeros(6)
36+
@test size(ret) == (6,)
37+
@test all(iszero, ret)
3438

3539
ret = BlockArray{Float64,1,
3640
OffsetVector{OffsetVector{Float64,Vector{Float64}},
3741
Vector{OffsetVector{Float64,Vector{Float64}}}}}(undef, 1:3)
3842
fill!(ret, 0)
3943
@test blocks(ret) isa OffsetVector{OffsetVector{Float64,Vector{Float64}},
4044
Vector{OffsetVector{Float64,Vector{Float64}}}}
41-
@test Array(ret) == zeros(6)
45+
@test size(ret) == (6,)
46+
@test all(iszero, ret)
4247

4348
ret = BlockArray{Float64}(undef, (blockedrange(1:3),))
4449
fill!(ret, 0)
45-
@test Array(ret) == zeros(6)
50+
@test size(ret) == (6,)
51+
@test all(iszero, ret)
4652

4753
ret = BlockVector{Float64}(undef, (blockedrange(1:3),))
4854
fill!(ret, 0)
49-
@test Array(ret) == zeros(6)
55+
@test size(ret) == (6,)
56+
@test all(iszero, ret)
5057

5158
ret = BlockArray{Float64,1,Vector{Vector{Float64}}}(undef, (blockedrange(1:3),))
5259
fill!(ret, 0)
53-
@test Array(ret) == zeros(6)
60+
@test size(ret) == (6,)
61+
@test all(iszero, ret)
5462

5563
ret = BlockArrays._BlockArray([[0.0],[0.0,0.0],[0.0,0.0,0.0]], 1:3)
56-
@test Array(ret) == zeros(6)
64+
@test size(ret) == (6,)
65+
@test all(iszero, ret)
5766

5867
ret = BlockArrays._BlockArray([[0.0],[0.0,0.0],[0.0,0.0,0.0]], (blockedrange(1:3),))
59-
@test Array(ret) == zeros(6)
68+
@test size(ret) == (6,)
69+
@test all(iszero, ret)
6070

6171
ret = BlockArray{Float32}(undef_blocks, 1:3)
6272
@test eltype(ret.blocks) == Vector{Float32}
@@ -81,7 +91,8 @@ end
8191

8292
ret = BlockArray{Float64}(undef, 1:3, 1:3)
8393
fill!(ret, 0)
84-
@test Matrix(ret) == zeros(6,6)
94+
@test size(ret) == (6,6)
95+
@test all(iszero, ret)
8596

8697
A = [1,2,3,4,5,6]
8798
@test A == BlockArray(A, 1:3) == BlockArray{Int}(A, 1:3) ==
@@ -104,15 +115,18 @@ end
104115
@testset "PseudoBlockArray constructors" begin
105116
ret = PseudoBlockArray{Float64}(undef, 1:3)
106117
fill!(ret, 0)
107-
@test Array(ret) == zeros(6)
118+
@test size(ret) == (6,)
119+
@test all(iszero, ret)
108120

109121
ret = PseudoBlockVector{Float64}(undef, 1:3)
110122
fill!(ret, 0)
111-
@test Array(ret) == zeros(6)
123+
@test size(ret) == (6,)
124+
@test all(iszero, ret)
112125

113126
ret = PseudoBlockArray{Float64}(undef, 1:3, 1:3)
114127
fill!(ret, 0)
115-
@test Matrix(ret) == zeros(6,6)
128+
@test size(ret) == (6,6)
129+
@test all(iszero, ret)
116130

117131
A = [1,2,3,4,5,6]
118132
@test_throws BoundsError PseudoBlockArray(A,10:20)
@@ -182,7 +196,10 @@ end
182196
(spzeros(5, 3), spzeros(5, 4)),
183197
)
184198

185-
@test Array(ret) == zeros(8, 7)
199+
a = Array(ret)
200+
@test a isa Array
201+
@test size(a) == (8, 7)
202+
@test all(iszero, a)
186203
@test eltype(ret.blocks) <: SparseMatrixCSC
187204
@test axes(ret) == blockedrange.(([1, 2, 5], [3, 4]))
188205

0 commit comments

Comments
 (0)