Skip to content

Commit e1e39f0

Browse files
authored
Merge pull request #41 from tk3369/tk/hotfix-typesof
Fix test suite for v0.7
2 parents 01e3f40 + 8d83fca commit e1e39f0

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

REQUIRE

-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ julia 0.6
22
StringEncodings
33
Missings
44
Compat
5-
IteratorInterfaceExtensions
6-
TableTraits
7-
TableTraitsUtils
85
TabularDisplay

test/runtests.jl

+13-4
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,22 @@ getmetadata(dir, file; kwargs...) = metadata(getpath(dir, file), kwargs...)
191191
@test typeof(show(md)) == Void
192192
println()
193193

194-
@test SASLib.typesof(Int64) == (Int64,)
195-
@test SASLib.typesof(Union{Int64,Int32}) == (Int64,Int32)
196-
@test SASLib.typesof(Union{Int64,Int32,Missings.Missing}) == (Int64,Int32,Missings.Missing)
194+
# Deal with v0.6/v0.7 difference
195+
# v0.6 shows Missings.Missing
196+
# v0.7 shows Missing
197+
ty(x) = replace(x, "Missings.", "")
198+
199+
# convenient comparison routine since v0.6/v0.7 displays different order
200+
same(x,y) = sort(ty.(string.(collect(x)))) == sort(ty.(string.(collect(y))))
201+
202+
@test same(SASLib.typesof(Int64), (Int64,))
203+
@test same(SASLib.typesof(Union{Int64,Int32}), (Int64,Int32))
204+
@test same(SASLib.typesof(Union{Int64,Int32,Missings.Missing}),
205+
(Int64,Int32,Missings.Missing))
197206

198207
@test SASLib.typesfmt((Int64,)) == "Int64"
199208
@test SASLib.typesfmt((Int64,Int32)) == "Int64/Int32"
200-
@test SASLib.typesfmt((Int64,Int32,Missings.Missing)) == "Int64/Int32/Missings.Missing"
209+
@test ty(SASLib.typesfmt((Int64,Int32,Missings.Missing))) == "Int64/Int32/Missing"
201210
@test SASLib.typesfmt((Int64,Int32); excludemissing=true) == "Int64/Int32"
202211
@test SASLib.typesfmt((Int64,Int32,Missings.Missing); excludemissing=true) == "Int64/Int32"
203212
@test SASLib.colfmt(md)[1] == "ACTUAL(Float64)"

0 commit comments

Comments
 (0)