Skip to content

Commit 4b751b1

Browse files
timcadmantimcadman
committed
test: fixed test expectations
1 parent b2535b5 commit 4b751b1

14 files changed

Lines changed: 96 additions & 97 deletions

‎tests/testthat/test-smk-cDS.R‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ set.standard.disclosure.settings()
2323

2424
# context("cDS::smk::numeric list")
2525
test_that("numeric list cDS", {
26-
input <- list(a=0.0, b=1.0, c=2.0, d=3.0)
26+
a <- 0.0; b <- 1.0; c <- 2.0; d <- 3.0
2727

28-
res <- cDS(input)
28+
res <- cDS(c("a", "b", "c", "d"))
2929

3030
expect_length(res, 4)
3131
expect_equal(class(res), "numeric")
@@ -37,9 +37,9 @@ test_that("numeric list cDS", {
3737

3838
# context("cDS::smk::character list")
3939
test_that("character list cDS", {
40-
input <- list(a="0.0", b="1.0", c="2.0", d="3.0")
40+
a <- "0.0"; b <- "1.0"; c <- "2.0"; d <- "3.0"
4141

42-
res <- cDS(input)
42+
res <- cDS(c("a", "b", "c", "d"))
4343

4444
expect_length(res, 4)
4545
expect_equal(class(res), "character")
@@ -51,9 +51,9 @@ test_that("character list cDS", {
5151

5252
# context("cDS::smk::numeric list small")
5353
test_that("single numeric list small cDS", {
54-
input <- list(a=0, b=1)
54+
a <- 0; b <- 1
5555

56-
res <- cDS(input)
56+
res <- cDS(c("a", "b"))
5757

5858
expect_length(res, 2)
5959
expect_equal(class(res), "logical")
@@ -63,9 +63,7 @@ test_that("single numeric list small cDS", {
6363

6464
# context("cDS::smk::empty list")
6565
test_that("empty list cDS", {
66-
input <- list()
67-
68-
res <- cDS(input)
66+
res <- cDS(character(0))
6967

7068
expect_length(res, 0)
7169
expect_equal(class(res), "NULL")

‎tests/testthat/test-smk-corDS.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ test_that("simple corDS, casewise, full", {
378378
res <- corDS("x", "y")
379379

380380
expect_equal(class(res), "list")
381-
expect_length(res, 5)
381+
expect_length(res, 6)
382382

383383
if (base::getRversion() < '4.0.0')
384384
{
@@ -465,7 +465,7 @@ test_that("simple corDS, casewise, neg. full", {
465465
res <- corDS("x", "y")
466466

467467
expect_equal(class(res), "list")
468-
expect_length(res, 5)
468+
expect_length(res, 6)
469469

470470
if (base::getRversion() < '4.0.0')
471471
{
@@ -552,7 +552,7 @@ test_that("simple corDS, casewise, some", {
552552
res <- corDS("x", "y")
553553

554554
expect_equal(class(res), "list")
555-
expect_length(res, 5)
555+
expect_length(res, 6)
556556

557557
if (base::getRversion() < '4.0.0')
558558
{
@@ -640,7 +640,7 @@ test_that("simple corDS, casewise, some", {
640640
res <- corDS("x", "y")
641641

642642
expect_equal(class(res), "list")
643-
expect_length(res, 5)
643+
expect_length(res, 6)
644644

645645
if (base::getRversion() < '4.0.0')
646646
{

‎tests/testthat/test-smk-corTestDS.R‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test_that("simple corTestDS, full, without na, pearson", {
2929
res <- corTestDS("x", "y", "pearson", NULL, 0.95)
3030

3131
expect_equal(class(res), "list")
32-
expect_length(res, 2)
32+
expect_length(res, 3)
3333

3434
expect_length(res$`Number of pairwise complete cases`, 1)
3535
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -82,7 +82,7 @@ test_that("simple corTestDS, neg. full, without na, pearson", {
8282
res <- corTestDS("x", "y", "pearson", NULL, 0.95)
8383

8484
expect_equal(class(res), "list")
85-
expect_length(res, 2)
85+
expect_length(res, 3)
8686

8787
expect_length(res$`Number of pairwise complete cases`, 1)
8888
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -135,7 +135,7 @@ test_that("simple corTestDS, some, pearson, without na, pearson", {
135135
res <- corTestDS("x", "y", "pearson", NULL, 0.95)
136136

137137
expect_equal(class(res), "list")
138-
expect_length(res, 2)
138+
expect_length(res, 3)
139139

140140
expect_length(res$`Number of pairwise complete cases`, 1)
141141
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -189,7 +189,7 @@ test_that("simple corTestDS, some, with na, pearson", {
189189
res <- corTestDS("x", "y", "pearson", NULL, 0.95)
190190

191191
expect_equal(class(res), "list")
192-
expect_length(res, 2)
192+
expect_length(res, 3)
193193

194194
expect_length(res$`Number of pairwise complete cases`, 1)
195195
expect_equal(res$`Number of pairwise complete cases`, 3)
@@ -238,7 +238,7 @@ test_that("simple corTestDS, full, without na, kendall", {
238238
res <- corTestDS("x", "y", "kendall", NULL, 0.95)
239239

240240
expect_equal(class(res), "list")
241-
expect_length(res, 2)
241+
expect_length(res, 3)
242242

243243
expect_length(res$`Number of pairwise complete cases`, 1)
244244
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -284,7 +284,7 @@ test_that("simple corTestDS, neg. full, without na, kendall", {
284284
res <- corTestDS("x", "y", "kendall", NULL, 0.95)
285285

286286
expect_equal(class(res), "list")
287-
expect_length(res, 2)
287+
expect_length(res, 3)
288288

289289
expect_length(res$`Number of pairwise complete cases`, 1)
290290
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -330,7 +330,7 @@ test_that("simple corTestDS, some, kendall, without na, kendall", {
330330
res <- corTestDS("x", "y", "kendall", NULL, 0.95)
331331

332332
expect_equal(class(res), "list")
333-
expect_length(res, 2)
333+
expect_length(res, 3)
334334

335335
expect_length(res$`Number of pairwise complete cases`, 1)
336336
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -377,7 +377,7 @@ test_that("simple corTestDS, some, with na, kendall", {
377377
res <- corTestDS("x", "y", "kendall", NULL, 0.95)
378378

379379
expect_equal(class(res), "list")
380-
expect_length(res, 2)
380+
expect_length(res, 3)
381381

382382
expect_length(res$`Number of pairwise complete cases`, 1)
383383
expect_equal(res$`Number of pairwise complete cases`, 3)
@@ -424,7 +424,7 @@ test_that("simple corTestDS, full, without na, spearman", {
424424
res <- corTestDS("x", "y", "spearman", NULL, 0.95)
425425

426426
expect_equal(class(res), "list")
427-
expect_length(res, 2)
427+
expect_length(res, 3)
428428

429429
expect_length(res$`Number of pairwise complete cases`, 1)
430430
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -470,7 +470,7 @@ test_that("simple corTestDS, neg. full, without na, spearman", {
470470
res <- corTestDS("x", "y", "spearman", NULL, 0.95)
471471

472472
expect_equal(class(res), "list")
473-
expect_length(res, 2)
473+
expect_length(res, 3)
474474

475475
expect_length(res$`Number of pairwise complete cases`, 1)
476476
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -516,7 +516,7 @@ test_that("simple corTestDS, some, spearman, without na, spearman", {
516516
res <- corTestDS("x", "y", "spearman", NULL, 0.95)
517517

518518
expect_equal(class(res), "list")
519-
expect_length(res, 2)
519+
expect_length(res, 3)
520520

521521
expect_length(res$`Number of pairwise complete cases`, 1)
522522
expect_equal(res$`Number of pairwise complete cases`, 8)
@@ -563,7 +563,7 @@ test_that("simple corTestDS, some, with na, spearman", {
563563
res <- corTestDS("x", "y", "spearman", NULL, 0.95)
564564

565565
expect_equal(class(res), "list")
566-
expect_length(res, 2)
566+
expect_length(res, 3)
567567

568568
expect_length(res$`Number of pairwise complete cases`, 1)
569569
expect_equal(res$`Number of pairwise complete cases`, 3)

‎tests/testthat/test-smk-covDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test_that("numeric covDS, casewise.complete", {
2727

2828
res <- covDS("input$v1", "input$v2", "casewise.complete")
2929

30-
expect_length(res, 5)
30+
expect_length(res, 6)
3131
expect_equal(class(res), "list")
3232

3333
res.sums.of.products.class <- class(res$sums.of.products)
@@ -130,7 +130,7 @@ test_that("numeric covDS, pairwise.complete", {
130130

131131
res <- covDS("input$v1", "input$v2", "pairwise.complete")
132132

133-
expect_length(res, 5)
133+
expect_length(res, 6)
134134
expect_equal(class(res), "list")
135135

136136
res.sums.of.products.class <- class(res$sums.of.products)

‎tests/testthat/test-smk-kurtosisDS1.R‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ test_that("simple kurtosisDS1, method 1", {
3333
expect_equal(res$Kurtosis, -0.458210, tolerance = 1e-6)
3434
expect_equal(class(res$Nvalid), "integer")
3535
expect_equal(res$Nvalid,9)
36-
expect_equal(class(res$ValidityMessage), "character")
37-
expect_equal(res$ValidityMessage, "VALID ANALYSIS")
36+
expect_equal(res$class, "numeric")
3837
})
3938

4039
# context("kurtosisDS1::smk::method 2")
@@ -49,8 +48,7 @@ test_that("simple kurtosisDS1, method 2", {
4948
expect_equal(res$Kurtosis, 0.270076, tolerance = 1e-6)
5049
expect_equal(class(res$Nvalid), "integer")
5150
expect_equal(res$Nvalid,9)
52-
expect_equal(class(res$ValidityMessage), "character")
53-
expect_equal(res$ValidityMessage, "VALID ANALYSIS")
51+
expect_equal(res$class, "numeric")
5452
})
5553

5654
# context("kurtosisDS1::smk::method 3")
@@ -65,8 +63,7 @@ test_that("simple kurtosisDS1, method 3", {
6563
expect_equal(res$Kurtosis, -0.991672, tolerance = 1e-6)
6664
expect_equal(class(res$Nvalid), "integer")
6765
expect_equal(res$Nvalid,9)
68-
expect_equal(class(res$ValidityMessage), "character")
69-
expect_equal(res$ValidityMessage, "VALID ANALYSIS")
66+
expect_equal(res$class, "numeric")
7067
})
7168

7269
test_that("kurtosisDS1 throws error when object does not exist", {

‎tests/testthat/test-smk-kurtosisDS2.R‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ test_that("simple kurtosisDS2", {
3636
expect_equal(res$Sum.squares, 3.25, tolerance = 1e-6)
3737
expect_equal(class(res$Nvalid), "integer")
3838
expect_equal(res$Nvalid, 5)
39-
expect_equal(class(res$ValidityMessage), "character")
40-
expect_equal(res$ValidityMessage, "VALID ANALYSIS")
39+
expect_equal(res$class, "numeric")
4140
})
4241

4342
test_that("kurtosisDS2 throws error when object does not exist", {

‎tests/testthat/test-smk-lengthDS.R‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,19 @@ test_that("simple lengthDS, numeric data.frame", {
2525

2626
res <- lengthDS("input")
2727

28-
expect_equal(class(res), "integer")
29-
expect_equal(res, 2)
28+
expect_equal(class(res), "list")
29+
expect_equal(res$length, 2)
30+
expect_equal(res$class, "data.frame")
3031
})
3132

3233
test_that("simple lengthDS, character data.frame", {
3334
input <- data.frame(v1 = c("0.0", "1.0", "2.0", "3.0", "4.0"), v2 = c("4.0", "3.0", "2.0", "1.0", "0.0"), stringsAsFactors = FALSE)
3435

3536
res <- lengthDS("input")
3637

37-
expect_equal(class(res), "integer")
38-
expect_equal(res, 2)
38+
expect_equal(class(res), "list")
39+
expect_equal(res$length, 2)
40+
expect_equal(res$class, "data.frame")
3941
})
4042

4143
# context("lengthDS::smk::vector")
@@ -44,17 +46,19 @@ test_that("simple lengthDS, numeric vector", {
4446

4547
res <- lengthDS("input")
4648

47-
expect_equal(class(res), "integer")
48-
expect_equal(res, 5)
49+
expect_equal(class(res), "list")
50+
expect_equal(res$length, 5)
51+
expect_equal(res$class, "numeric")
4952
})
5053

5154
test_that("simple lengthDS, character vector", {
5255
input <- c("0.0", "1.0", "2.0", "3.0", "4.0")
5356

5457
res <- lengthDS("input")
5558

56-
expect_equal(class(res), "integer")
57-
expect_equal(res, 5)
59+
expect_equal(class(res), "list")
60+
expect_equal(res$length, 5)
61+
expect_equal(res$class, "character")
5862
})
5963

6064
#

‎tests/testthat/test-smk-listDS.R‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121

2222
# context("listDS::smk::simple")
2323
test_that("simple listDS", {
24-
input <- list(v1 = c(1, 2, 3), v2 = c(4, 5, 6))
24+
v1 <- c(1, 2, 3)
25+
v2 <- c(4, 5, 6)
2526
eltnames <- c('n1', 'n2')
2627

27-
res <- listDS(input, eltnames)
28+
res <- listDS(c("v1", "v2"), eltnames)
2829

2930
expect_equal(class(res), "list")
3031
expect_length(res, 2)

‎tests/testthat/test-smk-meanDS.R‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ test_that("numeric meanDS", {
3737
expect_equal(res$Nvalid, 5)
3838
expect_equal(class(res$Ntotal), "integer")
3939
expect_equal(res$Ntotal, 5)
40-
expect_equal(class(res$ValidityMessage), "character")
41-
expect_equal(res$ValidityMessage, "VALID ANALYSIS")
40+
expect_equal(res$class, "numeric")
4241
})
4342

4443
# context("meanDS::smk::numeric with NA")
@@ -57,8 +56,7 @@ test_that("numeric meanDS, with NA", {
5756
expect_equal(res$Nvalid, 3)
5857
expect_equal(class(res$Ntotal), "integer")
5958
expect_equal(res$Ntotal, 5)
60-
expect_equal(class(res$ValidityMessage), "character")
61-
expect_equal(res$ValidityMessage, "VALID ANALYSIS")
59+
expect_equal(res$class, "numeric")
6260
})
6361

6462
# context("meanDS::smk::numeric with all NA")
@@ -77,8 +75,7 @@ test_that("numeric meanDS, with all NA", {
7775
expect_equal(res$Nvalid, 0)
7876
expect_equal(class(res$Ntotal), "integer")
7977
expect_equal(res$Ntotal, 5)
80-
expect_equal(class(res$ValidityMessage), "character")
81-
expect_equal(res$ValidityMessage, "VALID ANALYSIS")
78+
expect_equal(res$class, "numeric")
8279
})
8380

8481
test_that("meanDS throws error when object does not exist", {

‎tests/testthat/test-smk-numNaDS.R‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
test_that("simple numNaDS", {
2424
input <- c(NA, 1, NA, 2, NA)
2525

26-
res <- numNaDS(input)
26+
res <- numNaDS("input")
2727

28-
expect_equal(class(res), "integer")
29-
expect_length(res, 1)
30-
expect_equal(res, 3)
28+
expect_equal(class(res), "list")
29+
expect_equal(res$numNA, 3)
30+
expect_equal(res$class, "numeric")
3131
})
3232

3333
test_that("simple numNaDS", {
3434
input <- NA
3535

36-
res <- numNaDS(input)
36+
res <- numNaDS("input")
3737

38-
expect_equal(class(res), "integer")
39-
expect_length(res, 1)
40-
expect_equal(res, 1)
38+
expect_equal(class(res), "list")
39+
expect_equal(res$numNA, 1)
40+
expect_equal(res$class, "logical")
4141
})
4242

4343
#

0 commit comments

Comments
 (0)