Remove expect_is and expect_that from tests

michaelquinn32 · michaelquinn32 · commit ee7d1f45d363 · 2021-06-24T16:20:48.000-04:00
diff --git a/R/expectations.R b/R/expectations.R
@@ -1,21 +1,25 @@
-arglist_is_empty <- function() {
-  function(x) {
-    expect_true(
-      is.null(formals(x)),
-      "has empty argument list"
-    )
-  }
+expect_arglist_is_empty <- function(object) {
+  act <- quasi_label(rlang::enquo(object), arg = "object")
+  act$formals <- formals(act$val)
+  expect(
+    is.null(act$formals),
+    sprintf("%s has an empty argument list.", act$lab)
+  )
+
+  invisible(act$val)
 }
 
-all_args_have_default_values <- function() {
-  function(x) {
-    args <- formals(x)
-    args <- args[names(args) != "..."]
-    expect_true(
-      all(vapply(args, function(x) if (is.null(x)) "NULL" else as.character(x), character(1L)) != ""),
-      "has arguments without default values"
-    )
-  }
+expect_all_args_have_default_values <- function(object) {
+  act <- quasi_label(rlang::enquo(object), arg = "object")
+  act$args <- formals(act$val)
+  act$args <- act$args[names(act$args) != "..."]
+  act$char_args <- vapply(act$args, as.character, character(1L))
+  expect(
+    all(nzchar(act$char_args, keepNA = FALSE)),
+    sprintf("%s has arguments without default values", act$lab)
+  )
+
+  invisible(act$val)
 }
 
 has_method <- function(method_name) {
diff --git a/R/s4.R b/R/s4.R
@@ -24,7 +24,8 @@ s4_methods <- function(env, pkg_fun = NULL) {
 }
 
 s4_real_argument_names <- function(s4_method) {
-  expect_is(s4_method, c("function", "MethodDefinition", "derivedDefaultMethod"))
+  expect_s4_class(s4_method, "function")
+  expect_s4_class(s4_method, "MethodDefinition")
   unwrapped <- s4_unwrap(s4_method)
   names(formals(unwrapped))
 }
diff --git a/R/spec-driver-constructor.R b/R/spec-driver-constructor.R
@@ -30,10 +30,10 @@ spec_driver_constructor <- list(
     constructor <- get(constructor_name, mode = "function", pkg_env)
 
     #' that is callable without arguments.
-    expect_that(constructor, all_args_have_default_values())
+    expect_all_args_have_default_values(constructor)
     #' DBI recommends to define a constructor with an empty argument list.
     if (!isTRUE(ctx$tweaks$constructor_relax_args)) {
-      expect_that(constructor, arglist_is_empty())
+      expect_arglist_is_empty(constructor)
     }
   },
   #
diff --git a/R/spec-driver-data-type.R b/R/spec-driver-data-type.R
@@ -34,7 +34,7 @@ test_data_type <- function(ctx, dbObj) {
         #' is returned.
         expect_equal(length(dbDataType(dbObj, value)), .(ncol(value)))
       }
-      expect_is(dbDataType(dbObj, .(value)), "character")
+      expect_type(dbDataType(dbObj, .(value)), "character")
       expect_visible(dbDataType(dbObj, .(value)))
     }))
   }
diff --git a/R/spec-meta-column-info.R b/R/spec-meta-column-info.R
@@ -19,7 +19,7 @@ spec_meta_column_info <- list(
       {
         fields <- dbColumnInfo(res)
         #' returns a data frame
-        expect_is(fields, "data.frame")
+        expect_s3_class(fields, "data.frame")
         #' with at least two columns `"name"` and `"type"` (in that order)
         expect_equal(names(fields)[1:2], c("name", "type"))
         #' (and optional columns that start with a dot).
@@ -30,7 +30,7 @@ spec_meta_column_info <- list(
         iris_ret <- dbFetch(res)
         expect_identical(fields$name, names(iris_ret))
         #' The `"type"` column is of type `character` and only for information.
-        expect_is(fields$type, "character")
+        expect_type(fields$type, "character")
         #' Do not compute on the `"type"` column, instead use `dbFetch(res, n = 0)`
         #' to create a zero-row data frame initialized with the correct data types.
       }
diff --git a/R/spec-meta-get-statement.R b/R/spec-meta-get-statement.R
@@ -17,7 +17,7 @@ spec_meta_get_statement <- list(
       dbSendQuery(con, query),
       {
         s <- dbGetStatement(res)
-        expect_is(s, "character")
+        expect_type(s, "character")
         expect_identical(s, query)
       }
     )
@@ -30,7 +30,7 @@ spec_meta_get_statement <- list(
       dbSendStatement(con, query),
       {
         s <- dbGetStatement(res)
-        expect_is(s, "character")
+        expect_type(s, "character")
         expect_identical(s, query)
       }
     )
diff --git a/R/spec-sql-list-tables.R b/R/spec-sql-list-tables.R
@@ -13,7 +13,7 @@ spec_sql_list_tables <- list(
   list_tables = function(ctx, con, table_name = "dbit07") {
     tables <- dbListTables(con)
     #' returns a character vector
-    expect_is(tables, "character")
+    expect_type(tables, "character")
     #' that enumerates all tables
     expect_false(table_name %in% tables)
 
diff --git a/R/spec-sql-quote-identifier.R b/R/spec-sql-quote-identifier.R
@@ -13,7 +13,7 @@ spec_sql_quote_identifier <- list(
     #' `dbQuoteIdentifier()` returns an object that can be coerced to [character],
     simple_out <- dbQuoteIdentifier(con, "simple")
     expect_error(as.character(simple_out), NA)
-    expect_is(as.character(simple_out), "character")
+    expect_type(as.character(simple_out), "character")
   },
   #
   quote_identifier_vectorized = function(ctx, con) {
diff --git a/R/spec-sql-quote-string.R b/R/spec-sql-quote-string.R
@@ -14,7 +14,7 @@ spec_sql_quote_string <- list(
     simple <- "simple"
     simple_out <- dbQuoteString(con, simple)
     expect_error(as.character(simple_out), NA)
-    expect_is(as.character(simple_out), "character")
+    expect_type(as.character(simple_out), "character")
     expect_equal(length(simple_out), 1L)
   },
   #
diff --git a/R/spec-sql-write-table.R b/R/spec-sql-write-table.R
@@ -441,7 +441,7 @@ spec_sql_write_table <- list(
     test_table_roundtrip(
       con, tbl_in,
       transform = function(tbl_out) {
-        expect_is(unclass(tbl_out$a), "numeric")
+        expect_type(unclass(tbl_out$a), "double")
         tbl_out
       }
     )
diff --git a/R/utils.R b/R/utils.R
@@ -2,7 +2,7 @@
 
 get_pkg_path <- function(ctx) {
   pkg_name <- package_name(ctx)
-  expect_is(pkg_name, "character")
+  expect_type(pkg_name, "character")
 
   pkg_path <- find.package(pkg_name)
   pkg_path

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ s4_methods <- function(env, pkg_fun = NULL) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`s4_real_argument_names <- function(s4_method) {`
`27`		`- expect_is(s4_method, c("function", "MethodDefinition", "derivedDefaultMethod"))`
	`27`	`+ expect_s4_class(s4_method, "function")`
	`28`	`+ expect_s4_class(s4_method, "MethodDefinition")`
`28`	`29`	`unwrapped <- s4_unwrap(s4_method)`
`29`	`30`	`names(formals(unwrapped))`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ spec_driver_constructor <- list(`
`30`	`30`	`constructor <- get(constructor_name, mode = "function", pkg_env)`
`31`	`31`
`32`	`32`	`#' that is callable without arguments.`
`33`		`- expect_that(constructor, all_args_have_default_values())`
	`33`	`+ expect_all_args_have_default_values(constructor)`
`34`	`34`	`#' DBI recommends to define a constructor with an empty argument list.`
`35`	`35`	`if (!isTRUE(ctx$tweaks$constructor_relax_args)) {`
`36`		`- expect_that(constructor, arglist_is_empty())`
	`36`	`+ expect_arglist_is_empty(constructor)`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`#`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ test_data_type <- function(ctx, dbObj) {`
`34`	`34`	`#' is returned.`
`35`	`35`	`expect_equal(length(dbDataType(dbObj, value)), .(ncol(value)))`
`36`	`36`	`}`
`37`		`- expect_is(dbDataType(dbObj, .(value)), "character")`
	`37`	`+ expect_type(dbDataType(dbObj, .(value)), "character")`
`38`	`38`	`expect_visible(dbDataType(dbObj, .(value)))`
`39`	`39`	`}))`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ spec_meta_get_statement <- list(`
`17`	`17`	`dbSendQuery(con, query),`
`18`	`18`	`{`
`19`	`19`	`s <- dbGetStatement(res)`
`20`		`- expect_is(s, "character")`
	`20`	`+ expect_type(s, "character")`
`21`	`21`	`expect_identical(s, query)`
`22`	`22`	`}`
`23`	`23`	`)`
`@@ -30,7 +30,7 @@ spec_meta_get_statement <- list(`
`30`	`30`	`dbSendStatement(con, query),`
`31`	`31`	`{`
`32`	`32`	`s <- dbGetStatement(res)`
`33`		`- expect_is(s, "character")`
	`33`	`+ expect_type(s, "character")`
`34`	`34`	`expect_identical(s, query)`
`35`	`35`	`}`
`36`	`36`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ spec_sql_quote_identifier <- list(`
`13`	`13`	#' `dbQuoteIdentifier()` returns an object that can be coerced to [character],
`14`	`14`	`simple_out <- dbQuoteIdentifier(con, "simple")`
`15`	`15`	`expect_error(as.character(simple_out), NA)`
`16`		`- expect_is(as.character(simple_out), "character")`
	`16`	`+ expect_type(as.character(simple_out), "character")`
`17`	`17`	`},`
`18`	`18`	`#`
`19`	`19`	`quote_identifier_vectorized = function(ctx, con) {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ spec_sql_quote_string <- list(`
`14`	`14`	`simple <- "simple"`
`15`	`15`	`simple_out <- dbQuoteString(con, simple)`
`16`	`16`	`expect_error(as.character(simple_out), NA)`
`17`		`- expect_is(as.character(simple_out), "character")`
	`17`	`+ expect_type(as.character(simple_out), "character")`
`18`	`18`	`expect_equal(length(simple_out), 1L)`
`19`	`19`	`},`
`20`	`20`	`#`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ spec_sql_write_table <- list(`
`441`	`441`	`test_table_roundtrip(`
`442`	`442`	`con, tbl_in,`
`443`	`443`	`transform = function(tbl_out) {`
`444`		`- expect_is(unclass(tbl_out$a), "numeric")`
	`444`	`+ expect_type(unclass(tbl_out$a), "double")`
`445`	`445`	`tbl_out`
`446`	`446`	`}`
`447`	`447`	`)`