From 6bc0ae8c68e223b6124bc92905e212cd4a497f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogumi=C5=82=20Kami=C5=84ski?= Date: Sat, 7 Nov 2020 22:20:24 +0100 Subject: [PATCH] move All(args...) tests to deprecated.jl (#2515) --- test/deprecated.jl | 51 ++++++++++++++++++++++++++++++++++++++++++++++ test/index.jl | 47 ------------------------------------------ test/string.jl | 2 +- 3 files changed, 52 insertions(+), 48 deletions(-) diff --git a/test/deprecated.jl b/test/deprecated.jl index 2e05d9f9df..338a54440a 100644 --- a/test/deprecated.jl +++ b/test/deprecated.jl @@ -231,6 +231,57 @@ end DataFrame(variable=:a, min=1, min2=1, max2=2, max=2) end +@testset "All indexing" begin + df = DataFrame(a=1, b=2, c=3) + + @test select(df, All(1,2)) == df[:, 1:2] + @test select(df, All(1,:b)) == df[:, 1:2] + @test select(df, All(:a,2)) == df[:, 1:2] + @test select(df, All(:a,:b)) == df[:, 1:2] + @test select(df, All(2,1)) == df[:, [2,1]] + @test select(df, All(:b,1)) == df[:, [2,1]] + @test select(df, All(2,:a)) == df[:, [2,1]] + @test select(df, All(:b,:a)) == df[:, [2,1]] + + @test df[:, All(1,2)] == df[:, 1:2] + @test df[:, All(1,:b)] == df[:, 1:2] + @test df[:, All(:a,2)] == df[:, 1:2] + @test df[:, All(:a,:b)] == df[:, 1:2] + @test df[:, All(2,1)] == df[:, [2,1]] + @test df[:, All(:b,1)] == df[:, [2,1]] + @test df[:, All(2,:a)] == df[:, [2,1]] + @test df[:, All(:b,:a)] == df[:, [2,1]] + + @test df[:, All(1,1,2)] == df[:, 1:2] + @test df[:, All(:a,1,:b)] == df[:, 1:2] + @test df[:, All(:a,2,:b)] == df[:, 1:2] + @test df[:, All(:a,:b,2)] == df[:, 1:2] + @test df[:, All(2,1,:a)] == df[:, [2,1]] + + @test select(df, All(1,"b")) == df[:, 1:2] + @test select(df, All("a",2)) == df[:, 1:2] + @test select(df, All("a","b")) == df[:, 1:2] + @test select(df, All("b",1)) == df[:, [2,1]] + @test select(df, All(2,"a")) == df[:, [2,1]] + @test select(df, All("b","a")) == df[:, [2,1]] + + @test df[:, All(1,"b")] == df[:, 1:2] + @test df[:, All("a",2)] == df[:, 1:2] + @test df[:, All("a","b")] == df[:, 1:2] + @test df[:, All("b",1)] == df[:, [2,1]] + @test df[:, All(2,"a")] == df[:, [2,1]] + @test df[:, All("b","a")] == df[:, [2,1]] + + @test df[:, All("a",1,"b")] == df[:, 1:2] + @test df[:, All("a",2,"b")] == df[:, 1:2] + @test df[:, All("a","b",2)] == df[:, 1:2] + @test df[:, All(2,1,"a")] == df[:, [2,1]] + + df = DataFrame(a1=1, a2=2, b1=3, b2=4) + @test df[:, All(r"a", Not(r"1"))] == df[:, [1,2,4]] + @test df[:, All(Not(r"1"), r"a")] == df[:, [2,4,1]] +end + @testset "deprecated DataFrame constructors" begin @test DataFrame(([1,2], [3,4])) == DataFrame([[1,2], [3,4]], :auto) @test DataFrame((categorical([1,2]), categorical([3,4]))) == diff --git a/test/index.jl b/test/index.jl index fc5ce6799b..5351693711 100644 --- a/test/index.jl +++ b/test/index.jl @@ -413,53 +413,6 @@ end df = DataFrame(a=1, b=2, c=3) @test select(df, All()) == df[:, :] @test df[:, All()] == df[:, :] - - @test select(df, All(1,2)) == df[:, 1:2] - @test select(df, All(1,:b)) == df[:, 1:2] - @test select(df, All(:a,2)) == df[:, 1:2] - @test select(df, All(:a,:b)) == df[:, 1:2] - @test select(df, All(2,1)) == df[:, [2,1]] - @test select(df, All(:b,1)) == df[:, [2,1]] - @test select(df, All(2,:a)) == df[:, [2,1]] - @test select(df, All(:b,:a)) == df[:, [2,1]] - - @test df[:, All(1,2)] == df[:, 1:2] - @test df[:, All(1,:b)] == df[:, 1:2] - @test df[:, All(:a,2)] == df[:, 1:2] - @test df[:, All(:a,:b)] == df[:, 1:2] - @test df[:, All(2,1)] == df[:, [2,1]] - @test df[:, All(:b,1)] == df[:, [2,1]] - @test df[:, All(2,:a)] == df[:, [2,1]] - @test df[:, All(:b,:a)] == df[:, [2,1]] - - @test df[:, All(1,1,2)] == df[:, 1:2] - @test df[:, All(:a,1,:b)] == df[:, 1:2] - @test df[:, All(:a,2,:b)] == df[:, 1:2] - @test df[:, All(:a,:b,2)] == df[:, 1:2] - @test df[:, All(2,1,:a)] == df[:, [2,1]] - - @test select(df, All(1,"b")) == df[:, 1:2] - @test select(df, All("a",2)) == df[:, 1:2] - @test select(df, All("a","b")) == df[:, 1:2] - @test select(df, All("b",1)) == df[:, [2,1]] - @test select(df, All(2,"a")) == df[:, [2,1]] - @test select(df, All("b","a")) == df[:, [2,1]] - - @test df[:, All(1,"b")] == df[:, 1:2] - @test df[:, All("a",2)] == df[:, 1:2] - @test df[:, All("a","b")] == df[:, 1:2] - @test df[:, All("b",1)] == df[:, [2,1]] - @test df[:, All(2,"a")] == df[:, [2,1]] - @test df[:, All("b","a")] == df[:, [2,1]] - - @test df[:, All("a",1,"b")] == df[:, 1:2] - @test df[:, All("a",2,"b")] == df[:, 1:2] - @test df[:, All("a","b",2)] == df[:, 1:2] - @test df[:, All(2,1,"a")] == df[:, [2,1]] - - df = DataFrame(a1=1, a2=2, b1=3, b2=4) - @test df[:, All(r"a", Not(r"1"))] == df[:, [1,2,4]] - @test df[:, All(Not(r"1"), r"a")] == df[:, [2,4,1]] end @testset "Cols indexing" begin diff --git a/test/string.jl b/test/string.jl index 2fd8b98dcc..d55f0bd0a9 100644 --- a/test/string.jl +++ b/test/string.jl @@ -185,7 +185,7 @@ end dfr = DataFrame(a=1:2, b=3:4, c=5:6)[2, ["c", "a"]] @test names(dfr) == ["c", "a"] @test names(dfr, "a") == names(dfr, :a) == names(dfr, 2) == names(dfr, Not("c")) == - names(dfr, All("a")) == names(dfr, Cols("a")) == names(dfr, Between("a", "a")) == ["a"] + names(dfr, ["a"]) == names(dfr, Cols("a")) == names(dfr, Between("a", "a")) == ["a"] @test keys(dfr) == propertynames(dfr) == [:c, :a] @test haskey(dfr, :a) == haskey(dfr, "a") == true @test haskey(dfr, :z) == haskey(dfr, "z") == false