Skip to content

Commit 2283999

Browse files
committed
[188037693]: fix tests
1 parent 4dc7ea0 commit 2283999

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

R/as-data-frame.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ csvColInfo <- function(ds, verbose = TRUE) {
161161
if (any(msg_rows)) {
162162
alias_info <- paste0(out$orig_alias[msg_rows], " -> ", out$cond_qualified_alias[msg_rows])
163163
message(
164-
"Some column names are qualified because there were duplicate aliases ",
165-
"in dataset: ", paste0(alias_info, collapse = ", ")
164+
"Some column names are qualified because there were duplicate aliases",
165+
"in dataset:\n", paste0(alias_info, collapse = ", ")
166166
)
167167
}
168168
}

tests/testthat/test-as-data-frame.R

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,20 @@ with_test_authentication({
391391
mrds <- mrdf.setup(newDataset(mrdf, name = "test-mrdfmr"), selections = "1.0")
392392
mrds$MR2 <- deriveArray(
393393
list(
394-
VarDef(ds$MR$mr_1, name = "dup mr_1", alias = "mr_1"),
395-
VarDef(ds$MR$mr_2, name = "dup v4", alias = "v4")
394+
VarDef(mrds$MR$mr_1, name = "dup mr_1", alias = "mr_1"),
395+
VarDef(mrds$MR$mr_2, name = "dup v4", alias = "v4")
396396
),
397-
name = "MR 2"
397+
name = "MR 2", numeric = FALSE
398398
)
399-
mrds_df <- as.data.frame(mrds, force = TRUE)
400-
expect_equal(ncol(mrds_df), 4)
399+
expect_message(
400+
mrds_df <- as.data.frame(mrds, force = TRUE),
401+
paste0(
402+
"Some column names are qualified because there were duplicate aliases ",
403+
"in dataset:\nmr_1 -> MR[mr_1], mr_1 -> MR2[mr_1], v4 -> MR2[v4]"
404+
)
405+
)
406+
407+
expect_equal(ncol(mrds_df), 6)
401408
expect_equal(names(mrds_df), c("MR[mr_1]", "mr_2", "mr_3", "v4", "MR2[mr_1]", "MR2[v4]"))
402409
expect_equal(mrds_df[["MR[mr_1]"]], as.vector(mrds$MR$mr_1))
403410
expect_equal(mrds_df$mr_2, as.vector(mrds$MR$mr_2))

0 commit comments

Comments
 (0)