Merge branch 'read-CamtrapDP-v1.0-rc.1' of https://github.com/inbo/ca…

…mtraptor into read-CamtrapDP-v1.0-rc.1

R/get_cam_op.R

@@ -51,6 +51,8 @@ get_cam_op <- function(package = NULL,
   # check camera trap data package
   package <- check_package(package, datapkg, "get_cam_op")
 
+  # Check that station_col is a single string
+  assertthat::assert_that(assertthat::is.string(station_col))
   # Check that station_col is one of the columns in deployments
   assertthat::assert_that(
     station_col %in% names(package$data$deployments),

tests/testthat/test-get_cam_op.R

@@ -3,8 +3,23 @@ test_that("input camtrap dp is checked properly", {
   expect_error(get_cam_op("aaa"))
   # numeric instead of datapackage
   expect_error(get_cam_op(1))
+  # station_col is not NA
+  expect_error(
+    get_cam_op(mica, station_col = NA),
+    regexp = "station_col is not a string (a length one character vector).",
+    fixed = TRUE)
+  # station_col is length 1
+  expect_error(
+    get_cam_op(mica, station_col = c("locationID","locationName")),
+    regexp = "station_col is not a string (a length one character vector).",
+    fixed = TRUE)
   # station_col value is not a column of deployments
-  expect_error(get_cam_op(mica, station_col = "bla"))
+  expect_error(
+    get_cam_op(mica, station_col = "bla"),
+    regexp = paste("Station column name (`bla`) is not valid:", 
+          "it must be one of the deployments column names."),
+    fixed = TRUE
+  )
   # column specified by station_col contains empty values
   mica_empty_location_name <- mica
   mica_empty_location_name$data$deployments$locationName[2:3] <- NA