@@ -60,78 +60,78 @@ test_that("correct data is used", {
6060
6161test_that(" layer parameters are correct" , {
6262 expect_is(p $ layers [[1 ]], " ggproto" )
63- expect_equal(deparse(p $ layers [[1 ]]$ mapping $ x ), " ~x" )
64- expect_equal(deparse(p $ layers [[1 ]]$ mapping $ y ), " ~y" )
65- expect_equal(deparse(p $ layers [[1 ]]$ mapping $ group ), " ~group" )
63+ expect_equal(deparse(p $ layers [[1 ]]$ mapping $ x ), " ~.data$ x" )
64+ expect_equal(deparse(p $ layers [[1 ]]$ mapping $ y ), " ~.data$ y" )
65+ expect_equal(deparse(p $ layers [[1 ]]$ mapping $ group ), " ~.data$ group" )
6666 expect_equal(as.character(p $ layers [[1 ]]$ aes_params $ colour ), " black" )
6767 expect_equal(as.character(p $ layers [[1 ]]$ aes_params $ fill ), " red" )
6868 expect_equal(p $ layers [[1 ]]$ aes_params $ linewidth , 0.4 )
6969
7070 expect_is(q $ layers [[1 ]], " ggproto" )
71- expect_equal(deparse(q $ layers [[1 ]]$ mapping $ x ), " ~.data[[ \" x \" ]] " )
72- expect_equal(deparse(q $ layers [[1 ]]$ mapping $ y ), " ~.data[[ \" y \" ]] " )
73- expect_equal(deparse(q $ layers [[1 ]]$ mapping $ group ), " ~.data[[ \" group\" ]] " )
71+ expect_equal(deparse(q $ layers [[1 ]]$ mapping $ x ), " ~.data$x " )
72+ expect_equal(deparse(q $ layers [[1 ]]$ mapping $ y ), " ~.data$y " )
73+ expect_equal(deparse(q $ layers [[1 ]]$ mapping $ group ), " ~.data$ group" )
7474 expect_equal(deparse(q $ layers [[1 ]]$ mapping $ fill ), " ~.data[[\" pop_2015\" ]]" )
7575 expect_equal(as.character(q $ layers [[1 ]]$ aes_params $ colour ), " blue" )
7676 expect_equal(q $ layers [[1 ]]$ aes_params $ linewidth , 0.4 )
7777
7878 expect_is(r $ layers [[1 ]], " ggproto" )
79- expect_equal(deparse(r $ layers [[1 ]]$ mapping $ x ), " ~.data[[ \" x \" ]] " )
80- expect_equal(deparse(r $ layers [[1 ]]$ mapping $ y ), " ~.data[[ \" y \" ]] " )
81- expect_equal(deparse(r $ layers [[1 ]]$ mapping $ group ), " ~.data[[ \" group\" ]] " )
79+ expect_equal(deparse(r $ layers [[1 ]]$ mapping $ x ), " ~.data$x " )
80+ expect_equal(deparse(r $ layers [[1 ]]$ mapping $ y ), " ~.data$y " )
81+ expect_equal(deparse(r $ layers [[1 ]]$ mapping $ group ), " ~.data$ group" )
8282 expect_equal(deparse(r $ layers [[1 ]]$ mapping $ fill ), " ~.data[[\" values\" ]]" )
8383 expect_equal(as.character(r $ layers [[1 ]]$ aes_params $ colour ), " black" )
8484 expect_equal(r $ layers [[1 ]]$ aes_params $ linewidth , 0.8 )
8585
8686 expect_is(s $ layers [[1 ]], " ggproto" )
87- expect_equal(deparse(s $ layers [[1 ]]$ mapping $ x ), " ~x" )
88- expect_equal(deparse(s $ layers [[1 ]]$ mapping $ y ), " ~y" )
89- expect_equal(deparse(s $ layers [[1 ]]$ mapping $ group ), " ~group" )
87+ expect_equal(deparse(s $ layers [[1 ]]$ mapping $ x ), " ~.data$ x" )
88+ expect_equal(deparse(s $ layers [[1 ]]$ mapping $ y ), " ~.data$ y" )
89+ expect_equal(deparse(s $ layers [[1 ]]$ mapping $ group ), " ~.data$ group" )
9090 expect_equal(as.character(s $ layers [[1 ]]$ aes_params $ fill ), " white" )
9191 expect_equal(as.character(s $ layers [[1 ]]$ aes_params $ colour ), " black" )
9292 expect_equal(s $ layers [[1 ]]$ aes_params $ linewidth , 0.4 )
9393 expect_is(s $ layers [[2 ]], " ggproto" )
94- expect_equal(deparse(s $ layers [[2 ]]$ mapping $ x ), " ~x" )
95- expect_equal(deparse(s $ layers [[2 ]]$ mapping $ y ), " ~y" )
96- expect_equal(deparse(s $ layers [[2 ]]$ mapping $ label ), " ~abbr" )
94+ expect_equal(deparse(s $ layers [[2 ]]$ mapping $ x ), " ~.data$ x" )
95+ expect_equal(deparse(s $ layers [[2 ]]$ mapping $ y ), " ~.data$ y" )
96+ expect_equal(deparse(s $ layers [[2 ]]$ mapping $ label ), " ~.data$ abbr" )
9797 expect_equal(as.character(s $ layers [[2 ]]$ aes_params $ colour ), " blue" )
9898
9999 expect_is(t $ layers [[1 ]], " ggproto" )
100- expect_equal(deparse(t $ layers [[1 ]]$ mapping $ x ), " ~x" )
101- expect_equal(deparse(t $ layers [[1 ]]$ mapping $ y ), " ~y" )
102- expect_equal(deparse(t $ layers [[1 ]]$ mapping $ group ), " ~group" )
100+ expect_equal(deparse(t $ layers [[1 ]]$ mapping $ x ), " ~.data$ x" )
101+ expect_equal(deparse(t $ layers [[1 ]]$ mapping $ y ), " ~.data$ y" )
102+ expect_equal(deparse(t $ layers [[1 ]]$ mapping $ group ), " ~.data$ group" )
103103 expect_equal(as.character(t $ layers [[1 ]]$ aes_params $ fill ), " yellow" )
104104 expect_equal(as.character(t $ layers [[1 ]]$ aes_params $ colour ), " black" )
105105 expect_equal(t $ layers [[1 ]]$ aes_params $ linewidth , 0.6 )
106106 expect_is(t $ layers [[2 ]], " ggproto" )
107- expect_equal(deparse(t $ layers [[2 ]]$ mapping $ x ), " ~x" )
108- expect_equal(deparse(t $ layers [[2 ]]$ mapping $ y ), " ~y" )
107+ expect_equal(deparse(t $ layers [[2 ]]$ mapping $ x ), " ~.data$ x" )
108+ expect_equal(deparse(t $ layers [[2 ]]$ mapping $ y ), " ~.data$ y" )
109109 expect_equal(deparse(t $ layers [[2 ]]$ mapping $ label ),
110- " ~sub(\" County\" , \"\" , county)" )
110+ " ~sub(\" County\" , \"\" , .data$ county)" )
111111
112112 expect_is(u $ layers [[1 ]], " ggproto" )
113- expect_equal(deparse(u $ layers [[1 ]]$ mapping $ x ), " ~x" )
114- expect_equal(deparse(u $ layers [[1 ]]$ mapping $ y ), " ~y" )
115- expect_equal(deparse(u $ layers [[1 ]]$ mapping $ group ), " ~group" )
113+ expect_equal(deparse(u $ layers [[1 ]]$ mapping $ x ), " ~.data$ x" )
114+ expect_equal(deparse(u $ layers [[1 ]]$ mapping $ y ), " ~.data$ y" )
115+ expect_equal(deparse(u $ layers [[1 ]]$ mapping $ group ), " ~.data$ group" )
116116 expect_equal(as.character(u $ layers [[1 ]]$ aes_params $ fill ), " white" )
117117 expect_equal(as.character(u $ layers [[1 ]]$ aes_params $ colour ), " black" )
118118 expect_equal(u $ layers [[1 ]]$ aes_params $ linewidth , 0.4 )
119119 expect_is(u $ layers [[2 ]], " ggproto" )
120- expect_equal(deparse(u $ layers [[2 ]]$ mapping $ x ), " ~x" )
121- expect_equal(deparse(u $ layers [[2 ]]$ mapping $ y ), " ~y" )
122- expect_equal(deparse(u $ layers [[2 ]]$ mapping $ label ), " ~abbr" )
120+ expect_equal(deparse(u $ layers [[2 ]]$ mapping $ x ), " ~.data$ x" )
121+ expect_equal(deparse(u $ layers [[2 ]]$ mapping $ y ), " ~.data$ y" )
122+ expect_equal(deparse(u $ layers [[2 ]]$ mapping $ label ), " ~.data$ abbr" )
123123
124124 expect_is(v $ layers [[1 ]], " ggproto" )
125- expect_equal(deparse(v $ layers [[1 ]]$ mapping $ x ), " ~x" )
126- expect_equal(deparse(v $ layers [[1 ]]$ mapping $ y ), " ~y" )
127- expect_equal(deparse(v $ layers [[1 ]]$ mapping $ group ), " ~group" )
125+ expect_equal(deparse(v $ layers [[1 ]]$ mapping $ x ), " ~.data$ x" )
126+ expect_equal(deparse(v $ layers [[1 ]]$ mapping $ y ), " ~.data$ y" )
127+ expect_equal(deparse(v $ layers [[1 ]]$ mapping $ group ), " ~.data$ group" )
128128 expect_equal(as.character(v $ layers [[1 ]]$ aes_params $ fill ), " white" )
129129 expect_equal(as.character(v $ layers [[1 ]]$ aes_params $ colour ), " black" )
130130 expect_equal(v $ layers [[1 ]]$ aes_params $ linewidth , 0.4 )
131131 expect_is(v $ layers [[2 ]], " ggproto" )
132- expect_equal(deparse(v $ layers [[2 ]]$ mapping $ x ), " ~x" )
133- expect_equal(deparse(v $ layers [[2 ]]$ mapping $ y ), " ~y" )
134- expect_equal(deparse(v $ layers [[2 ]]$ mapping $ label ), " ~abbr" )
132+ expect_equal(deparse(v $ layers [[2 ]]$ mapping $ x ), " ~.data$ x" )
133+ expect_equal(deparse(v $ layers [[2 ]]$ mapping $ y ), " ~.data$ y" )
134+ expect_equal(deparse(v $ layers [[2 ]]$ mapping $ label ), " ~.data$ abbr" )
135135})
136136
137137test_that(" warning occurs for unnecessary fill argument" , {
0 commit comments