Merge branch 'develop' of github.com:HenrikBengtsson/progressr into develop [ci skip]

Author: HenrikBengtsson

tests/with_progress,delay.R

@@ -34,9 +34,9 @@ for (delay in c(FALSE, TRUE)) {
   message(sprintf("- with_progress() - delay = %s ...", delay))
   output <- record_output({
     with_progress({
-     y <- slow_sum(x, stdout=TRUE, message=TRUE)
+      y <- slow_sum(x, stdout=TRUE, message=TRUE)
     }, delay_stdout = delay,
-       delay_conditions = if (delay) "condition" else character(0L))
+      delay_conditions = if (delay) "condition" else character(0L))
   })
   stopifnot(identical(output$stdout, output_truth$stdout))
   stopifnot(identical(output$conditions, output_truth$conditions))

tests/with_progress.R

@@ -35,7 +35,7 @@ message("with_progress() - filesize ...")
 
 with_progress({
   sum <- slow_sum(x)
-}, handler_filesize())
+}, handlers = handler_filesize())
 print(sum)
 stopifnot(sum == truth)
 
@@ -47,7 +47,7 @@ message("with_progress() - utils::txtProgressBar() ...")
 if (requireNamespace("utils")) {
   with_progress({
     sum <- slow_sum(x)
-  }, handler_txtprogressbar(style = 2L))
+  }, handlers = handler_txtprogressbar(style = 2L))
   print(sum)
   stopifnot(sum == truth)
 }
@@ -59,7 +59,7 @@ message("with_progress() - tcltk::tkProgressBar() ...")
 
 with_progress({
   sum <- slow_sum(x)
-}, handler_tkprogressbar)
+}, handlers = handler_tkprogressbar)
 
 message("with_progress() - tcltk::tkProgressBar() ... done")
 
@@ -68,7 +68,7 @@ message("with_progress() - utils::winProgressBar() ...")
 
 with_progress({
   sum <- slow_sum(x)
-}, handler_winprogressbar)
+}, handlers = handler_winprogressbar)
 
 message("with_progress() - utils::winProgressBar() ... done")
 
@@ -79,7 +79,7 @@ if (requireNamespace("progress")) {
   ## Display progress using default handler
   with_progress({
     sum <- slow_sum(x)
-  }, handler_progress(clear = FALSE))
+  }, handlers = handler_progress(clear = FALSE))
   print(sum)
   stopifnot(sum == truth)
 }
@@ -91,7 +91,7 @@ message("with_progress() - pbmcapply::progressBar() ...")
 
 with_progress({
   sum <- slow_sum(x)
-}, handler_pbmcapply)
+}, handlers = handler_pbmcapply)
 
 message("with_progress() - pbmcapply::progressBar() ... done")
 
@@ -100,7 +100,7 @@ message("with_progress() - ascii_alert ...")
 
 with_progress({
   sum <- slow_sum(x)
-}, handler_ascii_alert())
+}, handlers = handler_ascii_alert())
 print(sum)
 stopifnot(sum == truth)
 
@@ -111,7 +111,7 @@ message("with_progress() - beepr::beep() ...")
 
 with_progress({
   sum <- slow_sum(x)
-}, handler_beepr)
+}, handlers = handler_beepr)
 print(sum)
 stopifnot(sum == truth)
 
@@ -122,7 +122,7 @@ message("with_progress() - notifier::notify() ...")
 
 with_progress({
   sum <- slow_sum(x)
-}, handler_notifier)
+}, handlers = handler_notifier)
 print(sum)
 stopifnot(sum == truth)
 
@@ -134,7 +134,7 @@ message("with_progress() - void ...")
 ## Mute progress updates
 with_progress({
   sum <- slow_sum(x)
-}, NULL)
+}, handlers = NULL)
 print(sum)
 stopifnot(sum == truth)