merge tests

Author: ben-schwen

inst/tests/optimize.Rraw

@@ -445,11 +445,3 @@ test(2283 + 0.18, levels=opts,
 test(2283 + 0.19, levels=opts,
        names(M[, c(mpg[1], list(mpg, b=hp), c(lapply(.SD, mean))), by="cyl", .SDcols=c("vs", "am")]),
        c("cyl", "V1", "V2", "b", "vs", "am"))
-
-# Test lapply(list(...), fun) optimization
-dt = as.data.table(iris)
-opt = c(0L, 1L)
-out = c('GForce FALSE', 'lapply optimization changed j')
-test(2284.1, levels=opt, dt[, lapply(list(Petal.Length, Sepal.Length), sum), by=Species, verbose=TRUE], output=out)
-test(2284.2, levels=opt, names(dt[, lapply(list(Petal.Length, Sepal.Length), sum), by=Species]))
-test(2284.3, levels=opt, dt[, c(list(sum(Petal.Length), sum(Sepal.Length))), by=Species, verbose=TRUE], output=out)

inst/tests/tests.Rraw

@@ -21227,5 +21227,7 @@ dt = data.table(a = NA_integer_, b = 1:2, c = c(TRUE, FALSE))
 test(2345.04, levels=0:2, dt[, Map(weighted.mean, .SD, na.rm=c), b, .SDcols="a", verbose=TRUE], data.table(b=1:2, a=c(NaN, NA_real_)), output="GForce FALSE")
 test(2345.05, levels=0:2, dt[,list(weighted.mean(a, na.rm=c)), b, verbose=TRUE], data.table(b=1:2, V1=c(NaN, NA_real_)), output="GForce FALSE")
 dt = data.table(a=1:2, b=1, c=1:4)
-test(2345.06, levels=1:2, dt[, lapply(list(b, c), sum), by=a, verbose=TRUE], output=c("lapply optimization changed j", "GForce TRUE"))
-test(2345.07, levels=1:2, dt[, c(list(sum(b), sum(c))), by=a, verbose=TRUE], output=c("lapply optimization changed j", "GForce TRUE"))
+out = c("GForce FALSE", "lapply optimization changed j", "GForce TRUE")
+test(2345.06, levels=0:2, dt[, lapply(list(b, c), sum), by=a, verbose=TRUE], output=out)
+test(2345.07, levels=0:2, dt[, c(list(sum(b), sum(c))), by=a, verbose=TRUE], output=out)
+test(2345.08, levels=0:2, names(dt[, lapply(list(b, c), sum), by=a]))