tightened up tests

Author: topepo

R/aaa_models.R

@@ -91,15 +91,15 @@ set_env_val <- function(name, value) {
 # ------------------------------------------------------------------------------
 
 check_eng_val <- function(eng) {
-  if (rlang::is_missing(eng) || length(eng) != 1)
+  if (rlang::is_missing(eng) || length(eng) != 1 || !is.character(eng))
     stop("Please supply a character string for an engine name (e.g. `'lm'`)",
          call. = FALSE)
   invisible(NULL)
 }
 
 
 check_model_exists <- function(model) {
-  if (rlang::is_missing(model) || length(model) != 1) {
+  if (rlang::is_missing(model) || length(model) != 1 || !is.character(model)) {
     stop("Please supply a character string for a model name (e.g. `'linear_reg'`)",
          call. = FALSE)
   }
@@ -114,7 +114,7 @@ check_model_exists <- function(model) {
 }
 
 check_model_doesnt_exist <- function(model) {
-  if (rlang::is_missing(model) || length(model) != 1) {
+  if (rlang::is_missing(model) || length(model) != 1 || !is.character(model)) {
     stop("Please supply a character string for a model name (e.g. `'linear_reg'`)",
          call. = FALSE)
   }
@@ -129,21 +129,21 @@ check_model_doesnt_exist <- function(model) {
 }
 
 check_mode_val <- function(mode) {
-  if (rlang::is_missing(mode) || length(mode) != 1)
+  if (rlang::is_missing(mode) || length(mode) != 1 || !is.character(mode))
     stop("Please supply a character string for a mode (e.g. `'regression'`)",
          call. = FALSE)
   invisible(NULL)
 }
 
 check_engine_val <- function(eng) {
-  if (rlang::is_missing(eng) || length(eng) != 1)
+  if (rlang::is_missing(eng) || length(eng) != 1 || !is.character(eng))
     stop("Please supply a character string for an engine (e.g. `'lm'`)",
          call. = FALSE)
   invisible(NULL)
 }
 
 check_arg_val <- function(arg) {
-  if (rlang::is_missing(arg) || length(arg) != 1)
+  if (rlang::is_missing(arg) || length(arg) != 1 || !is.character(arg))
     stop("Please supply a character string for the argument",
          call. = FALSE)
   invisible(NULL)
@@ -415,7 +415,7 @@ set_model_engine <- function(model, mode, eng) {
     dplyr::distinct()
 
   set_env_val(model, engs)
-
+  set_model_mode(model, mode)
   invisible(NULL)
 }
 

R/logistic_reg_data.R

@@ -282,7 +282,6 @@ set_pred(
 # ------------------------------------------------------------------------------
 
 set_model_engine("logistic_reg", "classification", "keras")
-set_model_engine("logistic_reg", "regression", "keras")
 set_dependency("logistic_reg", "keras", "keras")
 set_dependency("logistic_reg", "keras", "magrittr")
 
@@ -350,7 +349,6 @@ set_pred(
 # ------------------------------------------------------------------------------
 
 set_model_engine("logistic_reg", "classification", "stan")
-set_model_engine("logistic_reg", "regression", "stan")
 set_dependency("logistic_reg", "stan", "rstanarm")
 
 set_fit(

R/multinom_reg_data.R

@@ -166,7 +166,6 @@ set_pred(
 # ------------------------------------------------------------------------------
 
 set_model_engine("multinom_reg", "classification", "keras")
-set_model_engine("multinom_reg", "regression", "keras")
 set_dependency("multinom_reg", "keras", "keras")
 set_dependency("multinom_reg", "keras", "magrittr")
 

tests/testthat/test_registration.R

@@ -59,8 +59,8 @@ test_by_col(
 )
 
 expect_error(set_new_model())
-# TODO expect_error(set_new_model(2))
-# TODO expect_error(set_new_model(letters[1:2]))
+expect_error(set_new_model(2))
+expect_error(set_new_model(letters[1:2]))
 })
 
 
@@ -72,16 +72,13 @@ test_that('adding a new mode', {
   expect_equal(get_from_env("sponge_modes"), c("unknown", "classification"))
 
   expect_error(set_model_mode("sponge"))
-  # TODO expect_error(set_model_mode("sponge", "banana"))
-  # TODO expect_error(set_model_mode("sponge", "classification"))
-
 })
 
 
 # ------------------------------------------------------------------------------
 
 test_that('adding a new engine', {
-  set_model_engine("sponge", "classification", "gum")
+  set_model_engine("sponge", mode = "classification", eng = "gum")
 
   test_by_col(
     get_from_env("sponge"),