Skip to content

Commit fddb989

Browse files
StuartWheaterStuartWheater
committed
Extended to include '1D' and skipped '3D'
1 parent dcaed04 commit fddb989

1 file changed

Lines changed: 104 additions & 42 deletions

File tree

‎tests/testthat/test-smk-ds.table.R‎

Lines changed: 104 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,40 @@ test_that("setup", {
2323
# Tests
2424
#
2525

26-
context("ds.table::smk")
27-
test_that("simple table", {
28-
ds.asFactor(input.var.name="D$FACTOR_CHARACTER", newobj.name="factorCharacter1")
29-
ds.asFactor(input.var.name="D$FACTOR_INTEGER", newobj.name="factorInteger1")
30-
31-
myvectors <- c('factorInteger1', 'factorCharacter1')
32-
res1 <- ds.dataFrame(x=myvectors, newobj="tablesource1")
33-
subset.res <- ds.dataFrameSubset(df.name="tablesource1", V1.name="factorInteger1", V2.name='6', Boolean.operator="!=", newobj="tablesource_subset1")
26+
context("ds.table::smk dataframe setup")
27+
test_that("simple table 2D", {
28+
ds.asFactor(input.var.name="D$FACTOR_CHARACTER", newobj.name="factorCharacter")
29+
ds.asFactor(input.var.name="D$FACTOR_INTEGER", newobj.name="factorInteger")
30+
ds.asFactor(input.var.name="D$CATEGORY", newobj.name="factorCategory")
31+
32+
myvectors <- c('factorInteger', 'factorCharacter', "factorCategory")
33+
res1 <- ds.dataFrame(x=myvectors, newobj="tablesource")
34+
subset.res <- ds.dataFrameSubset(df.name="tablesource", V1.name="factorInteger", V2.name='6', Boolean.operator="!=", newobj="tablesource_subset")
3435

3536
expect_length(subset.res, 2)
36-
expect_equal(subset.res$is.object.created, "A data object <tablesource_subset1> has been created in all specified data sources")
37-
expect_equal(subset.res$validity.check, "<tablesource_subset1> appears valid in all sources")
38-
39-
table1.res <- ds.table(rvar='tablesource_subset1$factorInteger1', cvar='tablesource_subset1$factorCharacter1', newobj="new_table1")
40-
37+
expect_equal(subset.res$is.object.created, "A data object <tablesource_subset> has been created in all specified data sources")
38+
expect_equal(subset.res$validity.check, "<tablesource_subset> appears valid in all sources")
39+
})
40+
41+
context("ds.table::smk")
42+
test_that("simple table 1D", {
43+
table1.res <- ds.table(rvar='tablesource_subset$factorCharacter')
44+
45+
expect_length(table1.res, 2)
46+
expect_length(table1.res$output.list, 5)
47+
expect_equal(class(table1.res$output.list[1]), "list")
48+
expect_equal(class(table1.res$output.list[2]), "list")
49+
expect_equal(class(table1.res$output.list[3]), "list")
50+
expect_equal(class(table1.res$output.list[4]), "list")
51+
expect_equal(class(table1.res$output.list[5]), "list")
52+
expect_length(table1.res$validity.message, 1)
53+
expect_equal(table1.res$validity.message, "Data in all studies were valid")
54+
})
55+
56+
context("ds.table::smk")
57+
test_that("simple table 2D", {
58+
table1.res <- ds.table(rvar='tablesource_subset$factorInteger', cvar='tablesource_subset$factorCharacter')
59+
4160
expect_length(table1.res, 2)
4261
expect_length(table1.res$output.list, 12)
4362
expect_equal(class(table1.res$output.list[1]), "list")
@@ -56,34 +75,77 @@ test_that("simple table", {
5675
expect_equal(table1.res$validity.message, "Data in all studies were valid")
5776
})
5877

59-
test_that("simple table, with assign", {
60-
ds.asFactor(input.var.name="D$FACTOR_CHARACTER", newobj.name="factorCharacter2")
61-
ds.asFactor(input.var.name="D$FACTOR_INTEGER", newobj.name="factorInteger2")
62-
63-
myvectors <- c('factorInteger2', 'factorCharacter2')
64-
res <- ds.dataFrame(x=myvectors, newobj="tablesource2")
65-
subset.res <- ds.dataFrameSubset(df.name="tablesource2", V1.name="factorInteger2", V2.name='6', Boolean.operator="!=", newobj="tablesource_subset2")
66-
67-
expect_length(subset.res, 2)
68-
expect_equal(subset.res$is.object.created, "A data object <tablesource_subset2> has been created in all specified data sources")
69-
expect_equal(subset.res$validity.check, "<tablesource_subset2> appears valid in all sources")
70-
71-
table2.res <- ds.table(rvar='tablesource_subset2$factorInteger2', cvar='tablesource_subset2$factorCharacter2', newobj="new_table2", table.assign=TRUE)
72-
73-
expect_length(table2.res, 0)
74-
75-
table2.length <- ds.length("new_table2")
76-
expect_length(table2.length, 4)
77-
expect_equal(table2.length$`length of new_table2 in study1`, 4)
78-
expect_equal(table2.length$`length of new_table2 in study2`, 4)
79-
expect_equal(table2.length$`length of new_table2 in study3`, 4)
80-
expect_equal(table2.length$`total length of new_table2 in all studies combined`, 12)
81-
82-
table2.class <- ds.class("new_table2")
83-
expect_length(table2.class, 3)
84-
expect_equal(table2.class$study1, 'list')
85-
expect_equal(table2.class$study2, 'list')
86-
expect_equal(table2.class$study3, 'list')
78+
context("ds.table::smk")
79+
test_that("simple table 3D", {
80+
# table1.res <- ds.table(rvar='tablesource_subset$factorInteger', cvar='tablesource_subset$factorCharacter', stvar='tablesource_subset$factorCategory')
81+
82+
# expect_length(table1.res, 2)
83+
# expect_length(table1.res$output.list, 6)
84+
# expect_equal(class(table1.res$output.list[1]), "list")
85+
# expect_equal(class(table1.res$output.list[2]), "list")
86+
# expect_equal(class(table1.res$output.list[3]), "list")
87+
# expect_equal(class(table1.res$output.list[4]), "list")
88+
# expect_equal(class(table1.res$output.list[5]), "list")
89+
# expect_equal(class(table1.res$output.list[6]), "list")
90+
# expect_length(table1.res$validity.message, 1)
91+
# expect_equal(table1.res$validity.message, "Data in all studies were valid")
92+
})
93+
94+
test_that("simple table 1D, with assign", {
95+
table.res <- ds.table(rvar='tablesource_subset$factorInteger', newobj="new_table1", table.assign=TRUE)
96+
97+
expect_length(table.res, 0)
98+
99+
table.length <- ds.length("new_table1")
100+
expect_length(table.length, 4)
101+
expect_equal(table.length$`length of new_table1 in study1`, 4)
102+
expect_equal(table.length$`length of new_table1 in study2`, 4)
103+
expect_equal(table.length$`length of new_table1 in study3`, 4)
104+
expect_equal(table.length$`total length of new_table1 in all studies combined`, 12)
105+
106+
table.class <- ds.class("new_table1")
107+
expect_length(table.class, 3)
108+
expect_equal(table.class$study1, 'list')
109+
expect_equal(table.class$study2, 'list')
110+
expect_equal(table.class$study3, 'list')
111+
})
112+
113+
test_that("simple table 2D, with assign", {
114+
table.res <- ds.table(rvar='tablesource_subset$factorInteger', cvar='tablesource_subset$factorCharacter', newobj="new_table2", table.assign=TRUE)
115+
116+
expect_length(table.res, 0)
117+
118+
table.length <- ds.length("new_table2")
119+
expect_length(table.length, 4)
120+
expect_equal(table.length$`length of new_table2 in study1`, 4)
121+
expect_equal(table.length$`length of new_table2 in study2`, 4)
122+
expect_equal(table.length$`length of new_table2 in study3`, 4)
123+
expect_equal(table.length$`total length of new_table2 in all studies combined`, 12)
124+
125+
table.class <- ds.class("new_table2")
126+
expect_length(table.class, 3)
127+
expect_equal(table.class$study1, 'list')
128+
expect_equal(table.class$study2, 'list')
129+
expect_equal(table.class$study3, 'list')
130+
})
131+
132+
test_that("simple table 3D, with assign", {
133+
# table.res <- ds.table(rvar='tablesource_subset$factorInteger', cvar='tablesource_subset$factorCharacter', stvar='tablesource_subset$factorCategory', newobj="new_table3", table.assign=TRUE)
134+
135+
# expect_length(table.res, 0)
136+
137+
# table.length <- ds.length("new_table3")
138+
# expect_length(table.length, 4)
139+
# expect_equal(table.length$`length of new_table2 in study1`, 4)
140+
# expect_equal(table.length$`length of new_table2 in study2`, 4)
141+
# expect_equal(table.length$`length of new_table2 in study3`, 4)
142+
# expect_equal(table.length$`total length of new_table2 in all studies combined`, 12)
143+
144+
# table.class <- ds.class("new_table3")
145+
# expect_length(table.class, 3)
146+
# expect_equal(table.class$study1, 'list')
147+
# expect_equal(table.class$study2, 'list')
148+
# expect_equal(table.class$study3, 'list')
87149
})
88150

89151
#
@@ -93,7 +155,7 @@ test_that("simple table, with assign", {
93155
context("ds.table::smk::shutdown")
94156

95157
test_that("shutdown", {
96-
ds_expect_variables(c("D", "factorCharacter1", "factorCharacter2", "factorInteger1", "factorInteger2", "new_table2", "tablesource1", "tablesource2", "tablesource_subset1", "tablesource_subset2"))
158+
ds_expect_variables(c("D", "factorCharacter", "factorInteger", "factorCategory", "tablesource", "tablesource_subset", "new_table1", "new_table2"))
97159
})
98160

99161
disconnect.all.datasets()

0 commit comments

Comments
 (0)