test: updated expectations now some functions return a list

Author: timcadman

tests/testthat/test-smk-isNaDS.R

@@ -25,29 +25,29 @@ test_that("numeric vector isNaDS", {
 
     res <- isNaDS("input")
 
-    expect_length(res, 1)
-    expect_equal(class(res), "logical")
-    expect_equal(res, FALSE)
+    expect_length(res$is.na, 1)
+    expect_equal(class(res$is.na), "logical")
+    expect_equal(res$is.na, FALSE)
 })
 
 test_that("numeric vector isNaDS - with NA single", {
     input <- c(0.1, NA, 2.1, 3.1, 4.1)
 
     res <- isNaDS("input")
 
-    expect_length(res, 1)
-    expect_equal(class(res), "logical")
-    expect_equal(res, FALSE)
+    expect_length(res$is.na, 1)
+    expect_equal(class(res$is.na), "logical")
+    expect_equal(res$is.na, FALSE)
 })
 
 test_that("numeric vector isNaDS - with NA all", {
     input <- c(NA, NA, NA, NA, NA)
 
     res <- isNaDS("input")
 
-    expect_length(res, 1)
-    expect_equal(class(res), "logical")
-    expect_equal(res, TRUE)
+    expect_length(res$is.na, 1)
+    expect_equal(class(res$is.na), "logical")
+    expect_equal(res$is.na, TRUE)
 })
 
 # context("isNaDS::smk::character vector")
@@ -56,29 +56,29 @@ test_that("character vector isNaDS", {
 
     res <- isNaDS("input")
 
-    expect_length(res, 1)
-    expect_equal(class(res), "logical")
-    expect_equal(res, FALSE)
+    expect_length(res$is.na, 1)
+    expect_equal(class(res$is.na), "logical")
+    expect_equal(res$is.na, FALSE)
 })
 
 test_that("character vector isNaDS - with NA single", {
     input <- c("101", NA, "303", "404", "505")
 
     res <- isNaDS("input")
 
-    expect_length(res, 1)
-    expect_equal(class(res), "logical")
-    expect_equal(res, FALSE)
+    expect_length(res$is.na, 1)
+    expect_equal(class(res$is.na), "logical")
+    expect_equal(res$is.na, FALSE)
 })
 
 test_that("character vector isNaDS - with NA all", {
     input <- c(NA, NA, NA, NA, NA)
 
     res <- isNaDS("input")
 
-    expect_length(res, 1)
-    expect_equal(class(res), "logical")
-    expect_equal(res, TRUE)
+    expect_length(res$is.na, 1)
+    expect_equal(class(res$is.na), "logical")
+    expect_equal(res$is.na, TRUE)
 })
 
 test_that("isNaDS throws error when object does not exist", {

tests/testthat/test-smk-levelsDS.R

@@ -35,8 +35,6 @@ test_that("numeric vector levelsDS", {
     expect_equal(res$Levels[2], "1")
     expect_equal(res$Levels[3], "2")
     expect_equal(res$Levels[4], "3")
-    expect_equal(class(res$ValidityMessage), "character")
-    expect_equal(res$ValidityMessage, "VALID ANALYSIS")
 })
 
 test_that("levelsDS throws error when object does not exist", {

tests/testthat/test-smk-numNaDS.R

@@ -25,19 +25,19 @@ test_that("simple numNaDS", {
 
     res <- numNaDS("input")
 
-    expect_equal(class(res), "integer")
-    expect_length(res, 1)
-    expect_equal(res, 3)
+    expect_equal(class(res$numNA), "integer")
+    expect_length(res$numNA, 1)
+    expect_equal(res$numNA, 3)
 })
 
 test_that("simple numNaDS, single NA", {
     input <- NA
 
     res <- numNaDS("input")
 
-    expect_equal(class(res), "integer")
-    expect_length(res, 1)
-    expect_equal(res, 1)
+    expect_equal(class(res$numNA), "integer")
+    expect_length(res$numNA, 1)
+    expect_equal(res$numNA, 1)
 })
 
 test_that("numNaDS throws error when object does not exist", {