Refactoring test_files() and friends (#1086)

* `test_files()` now includes all of the logic needed for running multiple test files, regardless of whether or not it's inside a package.

* `test_file()` and `test_dir()` are now wrapper around `test_files()` so they have identical arguments and identical behaviour with helpers/setup/teardown. Fixes #968.

* `test_dir()` now sets `stop_on_warning = TRUE` for consistency with other runners.

Author: hadley

DESCRIPTION

@@ -115,10 +115,10 @@ Collate:
     'source.R'
     'teardown.R'
     'test-compiled-code.R'
-    'test-directory.R'
     'test-env.R'
     'test-example.R'
     'test-files.R'
+    'test-package.R'
     'test-path.R'
     'test-that.R'
     'try-again.R'

NEWS.md

@@ -1,5 +1,14 @@
 # testthat (development version)
 
+* `test_file()` now runs helper, setup, and teardown code, and has the
+  same arguments as `test_dir()` (#968).
+
+* testthat no longer supports tests stored in `inst/tests`. This has been
+  deprecated since testthat 0.11.0 (released in 2015).
+
+* `test_dir()` now defaults `stop_on_failure` to `TRUE` for consistency with
+  other `test_` functions.
+
 * New `test_local()` tests a local source package directory. It's equivalent 
   to `devtools::test()` but doesn't require devtools and all its dependencies
   to be installed (#1030).

R/source.R

@@ -2,7 +2,6 @@
 #'
 #' These are used by [test_dir()] and friends
 #'
-#' @inheritSection test_dir Test files
 #' @param path Path to files.
 #' @param pattern Regular expression used to filter files.
 #' @param env Environment in which to evaluate code.

R/test-directory.R

@@ -1,13 +1,38 @@
+#' Determine testing status
+#'
+#' Use `is_testing()` to determine if code is being run as part of a test and
+#' `testing_package()` to retrieve the name of the package being tested. You
+#' can also check the underlying env var directly
+#' `identical(Sys.getenv("TESTTHAT"), "true")` to avoid creating a run-time
+#' dependency on testthat.
+#'
+#'
+#' @export
+is_testing <- function() {
+  identical(Sys.getenv("TESTTHAT"), "true")
+}
+
+#' @export
+#' @rdname is_testing
+testing_package <- function() {
+  Sys.getenv("TESTTHAT_PKG")
+}
+
 #' Generate default testing environment.
 #'
-#' We use a new environment which inherits from [globalenv()].
-#' In an ideal world, we'd avoid putting the global environment on the
-#' search path for tests, but it's not currently possible without losing
+#' We use a new environment which inherits from [globalenv()] or a package
+#' namespace. In an ideal world, we'd avoid putting the global environment on
+#' the search path for tests, but it's not currently possible without losing
 #' the ability to load packages in tests.
 #'
 #' @keywords internal
 #' @export
-test_env <- function() {
-  new.env(parent = globalenv())
+test_env <- function(package = NULL) {
+  if (is.null(package)) {
+    child_env(globalenv())
+  } else {
+    # Must clone environment so that during R CMD check, it's not locked
+    # preventing creation of S4 classes
+    env_clone(asNamespace(package))
+  }
 }
-