Signal error when course period unmatched

Signed-off-by: Liang Zhang <[email protected]>
psychelzh · Aug 31, 2023 · 6a20dd5 · 6a20dd5
1 parent 08bbfb6
commit 6a20dd5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/R/prepare_fetch_data.R b/R/prepare_fetch_data.R
@@ -159,7 +159,10 @@ fetch_config_tbl <- function(course_name, course_period, ...) {
   # course periods are numeric coded in database
   if (is.character(course_period)) {
     if (!course_period %in% name_course_periods) {
-      warn("Invalid course period specified.", class = "tarflow_invalid_period")
+      abort(
+        "Invalid course period specified.",
+        class = "tarflow_invalid_period"
+      )
     }
     course_period <- which(name_course_periods == course_period)
   }
@@ -177,7 +180,9 @@ read_sql_file <- function(file) {
 }
 
 utils::globalVariables(
-  c("scores", "raw_data", "raw_data_parsed", "indices",
+  c(
+    "scores", "raw_data", "raw_data_parsed", "indices",
     "project_id", "game_id", "course_date",
-    "prep_fun_name", "prep_fun", "input", "extra")
+    "prep_fun_name", "prep_fun", "input", "extra"
+  )
 )
diff --git a/tests/testthat/test-prepare_fetch_data.R b/tests/testthat/test-prepare_fetch_data.R
@@ -12,11 +12,17 @@ test_that("Smoke test", {
     ~course_name, ~course_period,
     "Unexisted", "Malvalue"
   )
-  memoise::drop_cache(fetch_config_tbl_mem)("Unexisted", "Malvalue")
   prepare_fetch_data(tbl_params_bad) |>
-    expect_null() |>
-    expect_warning(class = "tarflow_invalid_period") |>
+    expect_error(class = "tarflow_invalid_period")
+
+  tbl_params_bad <- tibble::tribble(
+    ~course_name, ~course_period,
+    "Unexisted", 7
+  )
+  memoise::drop_cache(fetch_config_tbl_mem)("Unexisted", 0)
+  prepare_fetch_data(tbl_params_bad) |>
     expect_warning(class = "tarflow_bad_params")
+
 })
 
 test_that("Work with `tar_make()", {