100% coverage.

Author: kforner

R/pkg_test.R

@@ -173,7 +173,9 @@ summary.pkg_test <- function(object, col = 'file', ...) {
   }
 
   # aggregation function
-  .col_stats <- function(x) { if (is.logical(x)) any(x) else sum(x) }
+  .col_stats <- function(x) { 
+    if (is.logical(x)) any(x) else sum(x) 
+  }
   sdf <- stats::aggregate(df[, data_cols], by = by, .col_stats)
   if (length(col)) sdf <- sdf[order(sdf[[col]]), , drop = FALSE] else sdf$rows <- NULL
   rownames(sdf) <- NULL

R/pkgs_check.R

@@ -25,7 +25,9 @@ pkgs_check <- function(pkgids = names(filter_srcpkgs(src_pkgs, filter)), src_pkg
   filter = NULL, lib = ".check",  quiet = FALSE, fail_on_error = FALSE,  ...) 
 {  
   force(src_pkgs)
-  if (!length(pkgids)) stop('No package to test')
+  if (!length(pkgids)) { 
+    stop('No package to test')
+  }
   pkgs <- as_srcpkgs(pkgids, src_pkgs)
   if (!dir.exists(lib))  dir.create(lib, recursive = TRUE)
 
@@ -45,9 +47,9 @@ pkgs_check <- function(pkgids = names(filter_srcpkgs(src_pkgs, filter)), src_pkg
 
   summ <- summary(chks)
 
-  if (fail_on_error && (any(summ$errors > 0) || any(summ$warnings > 0))) 
+  if (fail_on_error && (any(summ$errors > 0) || any(summ$warnings > 0))) {
     cli::cli_abort("checks failed")   
+  }
 
-
   invisible(chks)
 }

R/project_root.R

@@ -40,15 +40,7 @@ parent_dir <- function(dir) {
 
 find_git_dir <- function(here = getwd()) {
   if (!length(here)) return(NULL)
-  git <- find_file_upwards('.git', here)
-  if (!length(git)) return(NULL)
-  if (!file.exists(git)) {
-  # if (!dir.exists(git)) {
-    # not a directory, e.g. could be a git submodule symlink. retry from the parent dir if any
-    return(find_git_dir(parent_dir(here)))
-  }
-
-  git
+  find_file_upwards('.git', here)
 }
 
 find_file_upwards <- function(filename, folder = getwd()) {

R/utils.R

@@ -41,7 +41,7 @@ is_condition_true <- function(cond) {
   as.logical(cond)
 }
 
-is_string <- function(x) length(x) == 1 && is.character(x)
+# is_string <- function(x) length(x) == 1 && is.character(x)
 is_nz_string <- function(x)  length(x) == 1 && is.character(x) && nzchar(x)
 
 is_error <- function(x) inherits(x, "try-error")

README.md

@@ -2,9 +2,7 @@
 
   <!-- badges: start -->
   [![R-CMD-check](https://github.com/kforner/srcpkgs/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/kforner/srcpkgs/actions/workflows/R-CMD-check.yaml)
-
   [![Codecov test coverage](https://codecov.io/gh/kforner/srcpkgs/branch/main/graph/badge.svg)](https://app.codecov.io/gh/kforner/srcpkgs?branch=main)
-
   [![CRAN status](https://www.r-pkg.org/badges/version/srcpkgs)](https://CRAN.R-project.org/package=srcpkgs)
   <!-- badges: end -->
 

dev.R

@@ -7,7 +7,9 @@ test(filter = "config")
 test(filter = "pkg_check")
 test(filter = "pkg_load")
 test(filter = "pkg_test")
+test(filter = "pkgs_check")
 test(filter = "pkgs_test")
+test(filter = "project_root")
 check()
 
 options(width = Sys.getenv("COLUMNS", 80))

tests/testthat/test-pkg_test.R

@@ -40,7 +40,7 @@ test_that("pkg_test", {
   add_dummy_test_to_srcpkgs(src_pkgs)
   ### one package with a dep
 
-  res <- pkg_test('AA', src_pkgs = src_pkgs, reporter = "silent")
+  resAA <- res <- pkg_test('AA', src_pkgs = src_pkgs, reporter = "silent")
 
   expect_s3_class(res, "pkg_test")
   df <- as.data.frame(res)
@@ -60,6 +60,14 @@ test_that("pkg_test", {
   res <- pkg_test('AA', filter = "failure", src_pkgs = src_pkgs, reporter = "silent")
   df <- as.data.frame(res)
   expect_true(all(df$failed > 0))
+
+  ### if loaders_hack_enabled
+  if (! is_loaders_hack_enabled()) {
+    hack_r_loaders()
+    on.exit(unhack_r_loaders(), add = TRUE)
+  }
+  res <- pkg_test('AA', src_pkgs = src_pkgs, reporter = "silent")
+  expect_identical(as.data.frame(fix_test_result_timings(res)), as.data.frame(fix_test_result_timings(resAA)))
 })
 
 

tests/testthat/test-pkgs_check.R

@@ -5,13 +5,16 @@ test_that("pkgs_check", {
   src_pkgs <- examples_srcpkgs_basic()
   setup_temp_dir()
 
+  ###################################### edge cases ###############################
+  expect_error(pkgs_check(NULL), 'No package to test')
+
   ###### with tests
   add_dummy_test_to_srcpkgs(src_pkgs)
   # make BB to fail
   writeLines(r"{ stop("aie aie aie") }", file.path(src_pkgs$BB$path, "tests/testthat/setup.R"))
 
   ### 
-  chks <- pkgs_check(src_pkgs = src_pkgs, quiet = TRUE)
+  mute(chks <- pkgs_check(src_pkgs = src_pkgs, quiet = FALSE))
 
   expect_s3_class(chks, "pkgs_check")
   expect_true(is.list(chks))
@@ -32,12 +35,11 @@ test_that("pkgs_check", {
     expect_identical(sdf[i,], expected)
   }
 
-  ### print
-  expect_snapshot(print(chks))
-
   #### fail_on_error
   expect_error(chks <- pkgs_check(src_pkgs = src_pkgs, quiet = TRUE, fail_on_error = TRUE), "checks failed")
 
+  ### print
+  expect_snapshot(print(chks))
 })
 
 

tests/testthat/test-pkgs_test.R

@@ -3,6 +3,9 @@
 test_that("pkgs_test_when_no_tests", {
   src_pkgs <- examples_srcpkgs_basic()
 
+  ### edge cases
+  expect_error(pkgs_test(NULL), 'No package to test')
+
   ### no tests at all
   res <- pkgs_test(src_pkgs = src_pkgs, reporter = "silent", quiet = TRUE)
 

tests/testthat/test-project_root.R

@@ -22,7 +22,6 @@ test_that("find_project_root", {
   # # dir1 by default
   # expect_identical(basename(find_project_root('dir1/')), 'dir1')
   # root because of .git file
- 
   expect_identical(basename(find_project_root('dir1/')), basename(getwd()))
 
   root3 <- file.path(getwd(), 'dir1/dir2/dir3')
@@ -38,6 +37,16 @@ test_that("find_project_root", {
   expect_null(find_project_root(NULL))
 })
 
+.find_git_dir <- 
+test_that("find_git_dir", {
+  setup_temp_dir()
+
+  expect_null(find_git_dir(NULL))
+
+
+})
+
+
 
 test_that("parent_dir", {
   expect_identical(parent_dir('/'), NULL)