Simplify factor test.

tidyverse · Nov 9, 2016 · eaa9b0d · eaa9b0d
1 parent 557edad
commit eaa9b0d
Showing 1 changed file with 9 additions and 25 deletions.
diff --git a/tests/testthat/test-combine.R b/tests/testthat/test-combine.R
@@ -44,43 +44,27 @@ test_that("combine works with NA and integers (#2203)", {
 
 test_that("combine works with NA and factors (#2203)", {
   # NA first
-  expected_result <- factor(c(NA, "a", "c", NA, "b"), levels = c("a","b","c"))
-  works1 <- combine(list(NA,
-                         factor("a", levels = c("a","b","c")),
-                         factor("c", levels = c("a","b","c")),
-                         NA,
-                         factor("b", levels = c("a","b","c"))))
+  fac <- factor(c("a", "c", NA, "b"), levels = letters[1:3])
+  expected_result <- fac[c(3, 1, 3, 2)]
+  works1 <- combine(list(NA, fac[1], NA, fac[2]))
   expect_equal(works1, expected_result)
 
   # NA length == 1
-  expected_result <- factor(c("a", "c", NA, "b"), levels = c("a","b","c"))
-  works1 <- combine(list(factor("a", levels = c("a","b","c")),
-                         factor("c", levels = c("a","b","c")),
-                         factor(NA, levels = c("a", "b", "c")),
-                         factor("b", levels = c("a","b","c"))))
+  expected_result <- fac
+  works1 <- combine(list(fac[1], fac[2], fac[3], fac[4]))
   expect_equal(works1, expected_result)
 
-  works2 <- combine(list(factor("a", levels = c("a","b","c")),
-                         factor("c", levels = c("a","b","c")),
-                         NA,
-                         factor("b", levels = c("a","b","c"))))
+  works2 <- combine(list(fac[1], fac[2], NA, fac[4]))
   expect_equal(works2, expected_result)
 
   # NA length > 1
-  expected_result <- factor(c("a", "c", NA, NA, "b"), levels = c("a","b","c"))
+  expected_result <- fac[c(1, 2, 3, 3, 4)]
 
-  works3 <- combine(list(factor("a", levels = c("a","b","c")),
-                         factor("c", levels = c("a","b","c")),
-                         factor(c(NA, NA), levels = c("a", "b", "c")),
-                         factor("b", levels = c("a","b","c"))))
+  works3 <- combine(list(fac[1], fac[2], fac[c(3,3)], fac[4]))
   expect_equal(works3, expected_result)
 
-  works4 <- combine(list(factor("a", levels = c("a","b","c")),
-                         factor("c", levels = c("a","b","c")),
-                         c(NA,NA),
-                         factor("b", levels = c("a","b","c"))))
+  works4 <- combine(list(fac[1], fac[2], c(NA, NA), fac[4]))
   expect_equal(works4, expected_result)
-
 })
 
 test_that("combine works with NA and real numbers (#2203)", {