Skip to content

V5.1 dev ds.seq tests #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OllyButters merged 7 commits into from
Oct 21, 2019
Merged

V5.1 dev ds.seq tests #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb95cec
Merge remote-tracking branch 'pb/master' into v5.1-dev
StuartWheater Oct 2, 2019
4da6f46
Merge remote-tracking branch 'upstream/v5.1-dev' into v5.1-dev
StuartWheater Oct 2, 2019
1806978
Update calls parameters
StuartWheater Oct 2, 2019
50a080e
Merge remote-tracking branch 'upstream/v5.1-dev' into v5.1-dev
StuartWheater Oct 11, 2019
0c1742a
Merge remote-tracking branch 'upstream/v5.1-dev' into v5.1-dev_ds.seq…
StuartWheater Oct 20, 2019
ff6e8e1
Refixed testObjectExists response processing, plus test update
StuartWheater Oct 20, 2019
9ef8a78
Second test
StuartWheater Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/ds.unList.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ for(j in 1:num.datasources){ #
if(!object.info[[j]]$test.obj.exists){ #
obj.name.exists.in.all.sources<-FALSE #
} #
if(object.info[[j]]$test.obj.class=="ABSENT"){ #
if(is.null(object.info[[j]]$test.obj.class) || object.info[[j]]$test.obj.class=="ABSENT"){ #
obj.non.null.in.all.sources<-FALSE #
} #
} #
Expand Down
14 changes: 11 additions & 3 deletions tests/testthat/test-smk-ds.seq.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,19 @@ connect.studies.dataset.cnsim(list("LAB_TSC"))

context("ds.seq::smk")
test_that("simplest ds.seq", {
seq.res <- ds.seq("1", "1", "10", "D$LAB_TSC", "obj")
seq.res <- ds.seq(FROM.value.char="1", BY.value.char="1", LENGTH.OUT.value.char="10", ALONG.WITH.name=NULL, newobj="obj1")

expect_true(length(seq.res) == 2)
expect_equal(seq.res[[1]], "A data object <obj> has been created in all specified data sources")
expect_equal(seq.res[[2]], "<obj> appears valid in all sources")
expect_equal(seq.res[[1]], "A data object <obj1> has been created in all specified data sources")
expect_equal(seq.res[[2]], "<obj1> appears valid in all sources")
})

test_that("simplest ds.seq", {
seq.res <- ds.seq(FROM.value.char="1", BY.value.char="1", LENGTH.OUT.value.char=NULL, ALONG.WITH.name="D$LAB_TSC", newobj="obj2")

expect_true(length(seq.res) == 2)
expect_equal(seq.res[[1]], "A data object <obj2> has been created in all specified data sources")
expect_equal(seq.res[[2]], "<obj2> appears valid in all sources")
})

#
Expand Down
26 changes: 17 additions & 9 deletions tests/testthat/test-smk-ds.unList.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,24 @@ test_that("simple test", {

res <- ds.unList("D$GENDER.list")

expect_length(res, 2)
expect_equal(res$is.object.created, "A data object <D$GENDER.list.unlist> has been created in all specified data sources")
expect_equal(res$validity.check, "<D$GENDER.list.unlist> appears valid in all sources")
})

context("ds.unList::smk::simple test")
test_that("simple test", {
ds.asList(x.name="D$GENDER", newobj="GENDER.list")

res <- ds.unList("GENDER.list")

expect_length(res, 3)
expect_length(res$sim1, 2)
expect_equal(res$sim1$return.message, "New object <D$GENDER.list.unlist> created")
expect_equal(res$sim1$class.of.newobj, "Class of <D$GENDER.list.unlist> is 'factor'")
expect_length(res$sim2, 2)
expect_equal(res$sim2$return.message, "New object <D$GENDER.list.unlist> created")
expect_equal(res$sim2$class.of.newobj, "Class of <D$GENDER.list.unlist> is 'factor'")
expect_length(res$sim3, 2)
expect_equal(res$sim3$return.message, "New object <D$GENDER.list.unlist> created")
expect_equal(res$sim3$class.of.newobj, "Class of <D$GENDER.list.unlist> is 'factor'")
expect_equal(res$is.object.created, "A data object <GENDER.list.unlist> has been created in all specified data sources")
expect_equal(res$validity.check, "<GENDER.list.unlist> invalid in at least one source. See studyside.messages:")
expect_length(res$studyside.messages, 3)
expect_equal(res$studyside.messages$sim1, "Outcome object is a list without names. So a studysideMessage may be hidden. Please check output is OK")
expect_equal(res$studyside.messages$sim2, "Outcome object is a list without names. So a studysideMessage may be hidden. Please check output is OK")
expect_equal(res$studyside.messages$sim3, "Outcome object is a list without names. So a studysideMessage may be hidden. Please check output is OK")
})

#
Expand Down