update tests

Author: t-kalinowski

tests/testthat/helper-utils.R

@@ -90,9 +90,14 @@ test_succeeds <- function(desc, expr, required_version = NULL) {
     local_output_sink(nullfile())
   }
 
+
   rlang::eval_tidy(
-    rlang::expr(test_that({{desc}}, expect_no_error( {{expr}} ))),
-    env = parent.frame())
+    rlang::expr(test_that(!!desc, {
+      expect_no_error( {{expr}} )
+      expect_true(TRUE) # https://github.com/r-lib/testthat/issues/2037
+      } ))
+    # , # env = parent.frame()
+  )
 
 }
 

tests/testthat/test-activations.R

@@ -4,14 +4,17 @@ context("activations")
 
 test_activation <- function(name, required_version = NULL, required_tf_version=tf_version()) {
   test_succeeds(paste("use activation", name), {
+    # browser()
     skip_if_no_keras(required_version)
     skip_if_not_tensorflow_version(required_tf_version)
     activation_fn <- eval(parse(text = name))
-    test_call_succeeds(name, {
-      keras_model_sequential(input_shape = 784) %>%
-        layer_dense(32) %>%
-        layer_activation(activation = activation_fn)
-    })
+
+    # test in a model
+    keras_model_sequential(input_shape = 784) %>%
+      layer_dense(32) %>%
+      layer_activation(activation = activation_fn)
+
+    # test stand alone
     tensor <- op_array(matrix(runif(100), nrow = 10, ncol = 10))
     activation_fn(tensor)
   })

tests/testthat/test-layer-text_vectorization.R

@@ -37,7 +37,8 @@ test_call_succeeds("can use layer_text_vectorization in a functional model", {
   if (tensorflow::tf_version() < "2.1")
     skip("TextVectorization requires TF version >= 2.1")
 
-  x <- matrix(c("hello world", "hello world"), ncol = 1)
+  # x <- matrix(c("hello world", "hello world"), ncol = 1)
+  x <- c("hello world", "hello world")
 
   layer <- layer_text_vectorization()
   layer %>% adapt(x)
@@ -55,7 +56,8 @@ test_call_succeeds("can set and get the vocabulary of layer_text_vectorization",
   if (tensorflow::tf_version() < "2.1")
     skip("TextVectorization requires TF version >= 2.1")
 
-  x <- matrix(c("hello world", "hello world"), ncol = 1)
+#   x <- matrix(c("hello world", "hello world"), ncol = 1)
+  x <- c("hello world", "hello world")
 
   layer <- layer_text_vectorization()
 

tests/testthat/test-layers-preprocessing.R

@@ -310,6 +310,7 @@ test_succeeds("layer_text_vectorization", {
     input_shape = c(1), dtype = tf$string)
 
   input_data = rbind("foo qux bar", "qux baz")
+  input_data = c("foo qux bar", "qux baz")
   preds <- model %>% predict(input_data)
 
   expect_equal(preds, rbind(c(2, 1, 4, 0),