Fixed .BuildTestLib for covr

R/testing_utils.R

@@ -12,6 +12,7 @@
     #       from the repo root if something goes wrong
 
     # [DEBUG] write("=========", file = "~/thing.txt", append = TRUE)
+    # [DEBUG] write(paste0("target lib path: ", targetLibPath), file = "~/thing.txt", append = TRUE)
     # [DEBUG] write(list.files(getwd(), recursive = TRUE), file = "~/thing.txt", append = TRUE)
     # [DEBUG] write(paste0("working dir: ", getwd()), file = "~/thing.txt", append = TRUE)
 
@@ -20,18 +21,32 @@
     pkgnetSourcePath <- gsub('/pkgnet.Rcheck/vign_test/pkgnet$', replacement = '/pkgnet.Rcheck/00_pkg_src/pkgnet', x = pkgnetSourcePath)
     pkgnetSourcePath <- gsub('/pkgnet/vignettes$', replacement = '/pkgnet', x = pkgnetSourcePath)
     pkgnetSourcePath <- gsub('pkgnet/tests/testthat', replacement = 'pkgnet', x = pkgnetSourcePath)
+    pkgnetSourcePath <- gsub('/pkgnet/pkgnet-tests/testthat', replacement = '/pkgnet', x = pkgnetSourcePath) # covr
+    pkgnetSourcePath <- gsub('/pkgnet/pkgnet-tests', replacement = '/pkgnet', x = pkgnetSourcePath) # covr
 
     # [DEBUG] write(paste0("pkgnet path: ", pkgnetSourcePath), file = "~/thing.txt", append = TRUE)
-    # [DEBUG] write("=========", file = "~/thing.txt", append = TRUE)
+    # [DEBUG] write(list.files(pkgnetSourcePath, recursive = TRUE), file = "~/thing.txt", append = TRUE)
+
+    # Check if there is an inst directory in pkgnetSource.
+    # If there is an inst directory (because of raw package copy) then look in there
+    # for the test packages.
+    # Otherwise if not, it means that it's an installed package copy and the test
+    # packages are in the package root directory.
+    testPkgSourceDir <- ""
+    if ("inst" %in% list.files(pkgnetSourcePath)) {
+        testPkgSourceDir <- "inst"
+    }
 
     ### packages to be built
     pkgList <- c(
-        baseballstats = file.path(pkgnetSourcePath, "inst", "baseballstats")
-        , sartre = file.path(pkgnetSourcePath, "inst", "sartre")
-        , milne = file.path(pkgnetSourcePath, "inst", "milne")
+        baseballstats = file.path(pkgnetSourcePath, testPkgSourceDir, "baseballstats")
+        , sartre = file.path(pkgnetSourcePath, testPkgSourceDir, "sartre")
+        , milne = file.path(pkgnetSourcePath, testPkgSourceDir, "milne")
         , pkgnet = pkgnetSourcePath
     )
 
+    # [DEBUG] write(paste0("Installing: ", paste(pkgList)), file = "~/thing.txt", append = TRUE)
+
     ### Install
 
     # Figure out where R is to avoid those weird warnings about
@@ -71,5 +86,7 @@
         ))
     }
 
+    # [DEBUG] write("=========", file = "~/thing.txt", append = TRUE)
+
     return(invisible(TRUE))
 }

tests/testthat.R

@@ -19,6 +19,8 @@ if (Sys.getenv('PKGNET_REBUILD')){
     ## travis checks.
     ## ******************************************************************************************
 
+    # [DEBUG] write("PKGNET_REBUILD triggered", file = "~/thing.txt", append = TRUE)
+
     # record original libpaths in order to reset later.
     # This should be unnecessary since tests are conducted within a seperate enviornment.
     # It's done out of an abundance of caution.
@@ -39,6 +41,10 @@ if (Sys.getenv('PKGNET_REBUILD')){
         targetLibPath = Sys.getenv('PKGNET_TEST_LIB')
     )
 
+    # [DEBUG] write(paste0("PKGNET_TEST_LIB: ", Sys.getenv('PKGNET_TEST_LIB')), file = "~/thing.txt", append = TRUE)
+    # [DEBUG] write(list.files(Sys.getenv('PKGNET_TEST_LIB'), recursive = TRUE), file = "~/thing.txt", append = TRUE)
+
+
 }
 
 # This withr statement should be redundant.
@@ -57,6 +63,8 @@ if (Sys.getenv('PKGNET_REBUILD')){
     ## travis checks.
     ## ******************************************************************************************
 
+    # [DEBUG] write("PKGNET_REBUILD tear-down triggered", file = "~/thing.txt", append = TRUE)
+
     # Uninstall Fake Packages From Test Library if Not Already Uninstalled
     try(
         utils::remove.packages(

tests/testthat/setup_setTestEnv.R

@@ -1,3 +1,5 @@
+# Check if the setup in testthat.R was already run
+# [DEBUG] write("setup_setTestEnv.R triggered", file = "~/thing.txt", append = TRUE)
 
 # record original libpaths in order to reset later.
 # This should be unnecessary since tests are conducted within a seperate enviornment.
@@ -18,3 +20,7 @@ Sys.setenv(PKGNET_TEST_LIB = tempdir())
 pkgnet:::.BuildTestLib(
     targetLibPath = Sys.getenv('PKGNET_TEST_LIB')
 )
+
+# [DEBUG] write(paste0("PKGNET_TEST_LIB: ", Sys.getenv('PKGNET_TEST_LIB')), file = "~/thing.txt", append = TRUE)
+# [DEBUG] write(list.files(Sys.getenv('PKGNET_TEST_LIB'), recursive = TRUE), file = "~/thing.txt", append = TRUE)
+

tests/testthat/teardown_setTestEnv.R

@@ -1,10 +1,10 @@
-
+# [DEBUG] write("teardown_setTestEnv.R triggered", file = "~/thing.txt", append = TRUE)
 
 # Uninstall Fake Packages From Test Library if Not Already Uninstalled
 try(
     utils::remove.packages(
         pkgs = c('baseballstats', 'sartre', 'milne', 'pkgnet')
-       , lib = Sys.getenv('PKGNET_TEST_LIB')
+        , lib = Sys.getenv('PKGNET_TEST_LIB')
     )
 )
 
@@ -14,4 +14,4 @@ try(
 .libPaths(origLibPaths)
 
 # Remove test libary path eviornment variable.
-Sys.unsetenv('PKGNET_TEST_LIB')
+Sys.unsetenv('PKGNET_TEST_LIB')