fix: arg-test assertions and DESCRIPTION cli import

Author: timcadman

.Rbuildignore

@@ -23,3 +23,4 @@
 ^\.circleci$
 ^\.circleci/config\.yml$
 ^\.github$
+^REFACTOR_GUIDE\.md$

DESCRIPTION

@@ -69,7 +69,8 @@ Imports:
     gridExtra,
     data.table,
     methods,
-    dplyr
+    dplyr,
+    cli
 Suggests:
     lme4,
     httr,

dsBase_7.0.0-permissive.tar.gz

@@ -22,7 +22,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
 # context("ds.dataFrameFill::arg::test errors")
 test_that("dataFrameFill_erros", {
     expect_error(ds.dataFrameFill(), "Please provide the name of the data.frame to be filled as a character string: eg 'xxx'", fixed=TRUE)
-    expect_error(ds.dataFrameFill("NonDF"), "The input object NonDF is not defined in sim1, sim2, sim3!", fixed=TRUE)
+    expect_error(ds.dataFrameFill("NonDF"), "DataSHIELD errors")
     expect_error(ds.dataFrameFill("D$LAB_TSC"), "The input vector must be of type 'data.frame' or a 'matrix'!", fixed=TRUE)
 })
 

tests/testthat/test-arg-ds.dataFrameFill.R

@@ -53,9 +53,9 @@ test_that("dataFrameSubset_erros", {
     res.errors <- DSI::datashield.errors()
 
     expect_length(res.errors, 3)
-    expect_match(res.errors$sim1, "* object 'M' not found*")
-    expect_match(res.errors$sim2, "* object 'M' not found*")
-    expect_match(res.errors$sim3, "* object 'M' not found*")
+    expect_match(res.errors$sim1, "The server-side object 'M' does not exist")
+    expect_match(res.errors$sim2, "The server-side object 'M' does not exist")
+    expect_match(res.errors$sim3, "The server-side object 'M' does not exist")
 })
 
 # context("ds.dataFrameSubset::arg::missing 'V1' value server-side")
@@ -65,9 +65,9 @@ test_that("dataFrameSubset_erros", {
     res.errors <- DSI::datashield.errors()
 
     expect_length(res.errors, 3)
-    expect_match(res.errors$sim1, "* Error in eval\\(parse\\(text = V1.name\\), envir = parent.frame\\(\\)\\) : \\n  object 'A' not found*")
-    expect_match(res.errors$sim2, "* Error in eval\\(parse\\(text = V1.name\\), envir = parent.frame\\(\\)\\) : \\n  object 'A' not found*")
-    expect_match(res.errors$sim3, "* Error in eval\\(parse\\(text = V1.name\\), envir = parent.frame\\(\\)\\) : \\n  object 'A' not found*")
+    expect_match(res.errors$sim1, "The server-side object 'A' does not exist")
+    expect_match(res.errors$sim2, "The server-side object 'A' does not exist")
+    expect_match(res.errors$sim3, "The server-side object 'A' does not exist")
 })
 
 # context("ds.dataFrameSubset::arg::missing 'V2' value server-side")
@@ -77,9 +77,9 @@ test_that("dataFrameSubset_erros", {
     res.errors <- DSI::datashield.errors()
 
     expect_length(res.errors, 3)
-    expect_match(res.errors$sim1, "* Error in eval\\(parse\\(text = V2.name\\), envir = parent.frame\\(\\)\\) : \\n  object 'B' not found*")
-    expect_match(res.errors$sim2, "* Error in eval\\(parse\\(text = V2.name\\), envir = parent.frame\\(\\)\\) : \\n  object 'B' not found*")
-    expect_match(res.errors$sim3, "* Error in eval\\(parse\\(text = V2.name\\), envir = parent.frame\\(\\)\\) : \\n  object 'B' not found*")
+    expect_match(res.errors$sim1, "The server-side object 'B' does not exist")
+    expect_match(res.errors$sim2, "The server-side object 'B' does not exist")
+    expect_match(res.errors$sim3, "The server-side object 'B' does not exist")
 })
 
 # context("ds.dataFrameSubset::arg::invalid 'Boolean.operator' value server-side")

tests/testthat/test-arg-ds.dataFrameSubset.R

@@ -23,7 +23,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
 test_that("merge_erros", {
     expect_error(ds.merge(), "Please provide the name (eg 'name1') of first dataframe to be merged (called x) ", fixed=TRUE)
     expect_error(ds.merge(x.name="A"), "Please provide the name (eg 'name2') of second dataframe to be merged (called y) ", fixed=TRUE)
-    expect_error(ds.merge(x.name="D$LAB_TSC", y.name="B"), "The input object B is not defined in sim1, sim2, sim3!", fixed=TRUE)
+    expect_error(ds.merge(x.name="D$LAB_TSC", y.name="B", by.x.names="LAB_TSC", by.y.names="LAB_TSC"), "DataSHIELD errors")
     expect_error(ds.merge(x.name="D$LAB_TSC", y.name="D$LAB_TSC", by.x.names="C"), "Please provide the names of columns in y dataframe on which to merge (eg c('id', 'time'))", fixed=TRUE)
     expect_error(ds.merge(x.name="D$LAB_TSC", y.name="D$LAB_TSC", by.x.names="D$LAB_TSC", by.y.names="D", suffixes=NULL), "Please provide the suffixes to append to disambiguate duplicate column names (default = c('.x','.y'))", fixed=TRUE)
 })

tests/testthat/test-arg-ds.merge.R

@@ -21,7 +21,7 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
 
 # context("ds.seq::arg::test errors")
 test_that("seq_erros", {
-    expect_error(ds.seq(FROM.value.char="Test"), "object 'Test' not found", fixed=TRUE)
+    expect_error(ds.seq(FROM.value.char="Test"), "'Test'")
 })
 
 #