Move file

Author: krlmlr

R/criterion.R

@@ -122,64 +122,3 @@ check_testfun <- function(testfun) {
 
   testfun
 }
-
-#' @rdname root_criterion
-#' @param x An object
-#' @export
-is_root_criterion <- function(x) {
-  inherits(x, "root_criterion")
-}
-
-#' @rdname root_criterion
-#' @export
-as_root_criterion <- function(x) UseMethod("as_root_criterion", x)
-
-#' @details
-#' The `as_root_criterion()` function accepts objects of class
-#' `root_criterion`, and character values; the latter will be
-#' converted to criteria using `has_file`.
-#'
-#' @rdname root_criterion
-#' @export
-as_root_criterion.character <- function(x) {
-  has_file(x)
-}
-
-#' @rdname root_criterion
-#' @export
-as_root_criterion.root_criterion <- identity
-
-#' @export
-as_root_criterion.default <- function(x) {
-  stop("Cannot coerce ", x, " to type root_criterion.", call. = FALSE)
-}
-
-#' @export
-format.root_criterion <- function(x, ...) {
-  if (length(x$desc) > 1) {
-    c("Root criterion: one of", paste0("- ", x$desc))
-  } else {
-    paste0("Root criterion: ", x$desc)
-  }
-}
-
-#' @export
-print.root_criterion <- function(x, ...) {
-  cat(format(x), sep = "\n")
-  invisible(x)
-}
-
-#' @export
-#' @rdname root_criterion
-#' @details Root criteria can be combined with the `|` operator. The result is a
-#'   composite root criterion that requires either of the original criteria to
-#'   match.
-#' @param y An object
-`|.root_criterion` <- function(x, y) {
-  stopifnot(is_root_criterion(y))
-
-  root_criterion(
-    c(x$testfun, y$testfun),
-    c(x$desc, y$desc)
-  )
-}

R/root.R

@@ -1,3 +1,64 @@
+#' @rdname root_criterion
+#' @param x An object
+#' @export
+is_root_criterion <- function(x) {
+  inherits(x, "root_criterion")
+}
+
+#' @rdname root_criterion
+#' @export
+as_root_criterion <- function(x) UseMethod("as_root_criterion", x)
+
+#' @details
+#' The `as_root_criterion()` function accepts objects of class
+#' `root_criterion`, and character values; the latter will be
+#' converted to criteria using `has_file`.
+#'
+#' @rdname root_criterion
+#' @export
+as_root_criterion.character <- function(x) {
+  has_file(x)
+}
+
+#' @rdname root_criterion
+#' @export
+as_root_criterion.root_criterion <- identity
+
+#' @export
+as_root_criterion.default <- function(x) {
+  stop("Cannot coerce ", x, " to type root_criterion.", call. = FALSE)
+}
+
+#' @export
+format.root_criterion <- function(x, ...) {
+  if (length(x$desc) > 1) {
+    c("Root criterion: one of", paste0("- ", x$desc))
+  } else {
+    paste0("Root criterion: ", x$desc)
+  }
+}
+
+#' @export
+print.root_criterion <- function(x, ...) {
+  cat(format(x), sep = "\n")
+  invisible(x)
+}
+
+#' @export
+#' @rdname root_criterion
+#' @details Root criteria can be combined with the `|` operator. The result is a
+#'   composite root criterion that requires either of the original criteria to
+#'   match.
+#' @param y An object
+`|.root_criterion` <- function(x, y) {
+  stopifnot(is_root_criterion(y))
+
+  root_criterion(
+    c(x$testfun, y$testfun),
+    c(x$desc, y$desc)
+  )
+}
+
 #' Find the root of a directory hierarchy
 #'
 #' A \emph{root} is defined as a directory that contains a regular file

tests/testthat/_snaps/criterion.md renamed to tests/testthat/_snaps/root.md

@@ -29,53 +29,9 @@ test_that("root_criterion", {
   expect_true(is_root_criterion(root_criterion(function(path) FALSE, "Never")))
 })
 
-test_that("is_root_criterion", {
-  expect_true(is_root_criterion(has_file("DESCRIPTION")))
-  expect_false(is_root_criterion("DESCRIPTION"))
-  expect_true(is_root_criterion(as_root_criterion("DESCRIPTION")))
-})
-
-test_that("as_root_criterion", {
-  reset_env <- function(x) {
-    if (is.function(x)) {
-      environment(x) <- .GlobalEnv
-    } else if (is.list(x)) {
-      x <- lapply(x, reset_env)
-    }
-    x
-  }
-
-  expect_equal(
-    lapply(as_root_criterion("x"), reset_env),
-    lapply(has_file("x"), reset_env)
-  )
-  expect_error(as_root_criterion(5), "Cannot coerce")
-})
-
 test_that("Absolute paths are returned", {
   expect_equal(
     find_root("testthat.R"),
     normalizePath(find_root("testthat.R"), winslash = "/")
   )
 })
-
-test_that("Formatting", {
-  expect_snapshot(format(is_r_package))
-  expect_snapshot(is_r_package)
-  expect_snapshot(is_vcs_root)
-  expect_snapshot(criteria)
-  expect_snapshot(str(criteria))
-})
-
-test_that("Combining criteria", {
-  comb_crit <- is_r_package | is_rstudio_project
-
-  expect_true(is_root_criterion(comb_crit))
-
-  expect_snapshot(comb_crit)
-
-  expect_equal(
-    find_root(comb_crit, "hierarchy"),
-    find_root(is_rstudio_project, "hierarchy/a")
-  )
-})

tests/testthat/test-criterion.R

@@ -1,3 +1,48 @@
+
+test_that("is_root_criterion", {
+  expect_true(is_root_criterion(has_file("DESCRIPTION")))
+  expect_false(is_root_criterion("DESCRIPTION"))
+  expect_true(is_root_criterion(as_root_criterion("DESCRIPTION")))
+})
+
+test_that("as_root_criterion", {
+  reset_env <- function(x) {
+    if (is.function(x)) {
+      environment(x) <- .GlobalEnv
+    } else if (is.list(x)) {
+      x <- lapply(x, reset_env)
+    }
+    x
+  }
+
+  expect_equal(
+    lapply(as_root_criterion("x"), reset_env),
+    lapply(has_file("x"), reset_env)
+  )
+  expect_error(as_root_criterion(5), "Cannot coerce")
+})
+
+test_that("Formatting", {
+  expect_snapshot(format(is_r_package))
+  expect_snapshot(is_r_package)
+  expect_snapshot(is_vcs_root)
+  expect_snapshot(criteria)
+  expect_snapshot(str(criteria))
+})
+
+test_that("Combining criteria", {
+  comb_crit <- is_r_package | is_rstudio_project
+
+  expect_true(is_root_criterion(comb_crit))
+
+  expect_snapshot(comb_crit)
+
+  expect_equal(
+    find_root(comb_crit, "hierarchy"),
+    find_root(is_rstudio_project, "hierarchy/a")
+  )
+})
+
 test_that("has_file", {
   wd <- normalizePath(getwd(), winslash = "/")
   hierarchy <- function(n = 0L) {