Address testthat deprecation warnings + drop mockery

DESCRIPTION

@@ -68,7 +68,6 @@ Suggests:
     xml2 (>= 1.0.0),
     parallel,
     memoise,
-    mockery,
     covr,
     box (>= 1.2.0)
 License: MIT + file LICENSE

NAMESPACE

@@ -32,6 +32,9 @@ export(to_sonarqube)
 export(value)
 export(zero_coverage)
 import(methods)
+importFrom(httr,RETRY)
+importFrom(httr,content)
+importFrom(httr,upload_file)
 importFrom(stats,aggregate)
 importFrom(stats,na.omit)
 importFrom(stats,na.pass)

R/codecov.R

@@ -228,12 +228,12 @@ codecov <- function(...,
 
   coverage_json <- to_codecov(coverage)
 
-  httr::content(httr::RETRY("POST",
-                            url = codecov_url,
-                            query = codecov_query,
-                            body = coverage_json,
-                            encode = "json",
-                            httr::config(http_version = curl_http_1_1())))
+  content(RETRY("POST",
+                url = codecov_url,
+                query = codecov_query,
+                body = coverage_json,
+                encode = "json",
+                httr::config(http_version = curl_http_1_1())))
 }
 
 curl_http_1_1 <- function() {

R/compiled.R

@@ -1,17 +1,17 @@
 # this does not handle LCOV_EXCL_START ect.
 parse_gcov <- function(file, package_path = "") {
-  if (!file.exists(file)) {
+  if (!source_file_exists(file)) {
     return(NULL)
   }
 
-  lines <- readLines(file)
+  lines <- read_lines_impl(file)
   source_file <- rex::re_matches(lines[1], rex::rex("Source:", capture(name = "source", anything)))$source
 
   # retrieve full path to the source files
   source_file <- normalize_path(source_file)
 
   # If the source file does not start with the package path or does not exist ignore it.
-  if (!file.exists(source_file) || !grepl(rex::rex(start, rex::regex(paste0(rex::escape(package_path), collapse = "|"))), source_file)) {
+  if (!source_file_exists(source_file) || !grepl(rex::rex(start, rex::regex(paste0(rex::escape(package_path), collapse = "|"))), source_file)) {
     return(NULL)
   }
 
@@ -46,9 +46,24 @@ parse_gcov <- function(file, package_path = "") {
   # There are no functions for gcov, so we set everything to NA
   functions <- rep(NA_character_, length(values))
 
+  line_coverages_impl(source_file, matches, values, functions)
+}
+
+# For mocking (only use it within parse_gcov())
+line_coverages_impl <- function(source_file, matches, values, functions) {
   line_coverages(source_file, matches, values, functions)
 }
 
+# For mocking (only use it within parse_gcov())
+source_file_exists <- function(path) {
+  file.exists(path)
+}
+
+# For mocking (only use it within parse_gcov())
+read_lines_impl <- function(path) {
+  readLines(path)
+}
+
 clean_gcov <- function(path) {
   src_dir <- file.path(path, "src")
 

R/coveralls.R

@@ -30,10 +30,10 @@ coveralls <- function(..., coverage = NULL,
   coverage_json <- to_coveralls(coverage,
     repo_token = repo_token, service_name = service)
 
-  result <- httr::RETRY("POST", url = coveralls_url,
-    body = list(json_file = httr::upload_file(to_file(coverage_json))))
+  result <- RETRY("POST", url = coveralls_url,
+    body = list(json_file = upload_file(to_file(coverage_json))))
 
-  content <- httr::content(result)
+  content <- content(result)
   if (isTRUE(content$error)) {
     stop("Failed to upload coverage data. Reply by Coveralls: ", content$message)
   }

R/covr.R

@@ -82,6 +82,10 @@
 #' @importFrom utils capture.output getSrcFilename relist str head
 NULL
 
+# For mocking
+#' @importFrom httr content RETRY upload_file
+NULL
+
 the <- new.env(parent = emptyenv())
 
 the$replacements <- list()

R/utils.R

@@ -322,11 +322,16 @@ env_path <- function(...) {
 }
 
 normalize_path <- function(x) {
-  path <- normalizePath(x, winslash = "/", mustWork = FALSE)
+  path <- normalize_path_impl(x)
   # Strip any trailing slashes as they are invalid on windows
   sub("/*$", "", path)
 }
 
+# For mocking (inside normalize_path)
+normalize_path_impl <- function(path) {
+  normalizePath(path, winslash = "/", mustWork = FALSE)
+}
+
 temp_dir <- function() {
   normalize_path(tempdir())
 }