Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 62 additions & 2 deletions R/run.R
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ runAnalysis <- function(name, dataset = NULL, options, view = TRUE, quiet = FALS
stop("Please supply an analysis name")
}

if (insideTestEnvironment()) {
testing <- insideTestEnvironment()
if (testing) {
view <- FALSE
quiet <- TRUE
}
Expand All @@ -83,6 +84,11 @@ runAnalysis <- function(name, dataset = NULL, options, view = TRUE, quiet = FALS
Sys.setenv(LANGUAGE = oldLanguage)
}, add = TRUE)

if (testing) {
restorePlotRendering <- useFastTestPlotImages()
on.exit(restorePlotRendering(), add = TRUE)
}

initAnalysisRuntime(dataset = dataset, options = options, makeTests = makeTests, encodedDataset = encodedDataset)
args <- fetchRunArgs(name, options)

Expand All @@ -106,7 +112,7 @@ runAnalysis <- function(name, dataset = NULL, options, view = TRUE, quiet = FALS

results <- processJsonResults(jsonResults)

if (insideTestEnvironment())
if (testing)
.setInternal("lastResults", jsonResults)

if (view)
Expand All @@ -118,6 +124,60 @@ runAnalysis <- function(name, dataset = NULL, options, view = TRUE, quiet = FALS
return(invisible(results))
}

useFastTestPlotImages <- function() {
noop <- function() invisible(FALSE)

if (isFALSE(getOption("jaspTools.test.skipPlotRendering", TRUE)))
return(noop)

ns <- asNamespace("jaspBase")
fnName <- "writeImageJaspResults"
if (!exists(fnName, envir = ns, inherits = FALSE))
return(noop)

original <- get(fnName, envir = ns)
if (isTRUE(attr(original, "jaspToolsFastTestPlotImages")))
return(noop)

fastWriteImageJaspResults <- function(plot, width = 320, height = 320, obj = TRUE,
relativePathpng = NULL, relativePathJson = NULL,
ppi = 300, backgroundColor = "white",
location = jaspBase:::getImageLocation(),
oldPlotInfo = list()) {
if (is.null(relativePathpng))
relativePathpng <- location$relativePath

image <- list(
png = relativePathpng,
editOptions = "{}",
interactive = FALSE
)

if (isTRUE(obj)) {
decodePlot <- get0(".decodeJaspPlotObject", envir = ns, inherits = FALSE)
image[["obj"]] <- if (is.function(decodePlot)) {
decodePlot(plot, returnGrob = FALSE)
} else {
plot
}
}

image
}
attr(fastWriteImageJaspResults, "jaspToolsFastTestPlotImages") <- TRUE

unlockBinding(fnName, ns)
assign(fnName, fastWriteImageJaspResults, envir = ns)
lockBinding(fnName, ns)

function() {
unlockBinding(fnName, ns)
assign(fnName, original, envir = ns)
lockBinding(fnName, ns)
invisible(TRUE)
}
}

fetchRunArgs <- function(name, options) {
possibleArgs <- list(
name = name,
Expand Down
Loading
Loading