adjust to different covr version

Author: Polkas

.gitignore

@@ -34,4 +34,4 @@ inst/*.pdf
 po/*~
 inst/doc
 .Rproj.user
-
+.DS_Store

README.md

@@ -100,7 +100,8 @@ print(gridify_object_fill)
 
 <img src="man/figures/README-example-1.png" width="100%" />
 
-Note: Get the image using `export_to(gridify_object, to = "mypng.png", res = 300, width = 2300, height = 1900)`
+Note: Get the image using  
+`export_to(gridify_object_fill, to = "mypng.png", res = 300, width = 2300, height = 1900)`
 
 ## Documentation Guide
 

tests/testthat/test_print.R

@@ -11,6 +11,38 @@ test_that("print on gridifyClass returns invisibly grob object", {
   expect_type(print(test_gridify), "language")
 })
 
+test_that("print on gridifyClass returns invisibly grob object", {
+  expect_silent(
+    test_gridify <- gridify(
+      object = ggplot2::ggplot(mtcars, ggplot2::aes(mpg, wt)) +
+        ggplot2::geom_point(),
+      layout = gridifyLayout(
+        nrow = 3L,
+        ncol = 1L,
+        heights = grid::unit(c(0, 10, 0), c("lines", "lines", "lines")),
+        widths = grid::unit(1, "npc"),
+        margin = grid::unit(c(t = 0.1, r = 0.1, b = 0.1, l = 0.1), units = "npc"),
+        global_gpar = grid::gpar(),
+        object = gridifyObject(row = 2, col = 1),
+        cells = gridifyCells(
+          title = gridifyCell(
+            row = 1, col = 1, text = "Longer Default Title", mch = 10,
+            gpar = grid::gpar(col = "black", fontsize = 12)
+          ),
+          footer = gridifyCell(row = 3, col = 1)
+        ),
+        adjust_height = TRUE
+      )
+    )
+  )
+  expect_silent(
+    test_gridify <- set_cell(test_gridify, "footer", "Footer", gpar = grid::gpar(col = "black"))
+  )
+  expect_s4_class(test_gridify, "gridifyClass")
+  expect_invisible(print(test_gridify))
+  expect_type(print(test_gridify), "language")
+})
+
 test_that("print on gridifyClass creates image", {
   skip_if(!getOption("RUNSNAPSHOTTESTS", FALSE))
   expect_silent(

tests/testthat/test_set_cell.R

@@ -55,7 +55,7 @@ test_that("set_cell works on gridify object", {
 test_that("set_cell works with multiple arguments filled", {
   expect_s4_class(test_gridify, "gridifyClass")
 
-  output <- set_cell(test_gridify, "title", "TITLE", mch = NULL, x = 0.7, hjust = 1, rot = 45)
+  output <- set_cell(test_gridify, "title", "TITLE", mch = 120, x = 0.7, hjust = 1, rot = 45)
   output <- set_cell(
     output, "footer", "FOOTER",
     mch = NULL, y = 0.2, hjust = 0, gpar = grid::gpar(fontsize = 22, col = "red")
@@ -64,7 +64,7 @@ test_that("set_cell works with multiple arguments filled", {
   expect_equal(output@elements, list(
     title = list(
       text = "TITLE",
-      mch = NULL,
+      mch = 120,
       x = 0.7,
       y = NULL,
       hjust = 1,
@@ -171,6 +171,19 @@ test_that("set_cell errors when cell gpar is wrong", {
   )
 })
 
+test_that("set_cell errors when cell mch is wrong", {
+  expect_error(
+    set_cell(
+      test_gridify,
+      "title",
+      "something",
+      mch = "a"
+    ),
+    "The mch argument is not a positive numeric value",
+    fixed = TRUE
+  )
+})
+
 test_that("Image testing for set_cell", {
   skip_if(!getOption("RUNSNAPSHOTTESTS", FALSE))
 

tests/testthat/test_show.R

@@ -192,14 +192,17 @@ test_that("show on complex gridifyLayout returns information to the console", {
 
 test_that("test span row for output height row = c(x:y)", {
   test_layout <- gridifyLayout(
-    nrow = 6L,
+    nrow = 3L,
     ncol = 1L,
-    heights = grid::unit(c(0.05, 0.05, 0.05, 0.7, 0.05, 0.1), "npc"),
+    heights = grid::unit(c(0.15, 0.7, 0.15), "npc"),
     widths = grid::unit(1, "npc"),
     margin = grid::unit(c(t = 0.1, r = 0.1, b = 0.1, l = 0.1), units = "npc"),
     global_gpar = grid::gpar(),
-    object = gridifyObject(row = c(1:3), col = 1),
-    cells = gridifyCells(title = gridifyCell(row = 1, col = 1), footer = gridifyCell(row = 3, col = 1))
+    object = gridifyObject(row = 2, col = 1),
+    cells = gridifyCells(
+      title = gridifyCell(row = 1, col = 1),
+      footer = gridifyCell(row = 3, col = 1)
+    )
   )
   expect_s4_class(test_layout, "gridifyLayout")
 
@@ -209,31 +212,34 @@ test_that("test span row for output height row = c(x:y)", {
 
   expect_equal(output, c(
     "gridifyLayout object", "---------------------", "Layout dimensions:",
-    "  Number of rows: 6", "  Number of columns: 1", "", "Heights of rows:",
-    "  Row 1: 0.05 npc", "  Row 2: 0.05 npc", "  Row 3: 0.05 npc",
-    "  Row 4: 0.7 npc", "  Row 5: 0.05 npc", "  Row 6: 0.1 npc",
+    "  Number of rows: 3", "  Number of columns: 1", "", "Heights of rows:",
+    "  Row 1: 0.15 npc", "  Row 2: 0.7 npc", "  Row 3: 0.15 npc",
     "", "Widths of columns:", "  Column 1: 1 npc", "", "Object Position:",
-    "  Row: 1-3", "  Col: 1", "  Width: 1", "  Height: 1", "", "Object Row Heights:",
-    "  Row 1: 0.05 npc", "  Row 2: 0.05 npc", "  Row 3: 0.05 npc",
-    "", "Margin:", "  Top: 0.1 npc", "  Right: 0.1 npc", "  Bottom: 0.1 npc",
-    "  Left: 0.1 npc", "", "Global graphical parameters:", "  Are not set", "",
-    "Default Cell Info:", "  title:",
+    "  Row: 2", "  Col: 1", "  Width: 1", "  Height: 1", "", "Object Row Heights:",
+    "  Row 2: 0.7 npc", "", "Margin:", "  Top: 0.1 npc", "  Right: 0.1 npc",
+    "  Bottom: 0.1 npc", "  Left: 0.1 npc", "", "Global graphical parameters:",
+    "  Are not set", "", "Default Cell Info:", "  title:",
     "    row:1, col:1, text:NULL, mch:Inf, x:0.5, y:0.5, hjust:0.5, vjust:0.5, rot:0, ",
-    "  footer:",
-    "    row:3, col:1, text:NULL, mch:Inf, x:0.5, y:0.5, hjust:0.5, vjust:0.5, rot:0, ", ""
+    "  footer:", "    row:3, col:1, text:NULL, mch:Inf, x:0.5, y:0.5, hjust:0.5, vjust:0.5, rot:0, ",
+    ""
   ))
 })
 
 test_that("test span row for output height row = c(x, y)", {
   test_layout <- gridifyLayout(
-    nrow = 6L,
+    nrow = 3L,
     ncol = 1L,
-    heights = grid::unit(c(0.05, 0.05, 0.05, 0.7, 0.05, 0.1), "npc"),
+    heights = grid::unit(c(0.15, 0.7, 0.15), "npc"),
     widths = grid::unit(1, "npc"),
     margin = grid::unit(c(t = 0.1, r = 0.1, b = 0.1, l = 0.1), units = "npc"),
     global_gpar = grid::gpar(),
-    object = gridifyObject(row = c(1, 4), col = 1),
-    cells = gridifyCells(title = gridifyCell(row = 1, col = 1), footer = gridifyCell(row = 3, col = 1))
+    object = gridifyObject(row = 2, col = 1),
+    cells = gridifyCells(
+      title = gridifyCell(
+        row = 1, col = 1, text = "Longer Default Title", gpar = grid::gpar(col = "black")
+      ),
+      footer = gridifyCell(row = 3, col = 1)
+    )
   )
   expect_s4_class(test_layout, "gridifyLayout")
 
@@ -243,17 +249,16 @@ test_that("test span row for output height row = c(x, y)", {
 
   expect_equal(output, c(
     "gridifyLayout object", "---------------------", "Layout dimensions:",
-    "  Number of rows: 6", "  Number of columns: 1", "", "Heights of rows:",
-    "  Row 1: 0.05 npc", "  Row 2: 0.05 npc", "  Row 3: 0.05 npc",
-    "  Row 4: 0.7 npc", "  Row 5: 0.05 npc", "  Row 6: 0.1 npc",
+    "  Number of rows: 3", "  Number of columns: 1", "", "Heights of rows:",
+    "  Row 1: 0.15 npc", "  Row 2: 0.7 npc", "  Row 3: 0.15 npc",
     "", "Widths of columns:", "  Column 1: 1 npc", "", "Object Position:",
-    "  Row: 1-4", "  Col: 1", "  Width: 1", "  Height: 1", "", "Object Row Heights:",
-    "  Row 1: 0.05 npc", "  Row 2: 0.05 npc", "  Row 3: 0.05 npc",
-    "  Row 4: 0.7 npc", "", "Margin:", "  Top: 0.1 npc", "  Right: 0.1 npc",
+    "  Row: 2", "  Col: 1", "  Width: 1", "  Height: 1", "", "Object Row Heights:",
+    "  Row 2: 0.7 npc", "", "Margin:", "  Top: 0.1 npc", "  Right: 0.1 npc",
     "  Bottom: 0.1 npc", "  Left: 0.1 npc", "", "Global graphical parameters:",
     "  Are not set", "", "Default Cell Info:", "  title:",
-    "    row:1, col:1, text:NULL, mch:Inf, x:0.5, y:0.5, hjust:0.5, vjust:0.5, rot:0, ",
-    "  footer:",
-    "    row:3, col:1, text:NULL, mch:Inf, x:0.5, y:0.5, hjust:0.5, vjust:0.5, rot:0, ", ""
+    "    row:1, col:1, text:Longer Def..., mch:Inf, x:0.5, y:0.5, hjust:0.5, vjust:0.5, rot:0, ",
+    "    gpar - col:black, ", "  footer:",
+    "    row:3, col:1, text:NULL, mch:Inf, x:0.5, y:0.5, hjust:0.5, vjust:0.5, rot:0, ",
+    ""
   ))
 })

tests/testthat/test_show_cells.R

@@ -0,0 +1,10 @@
+mock_gridify <- function() {
+  grb <- grid::rectGrob()
+  gridify(grb, simple_layout())
+}
+
+test_that("show_cells function works with layout or gridify object", {
+  expect_true(is.function(show_cells))
+  expect_output(show_cells(mock_gridify()), "title")
+  expect_output(show_cells(simple_layout()), "title")
+})