Skip to content

Commit

Permalink
Improve tests: ru_setup for shared settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@florianm
florianm committed Mar 11, 2024
1 parent 89c28fc commit a10becb
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 74 deletions.
49 changes: 20 additions & 29 deletions tests/testthat/test-dataset_detail.R
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
test_that("dataset_detail works", {

ds <- dataset_list(pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = get_test_odkc_version())
ru_setup(
pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = get_test_odkc_version()
)

ds1 <- dataset_detail(pid = get_default_pid(),
did = ds$name[1],
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = get_test_odkc_version())
ds <- dataset_list()
did <- ds$name[1]

ds1 <- dataset_detail(did = did)

# dataset_detail returns a list
testthat::expect_is(ds1, "list")
Expand All @@ -35,30 +35,21 @@ test_that("dataset_detail warns if odkc_version too low", {
message = "Test server not configured"
)

ds <- dataset_list(pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "2022.3")

ds1 <- dataset_detail(
pid = get_test_pid(),
did = ds$name[1],
ru_setup(
pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "2022.3"
odkc_version = get_test_odkc_version()
)

ds <- dataset_list()
did <- ds$name[1]

ds1 <- dataset_detail(did = did)

testthat::expect_warning(
ds1 <- dataset_detail(
pid = get_test_pid(),
did = ds$name[1],
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "1.5.3"
)
ds1 <- dataset_detail(did = did, odkc_version = "1.5.3")
)

})
25 changes: 13 additions & 12 deletions tests/testthat/test-dataset_list.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ test_that("dataset_list works", {
message = "Test server not configured"
)

ds <- dataset_list(
get_test_pid(),
ru_setup(
pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = get_test_odkc_version()
)

ds <- dataset_list()
testthat::expect_true(nrow(ds) > 0)
testthat::expect_true("name" %in% names(ds))

Expand All @@ -35,22 +37,21 @@ test_that("dataset_list warns if odkc_version too low", {
message = "Test server not configured"
)

ds <- dataset_list(
get_test_pid(),
ru_setup(
pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "2022.3"
odkc_version = get_test_odkc_version()
)

ds <- dataset_list()
did <- ds$name[1]

ds1 <- dataset_list()

testthat::expect_warning(
ds <- dataset_list(
get_test_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "1.5.3"
)
ds1 <- dataset_list(odkc_version = "1.5.3")
)

})
53 changes: 20 additions & 33 deletions tests/testthat/test-dataset_update.R
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
test_that("dataset_update works", {

ru_setup(
pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = get_test_odkc_version()
)

ds <- dataset_list(pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = get_test_odkc_version())
ds <- dataset_list()

ds1 <- dataset_detail(pid = get_default_pid(),
did = ds$name[1],
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = get_test_odkc_version())
ds1 <- dataset_detail(did = ds$name[1])

pid <- get_default_pid()
did <- ds$name[1]

# Update dataset with opposite approvalRequired
ds2 <- dataset_update(pid = pid, did = did, approval_required=!ds1$approvalRequired)
ds2 <- dataset_update(did = did, approval_required=!ds1$approvalRequired)
testthat::expect_false(ds1$approvalRequired == ds2$approvalRequired)

# Update dataset with opposite approvalRequired again
ds3 <- dataset_update(pid = pid, did = did, approval_required=!ds2$approvalRequired)
ds3 <- dataset_update(did = did, approval_required=!ds2$approvalRequired)
testthat::expect_false(ds2$approvalRequired == ds3$approvalRequired)
testthat::expect_true(ds1$approvalRequired == ds3$approvalRequired)
})
Expand All @@ -32,31 +29,21 @@ test_that("dataset_update warns if odkc_version too low", {
skip_if(Sys.getenv("ODKC_TEST_URL") == "",
message = "Test server not configured"
)

ds <- dataset_list(pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "2022.3")

ds1 <- dataset_update(
pid = get_test_pid(),
did = ds$name[1],
ru_setup(
pid = get_default_pid(),
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "2022.3"
odkc_version = get_test_odkc_version()
)

ds <- dataset_list()
did <- ds$name[1]

ds1 <- dataset_update(did = did)

testthat::expect_warning(
ds1 <- dataset_update(
pid = get_test_pid(),
did = ds$name[1],
url = get_test_url(),
un = get_test_un(),
pw = get_test_pw(),
odkc_version = "1.5.3"
)
ds1 <- dataset_update(did = did, odkc_version = "1.5.3")
)

})

0 comments on commit a10becb

Please sign in to comment.