Merge pull request #30 from kenmawer/km-pr_34_rectify_tests

Km pr 34 rectify tests

Author: kenmawer

tests/testthat/test-df_mat_mul.R

@@ -13,8 +13,7 @@ test_that("Argument name is a character" ,{
 
 test_that("The length of names does not differ from the length of the number
           of outputs" ,{
-  expect_error(df_mat_mul(df, mat, c("a","b","c"),
-                          dplyr::num_range("X", 2:3)))
+  expect_error(df_mat_mul(df, mat, c("a","b","c"), 2:3))
 })
 
 test_that("The number of columns of the first data frame cannot differ from the
@@ -28,16 +27,15 @@ Z <- as.data.frame(as.matrix(df[2:3]) %*% mat)
 colnames(Z) <- c("z1","z2")
 output <- cbind(X,Z)
 
-test_that("Matrix multiplication is being handled as expected", {
+test_that("Names are being handled properly", {
   expect_identical(df_mat_mul(df, mat, "z", 2:3),output)
-})
-
-test_that("Names are used from the out_names field", {
   expect_identical(df_mat_mul(df, mat, c("z1","z2"), 2:3),output)
 })
 
 test_that("Other tidyselect functionalities are working", {
   mult <- df_mat_mul(df, mat, "z", dplyr::num_range("X", 2:3))
   expect_identical(mult,output)
   expect_identical(df_mat_mul(df, mat, "z", 2, 3),output)
+  # Mismatched names should not work:
+  expect_error(df_mat_mul(df, mat, "z", dplyr::num_range("Y", 2:3)))
 })

tests/testthat/test-step_epi_naomit.R

@@ -21,10 +21,15 @@ z2 <- r %>%
   step_naomit(all_predictors()) %>%
   step_naomit(all_outcomes(), skip = TRUE)
 
-# Test
+# Checks the behaviour of a step function, omitting the quosure and id that
+# differ from one another, even with identical behaviour
+behav <- function(recipe,step_num) recipe$steps[[step_num]][-1][-5]
+# Checks the class type of an object
+step_class <- function(recipe,step_num) class(recipe$steps[step_num])
+
 test_that("Check that both functions behave the same way", {
-  expect_identical(z1$steps[[3]][-1][-5],z2$steps[[3]][-1][-5])
-  expect_identical(z1$steps[[4]][-1][-5],z2$steps[[4]][-1][-5])
-  expect_identical(class(z1$steps[[3]]),class(z2$steps[[3]]))
-  expect_identical(class(z1$steps[[4]]),class(z2$steps[[4]]))
+  expect_identical(behav(z1,3),behav(z2,3))
+  expect_identical(behav(z1,4),behav(z2,4))
+  expect_identical(step_class(z1,3),step_class(z2,3))
+  expect_identical(step_class(z1,4),step_class(z2,4))
 })