adjust stop()

lsteinmann · Apr 13, 2021 · 21770fa · 21770fa
1 parent 79007a1
commit 21770fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/R/fix_relations.R b/R/fix_relations.R
@@ -19,12 +19,12 @@
 #' uidlist = NULL)
 #' }
 fix_relations <- function(resource, replace_uids = TRUE, uidlist = NULL) {
+  if (replace_uids == TRUE && !is.data.frame(uidlist)) {
+    stop("replace_uids = TRUE but no concordance of UIDs supplied")
+  }
   if (length(resource$relations) > 0) {
     relations <- resource$relations
     if (replace_uids) {
-      if (length(uidlist) == 0) {
-        stop("Please provide a list of UIDs and identifiers (get_uid_list()")
-      }
       relations <- lapply(relations,
                           function(x) replace_uid(x, uidlist = uidlist))
     } else if (!replace_uids) {

diff --git a/tests/testthat/test-fix_relations.R b/tests/testthat/test-fix_relations.R
@@ -33,16 +33,10 @@ for (item in items) {
   }
 
 
-  test_that("fails without uidlist for items with relations", {
-    if (length(test_resources[[item]]$relations) > 0) {
-      expect_error(fix_relations(test_resources[[item]],
-                                 replace_uids = TRUE),
-                   "UID")
-    } else {
-      test <- fix_relations(test_resources[[item]],
-                            replace_uids = TRUE)
-      expect_null(test$relations)
-    }
+  test_that("fails without uidlist", {
+    expect_error(fix_relations(test_resources[[item]],
+                               replace_uids = TRUE),
+                 "*.UID.*")
   })
 
 }
diff --git a/tests/testthat/test-select_by_type.R b/tests/testthat/test-select_by_type.R
@@ -32,7 +32,7 @@ for (item in items) {
   })
 
 
-  test_that("fails withour value", {
+  test_that("fails without value", {
     expect_error(select_by(test_resources,
                            by = "type"))
   })

diff --git a/tests/testthat/test-simplify_idaifield_resources.R b/tests/testthat/test-simplify_idaifield_resources.R
@@ -5,6 +5,8 @@ uidlist <- get_uid_list(test_docs)
 items <- sample(seq_along(test_resources), size = 5)
 
 for (item in items) {
+  print(paste("-----------------------------------------------###### Nr.: ", item))
+
   test_that("error when no identifier", {
     expect_error(simplify_single_resource(test_docs[[item]]),
                  "valid")
@@ -19,7 +21,7 @@ for (item in items) {
   test_that("pass without uidlist when replaceuid = F", {
     test <- simplify_single_resource(test_resources[[item]],
                                      replace_uids = FALSE,
-                                     uidlist = "meh")
+                                     uidlist = NULL)
     expect_identical(class(test), "list")
   })