Skip to content

Commit 10dd6a3

Browse files
committed
add expect_jlequal
1 parent df95df8 commit 10dd6a3

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

NAMESPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export(
2626
rand, jl_set.seed,
2727
## extra
2828
rexpr2jlexpr,
29-
jlvalue_capture_display # useful for testthat
29+
expect_jlequal # useful for testthat
3030
)
3131

3232
S3method(print,jlvalue)

R/jl_utils.R

+3-1
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,6 @@ jldisplay <- function(jlval) invisible(jltrycall("display",jlval))
5656

5757
"%<:%" <- function(a, b) {args <- jl4R:::jl_rexprs2(substitute(list(a,b)), parent_envir=parent.frame());jl(`<:`)(args[[1]],args[[2]])}
5858

59-
"%isa%" <- function(a, b) {args <- jl4R:::jl_rexprs2(substitute(list(a,b)), parent_envir=parent.frame());jl(isa)(args[[1]],args[[2]])}
59+
"%isa%" <- function(a, b) {args <- jl4R:::jl_rexprs2(substitute(list(a,b)), parent_envir=parent.frame());jl(isa)(args[[1]],args[[2]])}
60+
61+
expect_jlequal <- function(jlval, res, ...) expect_equal(jl4R:::jlvalue_capture_display(jlval), paste0(res, "\n"), ...)

tests/testthat/test-eval.R

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
test_that("jl eval int64", {
2-
expect_equal(jlvalue_capture_display(jl(`2 * 2`)), "4\n")
2+
expect_jlequal(jl(`2 * 2`), "4")
33
})
44

55
test_that("jl eval string", {
6-
expect_equal(jlvalue_capture_display(jl(`"2 * 2"`)), '"2 * 2"\n')
6+
expect_jlequal(jl(`"2 * 2"`), '"2 * 2"')
77
})
88

99
test_that("jl eval symbol", {
10-
expect_equal(jlvalue_capture_display(jlsymbol("toto")), ":toto\n")
10+
expect_jlequal(jlsymbol("toto"), ":toto")
1111
})

0 commit comments

Comments
 (0)