Skip to content

Commit 58d0357

Browse files
authored
Merge pull request #67 from Boehringer-Ingelheim/357288-review-empty-datasets
357288 review empty datasets
2 parents dc9dc3c + bbfcdb3 commit 58d0357

6 files changed

Lines changed: 9 additions & 7 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: dv.listings
22
Type: Package
33
Title: Data listings module
4-
Version: 4.3.4-9001
4+
Version: 4.3.4-9002
55
Authors@R:
66
c(
77
person("Boehringer-Ingelheim Pharma GmbH & Co.KG", role = c("cph", "fnd")),

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# dv.listings 4.3.4-9002
2+
- Review functionality:
3+
- Cope with initially empty datasets
4+
15
# dv.listings 4.3.4-9001
26
- Review functionality:
37
- Allow expanding review choices

R/review.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ REV_load_annotation_info <- function(folder_contents, review, dataset_lists) {
451451
function(indices) df_map_st[indices]
452452
})
453453

454-
dataset_review_df[["timestamp"]] <- base_timestamp
454+
dataset_review_df[["timestamp"]] <- rep(base_timestamp, nrow(dataset_review_df)) # rep for `nrow(...) == 0`
455455
dataset_review_df[["data_timestamps"]] <- map_canonical_data_into_current_order(data_timestamps_st)
456456

457457
# <domain>_<ROLE>.review

R/review_structures.R

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,6 @@ RS_compute_id_hashes <- function(df, id_vars) {
188188
RS_compute_base_memory <- function(df_id, df, id_vars, tracked_vars) {
189189
checkmate::assert_string(df_id, min.chars = 1, max.chars = 65535)
190190
checkmate::assert_data_frame(df)
191-
192-
; if (nrow(df) == 0) return(simpleCondition("Refusing to review 0-row dataset"))
193191

194192
id_vars <- sort(id_vars)
195193
tracked_vars <- sort(tracked_vars)

inst/validation/specs.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ review <- specs_list(
3131
, review_per_row = "review feature offers per-row reviews"
3232
, review_per_role = "review feature offers per-role reviews"
3333
, review_delta_detection = "review feature detects changes in tracked variables across dataset updates"
34-
, review_reject_empty_dataset = "review feature refuses to review empty datasets"
34+
, review_accept_empty_dataset = "review feature copes with empty datasets"
3535
, review_hash_no_false_negatives = "review hash function catches all cell changes up to four changes per row"
3636
, review_change_attribution = "review hash function changes can be attributed to specific modified cells"
3737
, review_reject_removal_of_rows_by_default = "review feature flags the removal of previously known rows"

tests/testthat/test-review.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ local({
5353
})
5454

5555
test_that("Review routines produce a descriptive error when asked to review an empty dataset" |>
56-
vdoc[["add_spec"]](specs$review_reject_empty_dataset), {
56+
vdoc[["add_spec"]](specs$review_accept_empty_dataset), {
5757
dataset_lists <- list(
5858
dataset_list = list(
5959
ae = head(safetyData::sdtm_ae, 0)
6060
)
6161
)
6262
info <- REV_load_annotation_info(folder_contents = NULL, review, dataset_lists)
63-
expect_equal(info[["error"]], "Refusing to review 0-row dataset")
63+
expect_length(info[["error"]], 0)
6464
})
6565

6666
test_that("Review routines cope with 1-row datasets", {

0 commit comments

Comments
 (0)