Skip to content

Commit cea81ed

Browse files
TESTME: modernize
1 parent 2faa068 commit cea81ed

3 files changed

Lines changed: 336 additions & 217 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: future.callr
2-
Version: 0.10.2-9000
2+
Version: 0.10.2-9002
33
Depends:
44
R (>= 3.4.0),
55
future (>= 1.58.0)

inst/testme/deploy.R

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ if (!utils::file_test("-f", desc)) {
2121
}
2222
pkgname <- read.dcf(desc)[, "Package"]
2323
if (is.na(pkgname) || !nzchar(pkgname)) {
24-
stop("Failed to infer package name from 'DESCRIPTION' file: ", sQuote(pkgname))
24+
stop(
25+
"Failed to infer package name from 'DESCRIPTION' file: ",
26+
sQuote(pkgname)
27+
)
2528
} else if (!requireNamespace(pkgname)) {
2629
stop("Package fail to load: ", sQuote(pkgname))
2730
}
@@ -35,7 +38,10 @@ code <- c(
3538
"## This runs 'testme' test inst/testme/test-<name>.R scripts",
3639
"## Don't edit - it was autogenerated by inst/testme/deploy.R",
3740
"testme <- function(name) {",
38-
sprintf(" path <- system.file(package = '%s', 'testme', mustWork = TRUE)", pkgname),
41+
sprintf(
42+
" path <- system.file(package = '%s', 'testme', mustWork = TRUE)",
43+
pkgname
44+
),
3945
" Sys.setenv(R_TESTME_PATH = path)",
4046
sprintf(" Sys.setenv(R_TESTME_PACKAGE = '%s')", pkgname),
4147
" Sys.setenv(R_TESTME_NAME = name)",
@@ -51,8 +57,13 @@ for (kk in seq_along(files)) {
5157
source_file <- basename(file)
5258
name <- sub("^test-", "", sub("[.]R$", "", source_file))
5359
target_file <- file.path(target, source_file)
54-
55-
message(sprintf("%02d/%02d test script %s", kk, length(files), sQuote(target_file)))
60+
61+
message(sprintf(
62+
"%02d/%02d test script %s",
63+
kk,
64+
length(files),
65+
sQuote(target_file)
66+
))
5667

5768
## Assert that testme script can be parsed
5869
res <- tryCatch(parse(file = file), error = identity)

0 commit comments

Comments
 (0)