Updated tests and added check to ds.name

Author: StuartWheater

R/ds.names.R

@@ -73,6 +73,10 @@ ds.names <- function(xname=NULL, datasources=NULL){
     datasources <- datashield.connections_find()
   }
 
+  if(is.null(xname)){
+    stop("Please provide the name of the input list!", call.=FALSE)
+  }
+
   calltext<-call("namesDS", xname)
   output<-datashield.aggregate(datasources,calltext)
   return(output)

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

@@ -21,7 +21,15 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))
 context("ds.names::arg::test errors")
 test_that("simple ds.names errors", {
     expect_error(ds.names(), "Please provide the name of the input list!", fixed=TRUE)
-    expect_error(ds.names(x="D$LAB_TSC"), "The input object must be a list.", fixed=TRUE)
+
+    res <- ds.names(x="D$LAB_TSC")
+
+    expect_length(res, 3)
+    expect_length(res$sim1, 2)
+    expect_length(res$sim1$error.message, 1)
+    expect_equal(res$sim1$error.message, "The input object is not of class <list>", fixed=TRUE)
+    expect_length(res$sim1$trace.message, 1)
+    expect_equal(res$sim1$trace.message, "numeric")
 })
 
 #

tests/testthat/test-smk-ds.listServersideFunctions.R

@@ -33,7 +33,7 @@ test_that("check results", {
       "tableDS.assign", "tapplyDS.assign", "unlist", "unListDS"
     ))
     aggregate.functions <- factor(c(
-      "NROW", "alphaPhiDS", "asFactorDS1", "asListDS",
+      "NROW", "asFactorDS1", "asListDS",
       "checkNegValueDS", "classDS", "colnamesDS", "corTestDS",
       "covDS", "dataFrameSubsetDS1",
       "densityGridDS", "dimDS",