initial sweep + implementation

Author: MichaelChirico

R/test.data.table.R

@@ -323,7 +323,10 @@ gc_mem = function() {
   # nocov end
 }
 
-test = function(num,x,y=TRUE,error=NULL,warning=NULL,message=NULL,output=NULL,notOutput=NULL,ignore.warning=NULL,options=NULL,env=NULL) {
+test = function(num, x, y=TRUE,
+                error=NULL, warning=NULL, message=NULL, output=NULL, notOutput=NULL, ignore.warning=NULL,
+                options=NULL, env=NULL,
+                context=NULL) {
   if (!is.null(env)) {
     old = Sys.getenv(names(env), names=TRUE, unset=NA)
     to_unset = !lengths(env)
@@ -570,6 +573,9 @@ test = function(num,x,y=TRUE,error=NULL,warning=NULL,message=NULL,output=NULL,no
     }
     # nocov end
   }
+  if (fail && !is.null(context)) {
+    catf("Test context: %s\n", context)
+  }
   if (fail && .test.data.table && num>0.0) {
     # nocov start
     assign("nfail", nfail+1L, parent.frame(), inherits=TRUE)

inst/tests/froll.Rraw

@@ -878,12 +878,10 @@ base_compare = function(x, n, funs=c("mean","sum"), algos=c("fast","exact")) {
       for (fill in c(NA_real_, 0)) {
         for (algo in algos) {
           num <<- num + num.step
-          eval(substitute( # so we can have values displayed in output/log rather than variables
-            test(.num,
-                 froll(.fun, x, n, fill=.fill, na.rm=.na.rm, algo=.algo),
-                 rollfun(x, n, FUN=.fun, fill=.fill, na.rm=.na.rm, nf.rm=.nf.rm)),
-            list(.num=num, .fun=fun, .fill=fill, .na.rm=na.rm, .algo=algo, .nf.rm=algo!="exact")
-          ))
+          test(num,
+               froll(fun, x, n, fill=fill, na.rm=na.rm, algo=algo),
+               rollfun(x, n, FUN=fun, fill=fill, na.rm=na.rm, nf.rm=algo != "exact"),
+               context=sprintf("fun=%s\tfill=%s\tna.rm=%s\talgo=%s", fun, fill, na.rm, algo))
         }
       }
     }
@@ -911,12 +909,10 @@ if (requireNamespace("zoo", quietly=TRUE)) {
           for (fill in c(NA_real_, 0)) {
             for (algo in algos) {
               num <<- num + num.step
-              eval(substitute( # so we can have values displayed in output/log rather than variables
-                test(.num,
-                     froll(.fun, x, n, align=.align, fill=.fill, na.rm=.na.rm, algo=.algo),
-                     drollapply(x, n, FUN=.fun, fill=.fill, align=.align, na.rm=.na.rm)),
-                list(.num=num, .fun=fun, .align=align, .fill=fill, .na.rm=na.rm, .algo=algo)
-              ))
+              test(num,
+                   froll(fun, x, n, align=align, fill=fill, na.rm=na.rm, algo=algo),
+                   drollapply(x, n, FUN=fun, fill=fill, align=align, na.rm=na.rm),
+                   context=sprintf("fun=%s\talign=%s\tfill=%s\tna.rm=%s\talgo=%s", fun, align, fill, na.rm, algo))
             }
           }
         }
@@ -974,12 +970,10 @@ afun_compare = function(x, n, funs=c("mean","sum"), algos=c("fast","exact")) {
       for (fill in c(NA_real_, 0)) {
         for (algo in algos) {
           num <<- num + num.step
-          eval(substitute(
-            test(.num,
-                 froll(.fun, x, n, fill=.fill, na.rm=.na.rm, algo=.algo, adaptive=TRUE),
-                 arollfun(.fun, x, n, fill=.fill, na.rm=.na.rm, nf.rm=.nf.rm)),
-            list(.num=num, .fun=fun, .fill=fill, .na.rm=na.rm, .algo=algo, .nf.rm=algo!="exact")
-          ))
+          test(num,
+               froll(fun, x, n, fill=fill, na.rm=na.rm, algo=algo, adaptive=TRUE),
+               arollfun(fun, x, n, fill=fill, na.rm=na.rm, nf.rm=algo != "exact"),
+               context=sprintf("fun=%s\tfill=%s\tna.rm=%s\talgo=%s", fun, fill, na.rm, algo))
         }
       }
     }

inst/tests/tests.Rraw

@@ -9861,11 +9861,10 @@ nqjoin_test <- function(x, y, k=1L, test_no, mult="all") {
   for (i in seq_along(runcmb)) {
     thiscols = runcmb[[i]]
     thisops = runops[[i]]
-    # cat("k = ", k, "\ti = ", i, "\t thiscols = [", paste0(thiscols,collapse=","), "]\t thisops = [", paste0(thisops,collapse=","), "]\t ", sep="")
     ans1 = nq(x, y, thiscols, thisops, 0L, mult=mult)
     ans2 = check(x, y, thiscols, thisops, mult=mult)
     test_no = test_no + .001
-    test(test_no, ans1, ans2) # nolint: dt_test_literal_linter.
+    test(test_no, ans1, ans2, context=sprintf("k = %d\ti = %d\tthiscols = [%s]\tthisops = [%s]", k, i, paste(thiscols, collapse=","), paste(thisops, collapse=",")))
   }
   gc()  # no longer needed but left in place just in case, no harm
 }