removed redundant existence checks, explicitly check silent return

Author: timcadman

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

@@ -27,9 +27,7 @@ test_that("setup", {
 
 # context("ds.abs::smk")
 test_that("simple c", {
-    res <- ds.abs("D$LAB_TSC", newobj = "abs.newobj")
-
-    expect_true(is.null(res))
+    expect_silent(ds.abs("D$LAB_TSC", newobj = "abs.newobj"))
 
     res.length <- ds.length("abs.newobj")
 

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

@@ -27,7 +27,7 @@ test_that("setup", {
 
 # context("ds.asCharacter::smk::simple test")
 test_that("simple test", {
-    ds.asCharacter("D$LAB_TSC")
+    expect_silent(ds.asCharacter("D$LAB_TSC"))
 
     res.class <- ds.class("ascharacter.newobj")
     expect_equal(res.class$sim1, "character")

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

@@ -27,7 +27,7 @@ test_that("setup", {
 
 # context("ds.asDataMatrix::smk::simple test")
 test_that("simple test", {
-    ds.asDataMatrix(x.name="D$GENDER")
+    expect_silent(ds.asDataMatrix(x.name="D$GENDER"))
 
     res.class <- ds.class("asdatamatrix.newobj")
     expect_length(res.class, 3)

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

@@ -27,7 +27,7 @@ test_that("setup", {
 
 # context("ds.asInteger::smk::simple test")
 test_that("simple test", {
-    ds.asInteger("D$GENDER")
+    expect_silent(ds.asInteger("D$GENDER"))
 
     res.class <- ds.class("asinteger.newobj")
     expect_equal(res.class$sim1, "integer")

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

@@ -27,7 +27,7 @@ test_that("setup", {
 
 # context("ds.asList::smk::simple test")
 test_that("simple test", {
-    ds.asList(x.name="D$GENDER")
+    expect_silent(ds.asList(x.name="D$GENDER"))
 
     res.class <- ds.class("aslist.newobj")
     expect_equal(res.class$sim1, "list")

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

@@ -27,7 +27,7 @@ test_that("setup", {
 
 # context("ds.asLogical::smk::simple test")
 test_that("simple test", {
-    ds.asLogical("D$LAB_TSC")
+    expect_silent(ds.asLogical("D$LAB_TSC"))
 
     res.class <- ds.class("aslogical.newobj")
     expect_equal(res.class$sim1, "logical")

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

@@ -27,7 +27,7 @@ test_that("setup", {
 
 # context("ds.asMatrix::smk::simple test")
 test_that("simple test", {
-    ds.asMatrix(x.name="D$GENDER")
+    expect_silent(ds.asMatrix(x.name="D$GENDER"))
 
     res.class <- ds.class("asmatrix.newobj")
     expect_true("matrix" %in% res.class$sim1)

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

@@ -27,7 +27,7 @@ test_that("setup", {
 
 # context("ds.asNumeric::smk::simple test")
 test_that("simple test", {
-    ds.asNumeric("D$GENDER")
+    expect_silent(ds.asNumeric("D$GENDER"))
 
     res.class <- ds.class("asnumeric.newobj")
     expect_equal(res.class$sim1, "numeric")

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

@@ -27,19 +27,7 @@ test_that("setup", {
 
 # context("ds.exp::smk")
 test_that("simple exp", {
-    res1 <- ds.exp("D$LAB_TSC", newobj="exp1_obj")
-
-    expect_length(res1, 0)
-
-    res1_exists <- ds.exists("exp1_obj")
-
-    expect_length(res1_exists, 3)
-    expect_length(res1_exists$sim1, 1)
-    expect_equal(res1_exists$sim1, TRUE)
-    expect_length(res1_exists$sim2, 1)
-    expect_equal(res1_exists$sim2, TRUE)
-    expect_length(res1_exists$sim3, 1)
-    expect_equal(res1_exists$sim3, TRUE)
+    expect_silent(ds.exp("D$LAB_TSC", newobj="exp1_obj"))
 
     res1_class <- ds.class("exp1_obj")
 
@@ -53,21 +41,9 @@ test_that("simple exp", {
 
     res_as <- ds.asInteger("D$LAB_TSC", newobj="new_data")
 
-    res2 <- ds.exp("new_data", newobj="exp2_obj")
-
-    expect_length(res2, 0)
-
-    res2_exists <- ds.exists("exp2_obj")
-
-    expect_length(res2_exists, 3)
-    expect_length(res2_exists$sim1, 1)
-    expect_equal(res2_exists$sim1, TRUE)
-    expect_length(res2_exists$sim2, 1)
-    expect_equal(res2_exists$sim2, TRUE)
-    expect_length(res2_exists$sim3, 1)
-    expect_equal(res2_exists$sim3, TRUE)
+    expect_silent(ds.exp("new_data", newobj="exp2_obj"))
 
-    res2_class <- ds.class("exp1_obj")
+    res2_class <- ds.class("exp2_obj")
 
     expect_length(res2_class, 3)
     expect_length(res2_class$sim1, 1)

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

@@ -27,19 +27,7 @@ test_that("setup", {
 
 # context("ds.log::smk")
 test_that("simple log", {
-    res1 <- ds.log("D$LAB_TSC", newobj="log1_obj")
-
-    expect_length(res1, 0)
-
-    res1_exists <- ds.exists("log1_obj")
-
-    expect_length(res1_exists, 3)
-    expect_length(res1_exists$sim1, 1)
-    expect_equal(res1_exists$sim1, TRUE)
-    expect_length(res1_exists$sim2, 1)
-    expect_equal(res1_exists$sim2, TRUE)
-    expect_length(res1_exists$sim3, 1)
-    expect_equal(res1_exists$sim3, TRUE)
+    expect_silent(ds.log("D$LAB_TSC", newobj="log1_obj"))
 
     res1_class <- ds.class("log1_obj")
 
@@ -53,19 +41,7 @@ test_that("simple log", {
 
     res_as <- ds.asInteger("D$LAB_TSC", newobj="new_data")
 
-    res2 <- ds.log("new_data", newobj="log2_obj")
-
-    expect_length(res2, 0)
-
-    res2_exists <- ds.exists("log2_obj")
-
-    expect_length(res2_exists, 3)
-    expect_length(res2_exists$sim1, 1)
-    expect_equal(res2_exists$sim1, TRUE)
-    expect_length(res2_exists$sim2, 1)
-    expect_equal(res2_exists$sim2, TRUE)
-    expect_length(res2_exists$sim3, 1)
-    expect_equal(res2_exists$sim3, TRUE)
+    expect_silent(ds.log("new_data", newobj="log2_obj"))
 
     res2_class <- ds.class("log2_obj")