Inline test files directly into tests and examples (#133)

DESCRIPTION

@@ -28,7 +28,7 @@ Imports:
     methods
 Suggests:
     covr,
-    ggplot2,
+    ggplot2 (>= 3.3.6),
     lattice,
     rlang,
     testthat (>= 3.0.0),
@@ -37,4 +37,4 @@ Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1

R/replay.R

@@ -6,12 +6,22 @@
 #' @param x result from [evaluate()]
 #' @export
 #' @examples
-#' samples <- system.file("tests", "testthat", package = "evaluate")
-#' if (file_test("-d", samples)) {
-#'   replay(evaluate(file(file.path(samples, "order.R"))))
-#'   replay(evaluate(file(file.path(samples, "plot.R"))))
-#'   replay(evaluate(file(file.path(samples, "data.R"))))
+#' f1 <- function() {
+#'   cat("1\n")
+#'   print("2")
+#'   warning("3")
+#'   print("4")
+#'   message("5")
+#'   stop("6")
 #' }
+#' replay(evaluate("f1()"))
+#' 
+#' f2 <- function() {
+#'   message("Hello")
+#'   plot(1:10)
+#'   message("Goodbye")
+#' }
+#' replay(evaluate("f2()"))
 replay <- function(x) UseMethod("replay", x)
 
 #' @export

tests/testthat/_snaps/errors.md

@@ -0,0 +1,8 @@
+# code errors if stop_on_error == 2L
+
+    Code
+      evaluate("stop(\"1\")", stop_on_error = 2L)
+    Condition
+      Error:
+      ! 1
+

tests/testthat/helper.R

@@ -0,0 +1,8 @@
+evaluate_ <- function(text, ...) {
+  # Trim off leading/trailing new lines and dedent
+  text <- gsub("^\n {4}", "", text)
+  text <- gsub("\n {4}", "\n", text)
+  text <- gsub("\n +$", "", text)
+
+  evaluate(text, ...)
+}

tests/testthat/test-errors.R

@@ -1,19 +1,25 @@
 test_that("all code run, even after error", {
-  ev <- evaluate(file("error.R"))
+  ev <- evaluate_('stop("1")\n2')
   expect_length(ev, 4)
 })
 
 test_that("code aborts on error if stop_on_error == 1L", {
-  ev <- evaluate(file("error.R"), stop_on_error = 1L)
+  ev <- evaluate('stop("1")\n2', stop_on_error = 1L)
   expect_length(ev, 2)
 })
 
 test_that("code errors if stop_on_error == 2L", {
-  expect_error(evaluate(file("error.R"), stop_on_error = 2L), "1")
+  expect_snapshot(evaluate('stop("1")', stop_on_error = 2L), error = TRUE)
 })
 
 test_that("traceback useful if stop_on_error == 2L", {
-  expect_error(evaluate(file("error-complex.R"), stop_on_error = 2L), "Error")
+  expect_error(evaluate_('
+    f <- function() g()
+    g <- function() h()
+    h <- function() stop("Error")
+
+    f()
+  ', stop_on_error = 2L), "Error")
 
   ## Doesn't work because .Traceback not create when code run
   ## inside try or tryCatch. Can't figure out how to work around.
@@ -26,6 +32,11 @@ test_that("traceback useful if stop_on_error == 2L", {
 })
 
 test_that("capture messages in try() (#88)", {
-  ev <- evaluate(file("try.R"))
+  ev <- evaluate_('
+    g <- function() f("error")
+    f <- function(x) stop(paste0("Obscure ", x))
+    
+    try(g())
+  ')  
   expect_match(ev[[length(ev)]], "Obscure error")
 })

tests/testthat/test-evaluate.R

@@ -1,5 +1,8 @@
 test_that("file with only comments runs", {
-  ev <- evaluate(file("comment.R"))
+  ev <- evaluate_("
+    # This test case contains no executable code
+    # but it shouldn't throw an error
+  ")
   expect_length(ev, 2)
 
   expect_equal(classes(ev), c("source", "source"))
@@ -8,7 +11,10 @@ test_that("file with only comments runs", {
 test_that("data sets loaded", {
   skip_if_not_installed("lattice")
 
-  ev <- evaluate(file("data.R"))
+  ev <- evaluate_('
+    data(barley, package = "lattice")
+    barley
+  ')
   expect_length(ev, 3)
 })
 
@@ -62,21 +68,38 @@ test_that("options(warn = 0) and options(warn = 1) produces warnings", {
 # })
 
 test_that("output and plots interleaved correctly", {
-  ev <- evaluate(file("interleave-1.R"))
-  expect_equal(classes(ev),
-               c("source", "character", "recordedplot", "character", "recordedplot"))
+  ev <- evaluate_("
+    for (i in 1:2) {
+      cat(i)
+      plot(i)
+    }
+  ")
+  expect_equal(
+    classes(ev),
+    c("source", "character", "recordedplot", "character", "recordedplot")
+  )
 
-  ev <- evaluate(file("interleave-2.R"))
-  expect_equal(classes(ev),
-               c("source", "recordedplot", "character", "recordedplot", "character"))
+  ev <- evaluate_("
+    for (i in 1:2) {
+      plot(i)
+      cat(i)
+    }
+  ")
+  expect_equal(
+    classes(ev),
+    c("source", "recordedplot", "character", "recordedplot", "character")
+  )
 })
 
 test_that("return value of value handler inserted directly in output list", {
   skip_if_not_installed("ggplot2")
 
-  ev <- evaluate(
-    file("raw-output.R"),
-    output_handler = new_output_handler(value = identity)
+  ev <- evaluate_('
+    rnorm(10)
+    x <- list("I\'m a list!")
+    suppressPackageStartupMessages(library(ggplot2))
+    ggplot(mtcars, aes(mpg, wt)) + geom_point()
+  ', output_handler = new_output_handler(value = identity)
   )
   expect_equal(
     classes(ev),