post_exercise_code

NAMESPACE

@@ -51,7 +51,8 @@ export(check_that)
 export(check_wd)
 export(check_while)
 export(ex)
-export(execute_code)
+export(execute_solution)
+export(execute_student)
 export(get_solution_code)
 export(get_solution_env)
 export(get_student_code)

R/utils.R

@@ -13,19 +13,25 @@ check_sufficient <- function(calls, index, name) {
   }
 }
 
+#' @importFrom magrittr %>%
+#' @param code The code to execute
+#'
 #' @export
-execute_code <- function(code, stud_env = TRUE, sol_env = TRUE) {
-  if (stud_env) {
-    eval(substitute(code), envir = get_student_env())
-  }
-  if (sol_env) {
-    eval(substitute(code), envir = get_solution_env())
-  }
+magrittr::`%>%`
+
+# Execute code in the student environment
+#' @export
+execute_student <- function(code) {
+  try(eval(substitute(code), envir = get_student_env()))
 }
 
-#' @importFrom magrittr %>%
+#' Execute code in the solution environment
+#' @param code The code to execute
+#'
 #' @export
-magrittr::`%>%`
+execute_solution <- function(code) {
+  try(eval(substitute(code), envir = get_solution_env()))
+}
 
 #' Get solution environment (backwards comp)
 #' @export

tests/testthat/test-utils.R

@@ -30,24 +30,47 @@ test_that("accessor works", {
 
 
 test_that("check_output - basic", {
+  # Student envrionment manipulation
   lst <- list()
   lst$DC_ECHO <- TRUE
   lst$DC_SOLUTION <- "x <- 5"
-  lst$DC_SCT <- "tryCatch(test_object('x'), finally = execute_code(rm(x)))"
+  lst$DC_SCT <- "tryCatch(test_object('x'), finally = execute_student(rm(x)))"
 
   # correct answer
   lst$DC_CODE <- "x <- 5"
   output <- test_it(lst)
   passes(output)
   # should be cleaned up
-  expect_equal(length(ls(envir = RBackend:::dc$get("sol_env"))), 0)
   expect_equal(length(ls(envir = .GlobalEnv)), 0)
+  expect_equal(length(ls(envir = RBackend:::dc$get("sol_env"))), 1)
 
   # incorrect answer
   lst$DC_CODE <- "x <- 7"
   output <- test_it(lst)
   fails(output)
   # should also be cleaned up
-  expect_equal(length(ls(envir = RBackend:::dc$get("sol_env"))), 0)
   expect_equal(length(ls(envir = .GlobalEnv)), 0)
+  expect_equal(length(ls(envir = RBackend:::dc$get("sol_env"))), 1)
+
+  # Solution envrionment manipulation
+  lst <- list()
+  lst$DC_ECHO <- TRUE
+  lst$DC_SOLUTION <- "x <- 5"
+  lst$DC_SCT <- "tryCatch(test_object('x'), finally = execute_solution(rm(x)))"
+
+  # correct answer
+  lst$DC_CODE <- "x <- 5"
+  output <- test_it(lst)
+  passes(output)
+  # should be cleaned up
+  expect_equal(length(ls(envir = .GlobalEnv)), 1)
+  expect_equal(length(ls(envir = RBackend:::dc$get("sol_env"))), 0)
+
+  # incorrect answer
+  lst$DC_CODE <- "x <- 7"
+  output <- test_it(lst)
+  fails(output)
+  # should also be cleaned up
+  expect_equal(length(ls(envir = .GlobalEnv)), 1)
+  expect_equal(length(ls(envir = RBackend:::dc$get("sol_env"))), 0)
 })