fixed unit tests

Author: timcadman

tests/testthat/test-disc-meanDS.R

@@ -25,7 +25,7 @@ set.standard.disclosure.settings()
 test_that("numeric meanDS, with below nfilter.tab values", {
     input <- c(NA, NA, 2.0, NA, 4.0)
 
-    expect_error(meanDS(input), "FAILED: Nvalid less than nfilter.tab", fixed = TRUE)
+    expect_error(meanDS("input"), "FAILED: Nvalid less than nfilter.tab", fixed = TRUE)
 })
 
 #

tests/testthat/test-disc-varDS.R

@@ -25,7 +25,7 @@ set.standard.disclosure.settings()
 test_that("numeric varDS, with below nfilter.tab values", {
     input <- c(NA, NA, 2.0, NA, 4.0)
 
-    expect_error(varDS(input), "FAILED: Nvalid less than nfilter.tab", fixed = TRUE)
+    expect_error(varDS("input"), "FAILED: Nvalid less than nfilter.tab", fixed = TRUE)
 })
 
 #

tests/testthat/test-perf-meanDS.R

@@ -36,7 +36,7 @@ test_that("numeric meanDS - performance", {
     .current.time <- .start.time
 
     while (difftime(.current.time, .start.time, units = "secs")[[1]] < .durationSec) {
-        meanDS(input)
+        meanDS("input")
 
         .count <- .count + 1
         .current.time <- Sys.time()
@@ -71,7 +71,7 @@ test_that("numeric meanDS, with NA - performance", {
     .current.time <- .start.time
 
     while (difftime(.current.time, .start.time, units = "secs")[[1]] < .durationSec) {
-        meanDS(input)
+        meanDS("input")
 
         .count <- .count + 1
         .current.time <- Sys.time()

tests/testthat/test-perf-varDS.R

@@ -36,7 +36,7 @@ test_that("numeric varDS - performance", {
     .current.time <- .start.time
 
     while (difftime(.current.time, .start.time, units = "secs")[[1]] < .durationSec) {
-        varDS(input)
+        varDS("input")
 
         .count <- .count + 1
         .current.time <- Sys.time()
@@ -71,7 +71,7 @@ test_that("numeric varDS, with NA - performance", {
     .current.time <- .start.time
 
     while (difftime(.current.time, .start.time, units = "secs")[[1]] < .durationSec) {
-        varDS(input)
+        varDS("input")
 
         .count <- .count + 1
         .current.time <- Sys.time()

tests/testthat/test-smk-meanDS.R

@@ -63,8 +63,8 @@ test_that("numeric meanDS, with NA", {
 
 # context("meanDS::smk::numeric with all NA")
 test_that("numeric meanDS, with all NA", {
-    input <- c(NA, NA, NA, NA, NA)
-    
+    input <- rep(NA_real_, 5)
+
     res <- meanDS("input")
 
     expect_length(res, 5)

tests/testthat/test-smk-meanSdGpDS.R

@@ -33,8 +33,8 @@ test_that("simple meanSdGpDS, numeric by factor", {
     expect_equal(res$Nvalid, 10)
     expect_equal(res$Nmissing, 0)
     expect_equal(res$Ntotal, 10)
-    expect_equal(res$Mean_gp[["A"]], 3.0)
-    expect_equal(res$Mean_gp[["B"]], 8.0)
+    expect_equal(as.numeric(res$Mean_gp)[1], 3.0)
+    expect_equal(as.numeric(res$Mean_gp)[2], 8.0)
 })
 
 test_that("meanSdGpDS throws error when X does not exist", {

tests/testthat/test-smk-varDS.R

@@ -67,13 +67,13 @@ test_that("numeric varDS, with NA", {
 
 # context("varDS::smk::numeric with all NA")
 test_that("numeric varDS, with all NA", {
-    input <- c(NA, NA, NA, NA, NA)
-    
+    input <- rep(NA_real_, 5)
+
     res <- varDS("input")
-    
+
     expect_length(res, 6)
     expect_equal(class(res), "list")
-    expect_equal(class(res$Sum), "integer")
+    expect_equal(class(res$Sum), "numeric")
     expect_equal(res$Sum, 0)
     expect_equal(class(res$SumOfSquares), "numeric")
     expect_equal(res$SumOfSquares, 0)