Skip to content

Commit 92d6d7f

Browse files
kshyattandyferris
kshyatt
authored and
andyferris
committed
Uncomment more convert tests (JuliaArrays#195)
1 parent 3d5490a commit 92d6d7f

File tree

1 file changed

+37
-59
lines changed

1 file changed

+37
-59
lines changed

‎test/core.jl

Lines changed: 37 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -60,75 +60,53 @@
6060
@test MArray{(1,),Float64}((1,)).data === (1.0,)
6161
@test_inferred MArray{(1,),Float64}((1,))
6262
end
63-
63+
=#
6464
@testset "eltype conversion" begin
65-
sa_int = SArray{(1,)}((1,))
66-
ma_int = MArray{(1,)}((1,))
67-
68-
sa_float = SArray{(1,)}((1.0,))
69-
ma_float = MArray{(1,)}((1.0,))
70-
71-
@test convert(SArray{(1,),Float64}, sa_int) === sa_float
72-
@test_inferred convert(SArray{(1,),Float64}, sa_int)
73-
@test convert(SArray{(1,),Float64,1}, sa_int) === sa_float
74-
@test_inferred convert(SArray{(1,),Float64,1}, sa_int)
75-
@test convert(SArray{(1,),Float64,1,Tuple{Float64}}, sa_int) === sa_float
76-
@test_inferred convert(SArray{(1,),Float64,1,Tuple{Float64}}, sa_int)
77-
78-
@test convert(MArray{(1,),Float64}, ma_int) == ma_float
79-
@test_inferred convert(MArray{(1,),Float64}, ma_int)
80-
@test convert(MArray{(1,),Float64,1}, ma_int) == ma_float
81-
@test_inferred convert(MArray{(1,),Float64,1}, ma_int)
82-
@test convert(MArray{(1,),Float64,1,Tuple{Float64}}, ma_int) == ma_float
83-
@test_inferred convert(MArray{(1,),Float64,1,Tuple{Float64}}, ma_int)
65+
sa_int = SArray{Tuple{1}}((1,))
66+
ma_int = MArray{Tuple{1}}((1,))
67+
68+
sa_float = SArray{Tuple{1}}((1.0,))
69+
ma_float = MArray{Tuple{1}}((1.0,))
70+
71+
@test @inferred(convert(SArray{Tuple{1},Float64}, sa_int)) === sa_float
72+
@test @inferred(convert(SArray{Tuple{1},Float64,1}, sa_int)) === sa_float
73+
@test @inferred(convert(SArray{Tuple{1},Float64,1,1}, sa_int)) === sa_float
74+
75+
@test @inferred(convert(MArray{Tuple{1},Float64}, ma_int)) == ma_float
76+
@test @inferred(convert(MArray{Tuple{1},Float64,1}, ma_int)) == ma_float
77+
@test @inferred(convert(MArray{Tuple{1},Float64,1,1}, ma_int)) == ma_float
8478
end
8579

8680
@testset "StaticArray conversion" begin
87-
sa_int = SArray{(1,)}((1,))
88-
ma_int = MArray{(1,)}((1,))
81+
sa_int = SArray{Tuple{1}}((1,))
82+
ma_int = MArray{Tuple{1}}((1,))
8983

90-
sa_float = SArray{(1,)}((1.0,))
91-
ma_float = MArray{(1,)}((1.0,))
84+
sa_float = SArray{Tuple{1}}((1.0,))
85+
ma_float = MArray{Tuple{1}}((1.0,))
9286

9387
# SArray -> MArray
94-
@test convert(MArray, sa_int) == ma_int
95-
@test_inferred convert(MArray, sa_int)
96-
@test convert(MArray{(1,)}, sa_int) == ma_int
97-
@test_inferred convert(MArray{(1,)}, sa_int)
98-
@test convert(MArray{(1,),Int}, sa_int) == ma_int
99-
@test_inferred convert(MArray{(1,),Int}, sa_int)
100-
@test convert(MArray{(1,),Int,1}, sa_int) == ma_int
101-
@test_inferred convert(MArray{(1,),Int,1}, sa_int)
102-
@test convert(MArray{(1,),Int,1,Tuple{Int}}, sa_int) == ma_int
103-
@test_inferred convert(MArray{(1,),Int,1,Tuple{Int}}, sa_int)
104-
105-
@test convert(MArray{(1,),Float64}, sa_int) == ma_float
106-
@test_inferred convert(MArray{(1,),Float64}, sa_int)
107-
@test convert(MArray{(1,),Float64,1}, sa_int) == ma_float
108-
@test_inferred convert(MArray{(1,),Float64,1}, sa_int)
109-
@test convert(MArray{(1,),Float64,1,Tuple{Float64}}, sa_int) == ma_float
110-
@test_inferred convert(MArray{(1,),Float64,1,Tuple{Float64}}, sa_int)
88+
#@test @inferred(convert(MArray, sa_int)) == ma_int
89+
@test @inferred(convert(MArray{Tuple{1}}, sa_int)) == ma_int
90+
@test @inferred(convert(MArray{Tuple{1},Int}, sa_int)) == ma_int
91+
@test @inferred(convert(MArray{Tuple{1},Int,1}, sa_int)) == ma_int
92+
@test @inferred(convert(MArray{Tuple{1},Int,1,1}, sa_int)) == ma_int
93+
94+
@test @inferred(convert(MArray{Tuple{1},Float64}, sa_int)) == ma_float
95+
@test @inferred(convert(MArray{Tuple{1},Float64,1}, sa_int)) == ma_float
96+
@test @inferred(convert(MArray{Tuple{1},Float64,1,1}, sa_int)) == ma_float
11197

11298
# MArray -> SArray
113-
@test convert(SArray, ma_int) === sa_int
114-
@test_inferred convert(SArray, ma_int)
115-
@test convert(SArray{(1,)}, ma_int) === sa_int
116-
@test_inferred convert(SArray{(1,)}, ma_int)
117-
@test convert(SArray{(1,),Int}, ma_int) === sa_int
118-
@test_inferred convert(SArray{(1,),Int}, ma_int)
119-
@test convert(SArray{(1,),Int,1}, ma_int) === sa_int
120-
@test_inferred convert(SArray{(1,),Int,1}, ma_int)
121-
@test convert(SArray{(1,),Int,1,Tuple{Int}}, ma_int) === sa_int
122-
@test_inferred convert(SArray{(1,),Int,1,Tuple{Int}}, ma_int)
123-
124-
@test convert(SArray{(1,),Float64}, ma_int) === sa_float
125-
@test_inferred convert(SArray{(1,),Float64}, ma_int)
126-
@test convert(SArray{(1,),Float64,1}, ma_int) === sa_float
127-
@test_inferred convert(SArray{(1,),Float64,1}, ma_int)
128-
@test convert(SArray{(1,),Float64,1,Tuple{Float64}}, ma_int) === sa_float
129-
@test_inferred convert(SArray{(1,),Float64,1,Tuple{Float64}}, ma_int)
99+
#@test @inferred(convert(SArray, ma_int)) === sa_int
100+
@test @inferred(convert(SArray{Tuple{1}}, ma_int)) === sa_int
101+
@test @inferred(convert(SArray{Tuple{1},Int}, ma_int)) === sa_int
102+
@test @inferred(convert(SArray{Tuple{1},Int,1}, ma_int)) === sa_int
103+
@test @inferred(convert(SArray{Tuple{1},Int,1,1}, ma_int)) === sa_int
104+
105+
@test @inferred(convert(SArray{Tuple{1},Float64}, ma_int)) === sa_float
106+
@test @inferred(convert(SArray{Tuple{1},Float64,1}, ma_int)) === sa_float
107+
@test @inferred(convert(SArray{Tuple{1},Float64,1,1}, ma_int)) === sa_float
130108
end
131-
=#
109+
132110
@testset "AbstractArray conversion" begin
133111
sa = SArray{Tuple{2,2}, Int}((3, 4, 5, 6))
134112
ma = MArray{Tuple{2,2}, Int}((3, 4, 5, 6))

0 commit comments

Comments
 (0)