Prefer inherits() over methods::is()

DESCRIPTION

@@ -29,7 +29,6 @@ Imports:
     purrr (>= 0.2.2),
     tibble (>= 2.0),
     ggrepel (>= 0.6.5),
-    methods (>= 3.4.3), 
     rlang(>= 0.4.0)
 Suggests: 
     testthat (>= 2.1.0),

R/utility.R

@@ -14,7 +14,7 @@
 #' as_cordf(x)
 #' as_cordf(x, diagonal = 1)
 as_cordf <- function(x, diagonal = NA) {
-  if(methods::is(x, "cor_df")) {
+  if(inherits(x, "cor_df")) {
     warning("x is already a correlation data frame.")
     return(x)
   }

tests/testthat/test-as_cordf.R

@@ -3,8 +3,8 @@ context("as_cordf")
 d <- cor(mtcars)
 
 test_that("Inherits correct classes", {
-  expect_is(as_cordf(d), "cor_df")
-  expect_is(as_cordf(d), "tbl")
+  expect_s3_class(as_cordf(d), "cor_df")
+  expect_s3_class(as_cordf(d), "tbl")
   expect_warning(as_cordf(as_cordf(d)), "x is already a correlation")
 })
 

tests/testthat/test-as_matrix.R

@@ -1,28 +1,28 @@
-context("as_matrix.R")
-
-x <- correlate(mtcars, diagonal = 1)
-y <- as_matrix(x)
-
-test_that("Inherits correct classes", {
-  expect_is(y, "matrix")
-})
-
-test_that("Converts values accurately", {
-  expect_true(all(x[-1] == y, na.rm = TRUE))
-})
-
-test_that("Yields correct columns and rows", {
-  expect_equal(colnames(x), c("rowname", colnames(y)))
-  expect_equal(nrow(x), ncol(y))
-  expect_equal(x$rowname, colnames(y))
-  expect_equal(rownames(y), colnames(y))
-})
-
-test_that("Diagonal sets correctly", {
-  expect_true(all(diag(y) == 1))
-  expect_true(all(diag(as_matrix(x, diagonal = 100)) == 100))
-})
-
-test_that("as_matrix preservers diag from correlate", {
-  expect_equal(diag(as.matrix(x[-1])), unname(diag(y)))
+context("as_matrix.R")
+
+x <- correlate(mtcars, diagonal = 1)
+y <- as_matrix(x)
+
+test_that("Inherits correct classes", {
+  expect_s3_class(y, "matrix")
+})
+
+test_that("Converts values accurately", {
+  expect_true(all(x[-1] == y, na.rm = TRUE))
+})
+
+test_that("Yields correct columns and rows", {
+  expect_equal(colnames(x), c("rowname", colnames(y)))
+  expect_equal(nrow(x), ncol(y))
+  expect_equal(x$rowname, colnames(y))
+  expect_equal(rownames(y), colnames(y))
+})
+
+test_that("Diagonal sets correctly", {
+  expect_true(all(diag(y) == 1))
+  expect_true(all(diag(as_matrix(x, diagonal = 100)) == 100))
+})
+
+test_that("as_matrix preservers diag from correlate", {
+  expect_equal(diag(as.matrix(x[-1])), unname(diag(y)))
 })

tests/testthat/test-dataframe.R

@@ -1,5 +1,5 @@
 context("dataframe")
 
 test_that("Fashion works", {
-  expect_is(fashion(mtcars), "data.frame")
+  expect_s3_class(fashion(mtcars), "data.frame")
 })

tests/testthat/test-fashion.R

@@ -72,5 +72,5 @@ test_that("Vectors and padding", {
 })
 
 test_that("Fashion works against matrix", {
-  expect_is(fashion(as.matrix(correlate(mtcars))), "data.frame")
+  expect_s3_class(fashion(as.matrix(correlate(mtcars))), "data.frame")
 })

tests/testthat/test-focus.R

@@ -50,7 +50,7 @@ test_that("focus_if works", {
   any_greater_than <- function(x, val) {
     mean(abs(x), na.rm = TRUE) > val
   }
-  expect_is(
+  expect_s3_class(
     focus_if(d, any_greater_than, .6),
     "tbl_df"
   )

tests/testthat/test-plots.R

@@ -5,13 +5,13 @@ d <- correlate(d)
 context("network")
 
 test_that("Network plot works", {
-  expect_is(network_plot(d), "ggplot")  
-  expect_is(network_plot(d, colors = c("indianred2", "white", "skyblue1")), "ggplot")
+  expect_s3_class(network_plot(d), "ggplot")  
+  expect_s3_class(network_plot(d, colors = c("indianred2", "white", "skyblue1")), "ggplot")
 })
 
 context("rplot")
 
 test_that("Network plot works", {
-  expect_is(rplot(d), "ggplot")
-  expect_is(rplot(d, colors = c("indianred2", "white", "skyblue1")), "ggplot")
+  expect_s3_class(rplot(d), "ggplot")
+  expect_s3_class(rplot(d, colors = c("indianred2", "white", "skyblue1")), "ggplot")
 })

tests/testthat/test-stretch.R

@@ -33,9 +33,9 @@ test_that("na.rm", {
 test_that("retract works", {
   cd <- as_cordf(retract(stretch(d)))
   expect_equal(d, cd)
-  expect_is(d, "cor_df")
+  expect_s3_class(cd, "cor_df")
 })
 
 test_that("remove.dups works", {
-  expect_is(stretch(d, remove.dups = TRUE), "data.frame")
+  expect_s3_class(stretch(d, remove.dups = TRUE), "data.frame")
 })

tests/testthat/test-utilities.R

@@ -1,7 +1,7 @@
 context("Utilities") 
 
 test_that("pair_n works", {
-  expect_is(
+  expect_s3_class(
     pair_n(1),
     "matrix"
   )