Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add test_coverage_file to run covr::report on the currently active file #1758

Merged
merged 1 commit into from
Apr 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export(system_check)
export(system_output)
export(test)
export(test_coverage)
export(test_coverage_file)
export(test_file)
export(uninstall)
export(unload)
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# devtools 1.13.3.9000

* `test_file_coverage()` function added to show the test coverage of one or
more files from a package. (#1755).

* `test_file()` function added to test one or more files from a package
(#1755).

Expand Down
54 changes: 50 additions & 4 deletions R/test.r
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#' Execute \pkg{test_that} tests in a package.
#'
#' `test()` is a shortcut for [testthat::test_dir()].
#' `test_file` runs `test()` on one or more test files files.
#' `test_coverage()` is a shortcut for [covr::report()].
#' `test()` is a shortcut for [testthat::test_dir()], it runs all of a
#' package's tests.
#' `test_file` runs `test()` on the active file.
#' `test_coverage()` computes test coverage for your package. It is a shortcut
#' for [covr::package_coverage()] and [covr::report()].
#' `test_coverage_file()` computes test coverage for the active file. Is a
#' shortcut for [covr::file_coverage()] and [covr::report()].
#'
#' @md
#' @param pkg package description, can be path or package name. See
Expand Down Expand Up @@ -172,5 +176,47 @@ find_test_file <- function(file) {
stop("Open file is does not end in `.R`", call. = FALSE)
}

file
file.path("tests", "testthat", paste0("test-", basename(file)))
}

find_source_file <- function(file) {
dir <- basename(dirname(file))

if (dir != "testthat") {
stop("Open file not in `tests/testthat/` directory", call. = FALSE)
}

if (!grepl("\\.[Rr]$", file)) {
stop("Open file is does not end in `.R`", call. = FALSE)
}

file.path("R", gsub("^test-", "", basename(file)))
}

#' @rdname test
#' @export
test_coverage_file <- function(file = find_active_file(), ...) {
is_source_file <- basename(dirname(file)) == "R"

source_files <- normalizePath(winslash = "/", c(
vapply(file[!is_source_file], find_source_file, character(1)),
file[is_source_file]))

test_files <- normalizePath(winslash = "/", c(
vapply(file[is_source_file], find_test_file, character(1)),
file[!is_source_file]))

pkg <- as.package(dirname(file)[[1]])

env <- load_all(pkg$path, quiet = TRUE)$env
coverage <- withr::with_dir("tests/testthat",
covr::file_coverage(source_files, test_files, ..., parent_env = env))

# Use relative paths
attr(coverage, "relative") <- TRUE
attr(coverage, "package") <- pkg

covr::report(coverage)

invisible(coverage)
}
13 changes: 10 additions & 3 deletions man/test.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.