Merge pull request #1541 from wadpac/issue1540_unisensExampleData

Movisens test independent of internet access

Author: vincentvanhees

NEWS.md

@@ -1,11 +1,11 @@
 # CHANGES IN GGIR VERSION 3.3-?
 
+- Tests: Made the Movisens test independent of internet access by including the test data in inst/testfiles (#1540)
+
 - Part 3: Add new guider named LowAcc, with new parameter LowAcc_threshold. Further, parameter HDCZA_roll_windowsize was added related to guider HDCZA. #1287
 
 - Part 3: Added new parameter HDCZA_roll_windowsize to control the size of the rolling window used by the HDCZA guider algorithm.
 
-- Part 1: Skip movisens tests on both CRAN and GitHub Actions. These tests are now only run locally as they depend on the downloading of test data.
-
 - Part 5: Allow for day segment analysis for the WW and OO window definition. #1407
 
 # CHANGES IN GGIR VERSION 3.3-8

tests/testthat/test_greadaccfile.R

@@ -157,6 +157,48 @@ test_that("g.readaccfile and g.inspectfile can read movisens, gt3x, cwa, Axivity
                   inspectfileobject = IGA)
   expect_true(MGA$filetooshort)
 
+  cat("\n Movisens")
+  
+  # Test data from the unisensExample at:
+  # https://github.com/Unisens/unisensR/tree/0.3.4/tests/unisensExample
+  output_dir = "output_unisensExample"
+  on.exit({if (file.exists(output_dir)) unlink(output_dir, recursive = TRUE)}, add = TRUE)
+  if (file.exists(output_dir)) unlink(output_dir, recursive = TRUE)
+  
+  movisensFile = system.file(
+    "extdata/unisensExample/acc.bin",
+    package = "unisensR"
+  )
+  
+  expect_true(file.exists(movisensFile))
+  
+  Mcsv = g.inspectfile(movisensFile, desiredtz = desiredtz)
+  expect_equal(Mcsv$monc, MONITOR$MOVISENS)
+  expect_equal(Mcsv$dformc, FORMAT$BIN)
+  expect_equal(Mcsv$sf, 64)
+  
+  movisens_blocksize = 3000
+  movisens_read = g.readaccfile(movisensFile, blocksize = movisens_blocksize, blocknumber = 1, filequality = filequality,
+                                dayborder = dayborder, ws = 3,
+                                PreviousEndPage = 1, inspectfileobject = Mcsv,
+                                params_rawdata = params_rawdata, params_general = params_general)
+  expect_equal(nrow(movisens_read$P$data), movisens_blocksize)
+  expect_false(movisens_read$filequality$filecorrupt)
+  expect_false(movisens_read$filequality$filetooshort)
+  expect_equal(movisens_read$endpage, movisens_blocksize)
+  
+  # read the next block (set PreviousEndPage to movisens_read$endpage)
+  movisens_read2 = g.readaccfile(movisensFile, blocksize = movisens_blocksize, blocknumber = 2, filequality = filequality,
+                                 dayborder = dayborder, ws = 3,
+                                 PreviousEndPage = movisens_read$endpage, inspectfileobject = Mcsv,
+                                 params_rawdata = params_rawdata, params_general = params_general)
+  expect_equal(nrow(movisens_read2$P$data), movisens_blocksize)
+  expect_equal(movisens_read2$endpage, movisens_blocksize * 2)
+  
+  # if the 1st sample of 2nd block is identical to the last sample of the 1st block,
+  # this means that we calculated the startpage of the 2nd block incorrectly.
+  expect_false(any(movisens_read2$P$data[1,] == movisens_read$P$data[nrow(movisens_read$P$data),]))
+  cat("\n ad-hoc csv file")
   # ad-hoc csv file
 
   # Create test file: No header, with temperature, with time.
@@ -429,72 +471,4 @@ test_that("g.readaccfile and g.inspectfile can read movisens, gt3x, cwa, Axivity
   if (file.exists(testfile_two_col)) file.remove(testfile_two_col)
   if (file.exists(testfile)) file.remove(testfile)
   if (file.exists(filename)) file.remove(filename)
-})
-
-test_that("g.readaccfile and g.inspectfile can read movisens files correctly", {
-  
-  skip_if(Sys.getenv("GITHUB_ACTIONS") == "true", message = "Skipping on GitHub Actions")
-  skip_on_cran()
-  
-  desiredtz = "Pacific/Auckland"
-  configtz = "Europe/Berlin"
-  params = extract_params(input = list(frequency_tol = 0.1, interpolationType = 1,
-                                       desiredtz = desiredtz, configtz = configtz))
-  params_rawdata = params$params_rawdata
-  params_general = params$params_general
-  
-  filequality = list(filecorrupt = FALSE, filetooshort = FALSE)
-  dayborder = 0
-  
-  cat("\n Movisens")
-  
-  output_dir = "output_unisensExample"
-  on.exit({if (file.exists(output_dir)) unlink(output_dir, recursive = TRUE)}, add = TRUE)
-  if (file.exists(output_dir)) unlink(output_dir, recursive = TRUE)
-  
-  zip_file = "0.3.4.zip"
-  on.exit({if (file.exists(zip_file)) unlink(zip_file)}, add = TRUE)
-  if (!file.exists(zip_file)) {
-    # link to a tagged release of Unisens/unisensR github repo
-    movisens_url = "https://github.com/Unisens/unisensR/archive/refs/tags/0.3.4.zip"
-    download.file(url = movisens_url, destfile = zip_file, quiet = TRUE)
-  }
-  movisens_dir = "unisensR-0.3.4"
-  on.exit({if (file.exists(movisens_dir)) unlink(movisens_dir, recursive = TRUE)}, add = TRUE)
-  if (file.exists(movisens_dir)) {
-    unlink(movisens_dir, recursive = TRUE)
-  }
-  unzip(zipfile = zip_file, exdir = ".")
-  movisensFile = file.path(getwd(), "unisensR-0.3.4/tests/unisensExample/acc.bin")
-  
-  Mcsv = g.inspectfile(movisensFile, desiredtz = desiredtz)
-  expect_equal(Mcsv$monc, MONITOR$MOVISENS)
-  expect_equal(Mcsv$dformc, FORMAT$BIN)
-  expect_equal(Mcsv$sf, 64)
-  
-  movisens_blocksize = 3000
-  movisens_read = g.readaccfile(movisensFile, blocksize = movisens_blocksize, blocknumber = 1, filequality = filequality,
-                                dayborder = dayborder, ws = 3,
-                                PreviousEndPage = 1, inspectfileobject = Mcsv,
-                                params_rawdata = params_rawdata, params_general = params_general)
-  expect_equal(nrow(movisens_read$P$data), movisens_blocksize)
-  expect_false(movisens_read$filequality$filecorrupt)
-  expect_false(movisens_read$filequality$filetooshort)
-  expect_equal(sum(movisens_read$P$data[c("x","y","z")]), 4383.67, tolerance = .01, scale = 1)
-  expect_equal(movisens_read$endpage, movisens_blocksize)
-  
-  # read the next block (set PreviousEndPage to movisens_read$endpage)
-  movisens_read2 = g.readaccfile(movisensFile, blocksize = movisens_blocksize, blocknumber = 2, filequality = filequality,
-                                 dayborder = dayborder, ws = 3,
-                                 PreviousEndPage = movisens_read$endpage, inspectfileobject = Mcsv,
-                                 params_rawdata = params_rawdata, params_general = params_general)
-  expect_equal(nrow(movisens_read2$P$data), movisens_blocksize)
-  expect_equal(movisens_read2$endpage, movisens_blocksize * 2)
-  
-  # if the 1st sample of 2nd block is identical to the last sample of the 1st block,
-  # this means that we calculated the startpage of the 2nd block incorrectly.
-  expect_false(any(movisens_read2$P$data[1,] == movisens_read$P$data[nrow(movisens_read$P$data),]))
-  
-  if (dir.exists("unisensR-0.3.4/")) unlink("unisensR-0.3.4/", recursive = TRUE)
-  if (file.exists(zip_file)) file.remove(zip_file)
 })