Skip to content

Commit 21ec527

Browse files
committed
tinytest step twelve+: brown-bag fix to robject
1 parent 4d884d0 commit 21ec527

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

inst/tinytest/test_robject.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
if (!.runThisTest) exit_file("Skipping, set 'RunAllRcppTests=yes' to run.")
2222

2323
library(Rcpp)
24-
sourceCpp("cpp/RObject")
24+
sourceCpp("cpp/RObject.cpp")
2525

2626
# test.RObject.asDouble <- function(){
2727
expect_equal( asDouble(2.123), 4.246, info = "as<double>( REALSXP ) " )
@@ -108,7 +108,6 @@ expect_equal( asStdVectorBool(x=c(1.0, 0.0)), c(FALSE, TRUE), info = "as< std::v
108108
expect_equal( asStdVectorBool(x=as.raw(c(1,0))), c(FALSE, TRUE), info = "as< std::vector<bool> >(raw)" )
109109
expect_error( asStdVectorBool("foo"), info = "as< std::vector<bool> >(character) -> exception" )
110110
expect_error( asStdVectorBool(NULL), info = "as< std::vector<bool> >(NULL) -> exception" )
111-
}
112111

113112
# test.RObject.asStdVectorString <- function(){
114113
expect_equal( asStdVectorString(c("foo", "bar")), c("foofoo", "barbar"), info = "as< std::vector<std::string> >(character)" )
@@ -153,7 +152,8 @@ expect_true( !isNULL(1L), info = "RObject.isNULL(integer) -> false" )
153152
expect_true( !isNULL(1.0), info = "RObject.isNULL(numeric) -> false" )
154153
expect_true( !isNULL(as.raw(1)), info = "RObject.isNULL(raw) -> false" )
155154
expect_true( !isNULL(letters), info = "RObject.isNULL(character) -> false")
156-
expect_true( !isNULL(test.RObject.isNULL), info = "RObject.isNULL(function) -> false" )
155+
#expect_true( !isNULL(test.RObject.isNULL), info = "RObject.isNULL(function) -> false" )
156+
expect_true( !isNULL(base::ls), info = "RObject.isNULL(function) -> false" )
157157
expect_true( !isNULL(.GlobalEnv), info = "RObject.isNULL(environment) -> false" )
158158
expect_true( isNULL(NULL), info = "RObject.isNULL(NULL) -> true" )
159159

0 commit comments

Comments
 (0)