[wb_dims] extend tests and minor code indentations

JanMarvin · Aug 16, 2024 · 92654df · 92654df
1 parent a23b550
commit 92654df
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -726,7 +726,7 @@ wb_dims <- function(..., select = NULL) {
     frow <- args$from_row %||% 1L
   }
 
-  left <- args$left
+  left  <- args$left
   right <- args$right
   above <- args$above
   below <- args$below
@@ -744,10 +744,10 @@ wb_dims <- function(..., select = NULL) {
   # NCOL(NULL)/NROW(NULL) could work as well, but the behavior might have
   # changed recently.
   if (!is.null(args$x)) {
-    width_x <- ncol(args$x) + rnms
-    height_x <- nrow(args$x) + cnms
+    width_x  <- NCOL(args$x) + rnms
+    height_x <- NROW(args$x) + cnms
   } else {
-    width_x <- 1
+    width_x  <- 1
     height_x <- 1
   }
 

diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -127,14 +127,50 @@ test_that("wb_dims() works when not supplying `x`.", {
 
 test_that("wb_dims() works with above and one line", {
   expect_equal(wb_dims(x = names(mtcars), from_row = 2), "A2:A12")
+
   # doesn't work
   # expect_equal(wb_dims(x = names(mtcars), from_row = 3, above = 1), "A2:A12")
-  expect_equal(wb_dims(x = names(mtcars), from_row = 2, above = 1), "A1:A11")
-  expect_equal(wb_dims(x = names(mtcars), from_dims = "A2", above = 1), "A1:A11")
+
+  expect_warning(
+    expect_equal(
+      wb_dims(x = names(mtcars), from_row = 2, above = 1),
+      "A1:A11"
+    ),
+    "rows cannot be above of row 1 "
+  )
+
+  expect_warning(
+    expect_equal(
+      wb_dims(x = names(mtcars), from_dims = "A2", above = 1),
+      "A1:A11"),
+    "rows cannot be above of row 1 "
+  )
+
   # Doesn't work returns A1:A11
   # expect_equal(wb_dims(x = names(mtcars), from_dims = "A3", above = 1), "A2:A12")
   # Doesn't work returns A1:A11
   # expect_equal(wb_dims(x = names(mtcars), from_dims = "A4", above = 1), "A3:A13")
+
+  # currently the only ways to create horizontal single row dims with wb_dims()
+
+  nms <- mtcars[NULL, ]
+
+  expect_equal(wb_dims(x = nms, from_row = 3), "A3:K3")
+  expect_equal(wb_dims(x = nms, from_row = 3, above = 1), "A2:K2")
+  expect_equal(wb_dims(x = nms, from_dims = "A3"), "A3:K3")
+  expect_equal(wb_dims(x = nms, from_dims = "A3", above = 1), "A2:K2")
+  expect_equal(wb_dims(x = nms, from_dims = "A4", above = 1), "A3:K3")
+
+  # this does not return the same results, because NROW(x) >= 2 and above shifts more
+  # wb_dims(x = t(names(mtcars)), col_names = TRUE, select = "col_names")
+  # maybe add a horizontal argument? Or "A3:B3" could be used as indication if x should be placed horizontal or vertical
+
+  expect_equal(wb_dims(x = t(names(mtcars)), col_names = TRUE, select = "col_names", from_row = 3), "A3:K3")
+  # expect_equal(wb_dims(x = t(names(mtcars)), col_names = TRUE, select = "col_names", from_row = 3, above = 1), "A2:K2")
+  expect_equal(wb_dims(x = t(names(mtcars)), col_names = TRUE, select = "col_names", from_dims = "A3"), "A3:K3")
+  # expect_equal(wb_dims(x = t(names(mtcars)), col_names = TRUE, select = "col_names", from_dims = "A3", above = 1), "A2:K2")
+  # expect_equal(wb_dims(x = t(names(mtcars)), col_names = TRUE, select = "col_names", from_dims = "A4", above = 1), "A3:K3")
+
 })
 
 test_that("`wb_dims()` can select content in a nice fashion with `x`", {