Fix 'crossmap' unit tests on xwalk() and future_xwalk()

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: progressify
-Version: 0.1.0-9003
+Version: 0.1.0-9004
 Title: Progress Reporting of Common Functions via One Magic Function
 Description: The progressify() function rewrites (transpiles) calls to sequential and parallel map-reduce functions such as base::lapply(), purrr::map(), foreach::foreach(), and plyr::llply() to signal progress updates. By combining this function with R's native pipe operator, you have a straightforward way to report progress on iterative computations with minimal refactoring, e.g. 'lapply(x, fcn) |> progressify()' and 'purrr::map(x, fcn) |> progressify()'. It is compatible with the 'futurize' package for parallelization, e.g. 'lapply(x, fcn) |> progressify() |> futurize()' and 'purrr::map(x, fcn) |> futurize() |> progressify()'.
 Authors@R: c(

inst/testme/test-progressify-crossmap-future.R

@@ -66,7 +66,7 @@ for (kk in seq_along(exprs)) {
 res_walk <- list()
 truth_walk <- list()
 
-expr <- quote(future_xwalk(xs, function(x, y) { res_walk[[length(res_walk) + 1L]] <<- x * y }))
+expr <- quote(future_xwalk(xs, function(x, y) { list(x = x, y = y) }))
 truth <- eval(expr)
 res_walk_truth <- res_walk
 

inst/testme/test-progressify-crossmap.R

@@ -66,7 +66,7 @@ for (kk in seq_along(exprs)) {
 res_walk <- list()
 truth_walk <- list()
 
-expr <- quote(xwalk(xs, function(x, y) { res_walk[[length(res_walk) + 1L]] <<- x * y }))
+expr <- quote(xwalk(xs, function(x, y) { list(x = x, y = y) }))
 truth <- eval(expr)
 res_walk_truth <- res_walk
 

inst/testme/test-progressify-futurize-crossmap.R

@@ -81,26 +81,23 @@ for (kk in seq_along(exprs)) {
 ## -------------------------------------------------------
 ## xwalk
 ## -------------------------------------------------------
-## FIXME
-if (FALSE) {
-  for (pipe in c("progressify_futurize", "futurize_progressify")) {
-    res_walk <- list()
-  
-    expr <- quote(xwalk(xs, function(x, y) { res_walk[[length(res_walk) + 1L]] <<- x * y }))
-    truth <- eval(expr)
-    res_walk_truth <- res_walk
-  
-    res_walk <- list()
-    if (pipe == "progressify_futurize") {
-      expr_f <- bquote(.(expr) |> progressify() |> futurize())
-    } else {
-      expr_f <- bquote(.(expr) |> futurize() |> progressify())
-    }
-    message(sprintf("--- xwalk %s ---", pipe))
-    print(expr_f)
-    stopifnot(all.equal(res_walk, res_walk_truth))
-    stopifnot(identical(res_walk, res_walk_truth))
+for (pipe in c("progressify_futurize", "futurize_progressify")) {
+  res_walk <- list()
+
+  expr <- quote(xwalk(xs, function(x, y) { invisible(list(x = x, y = y)) }))
+  truth <- eval(expr)
+  res_walk_truth <- res_walk
+
+  res_walk <- list()
+  if (pipe == "progressify_futurize") {
+    expr_f <- bquote(.(expr) |> progressify() |> futurize())
+  } else {
+    expr_f <- bquote(.(expr) |> futurize() |> progressify())
   }
+  message(sprintf("--- xwalk %s ---", pipe))
+  print(expr_f)
+  stopifnot(all.equal(res_walk, res_walk_truth))
+  stopifnot(identical(res_walk, res_walk_truth))
 }