Skip to content

Commit 043414a

Browse files
committed
fix warning messages for skipped objects
1 parent 39363c6 commit 043414a

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

R/qenv-extract.R

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,21 @@
2222
names_warn <- setdiff(names, possible_names)
2323
names <- intersect(names, possible_names)
2424
if (!length(names)) {
25-
warning("None of `names` elements exist in `qenv`. Returning empty `qenv`.")
25+
warning(
26+
sprintf(
27+
"None of 'names' elements exist in '%s'. Returning empty '%s'.",
28+
class(x)[1],
29+
class(x)[1]
30+
)
31+
)
2632
return(qenv())
2733
}
2834

2935
if (length(names_warn)) {
3036
warning(
3137
sprintf(
32-
"Some elements of `names` do not exist in `qenv`. Skipping those: %s.",
38+
"Some elements of 'names' do not exist in '%s'. Skipping those: %s.",
39+
class(x)[1],
3340
paste(names_warn, collapse = ", ")
3441
)
3542
)

tests/testthat/test-qenv_extract.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ testthat::test_that("`[.` returns empty qenv for names not in qenv", {
66
})
77
testthat::expect_warning(
88
testthat::expect_equal(data["y"], qenv()),
9-
"None of `names` elements exist in `qenv`. Returning empty `qenv`."
9+
"None of 'names' elements exist in 'qenv'. Returning empty 'qenv'."
1010
)
1111
})
1212

@@ -17,7 +17,7 @@ testthat::test_that("`[.` returns limited qenv for some names not in qenv", {
1717
})
1818
testthat::expect_warning(
1919
testthat::expect_equal(data[c("y", "a")], data["a"]),
20-
"Some elements of `names` do not exist in `qenv`. Skipping those: y."
20+
"Some elements of 'names' do not exist in 'qenv'. Skipping those: y."
2121
)
2222
})
2323

0 commit comments

Comments
 (0)