Transition from tinytest to testthat (#142)

* init * more [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * remove tinytest from description [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * more [skip ci] * finish * remove other mentions of tinytest * try fix * fix --------- Co-authored-by: Etienne Bacher <[email protected]>
etiennebacher · Sep 26, 2024 · 03a0121 · 03a0121
1 parent 69d7d8d
commit 03a0121
Show file tree

Hide file tree

Showing 241 changed files with 14,130 additions and 12,658 deletions.
diff --git a/.github/.gitignore b/.github/.gitignore
@@ -1 +1,3 @@
 *.html
+
+/.quarto/
diff --git a/.github/CONTRIBUTING.Rmd b/.github/CONTRIBUTING.Rmd
@@ -104,15 +104,15 @@ test_pl |>
   mutate(ends_with_c = str_ends(x, "c"))
 ```
 
-Finally, the only thing left to do is to add some tests in the `tests/tinytest` 
+Finally, the only thing left to do is to add some tests in the `tests/testthat` 
 folder.
 
 ### Testing changes
 
-`tidypolars` uses [`tinytest`](https://cran.r-project.org/web/packages/tinytest/)
+`tidypolars` uses [`testthat`](https://cran.r-project.org/web/packages/testthat/)
 for checking that functions have the expected output. If changes affect the
 behavior of some functions (for example when adding an extra argument), add
-some tests in the related file in `tests/tinytest`. 
+some tests in the related file in `tests/testthat`. 
 
 Note that you only need to edit the file with `test_<function name>.R`. Files
 ending with `_lazy.R` are automatically generated. Use `devtools::load_all()`

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -44,8 +44,7 @@ Suggests:
     stringr,
     testthat (>= 3.0.0),
     tibble,
-    tinytest
-Remotes:
-    markvanderloo/tinytest/pkg
+    withr
 VignetteBuilder: knitr
 Config/testthat/edition: 3
+Config/testthat/parallel: true
diff --git a/NAMESPACE b/NAMESPACE
@@ -89,12 +89,6 @@ export(describe)
 export(describe_optimized_plan)
 export(describe_plan)
 export(duplicated_rows)
-export(expect_colnames)
-export(expect_dim)
-export(expect_equal)
-export(expect_equal_lazy)
-export(expect_error_lazy)
-export(expect_is_tidypolars)
 export(fetch)
 export(make_unique_id)
 export(read_csv_polars)

diff --git a/R/arrange.R b/R/arrange.R
@@ -56,7 +56,7 @@ arrange.RPolarsDataFrame <- function(.data, ..., .by_group = FALSE) {
 
   out <- if (is_grouped) {
     .data$sort(vars, descending = direction) |>
-      group_by(grps, maintain_order = mo)
+      group_by(all_of(grps), maintain_order = mo)
   } else {
     .data$sort(vars, descending = direction)
   }

diff --git a/R/collect.R b/R/collect.R
@@ -94,7 +94,7 @@ compute.RPolarsLazyFrame <- function(
 
   out <- if (is_grouped) {
     out |>
-      group_by(grps, maintain_order = mo)
+      group_by(all_of(grps), maintain_order = mo)
   } else {
     out
   }

diff --git a/R/complete.R b/R/complete.R
@@ -64,8 +64,8 @@ complete.RPolarsDataFrame <- function(data, ..., fill = list()) {
 
   out <- if (is_grouped) {
     out |>
-      relocate(grps, .before = 1) |>
-      group_by(grps, maintain_order = mo)
+      relocate(all_of(grps), .before = 1) |>
+      group_by(all_of(grps), maintain_order = mo)
   } else {
     out
   }

diff --git a/R/count.R b/R/count.R
@@ -26,7 +26,7 @@ count.RPolarsDataFrame <- function(x, ..., sort = FALSE, name = "n") {
   out <- count_(x, vars, sort = sort, name = name, new_col = FALSE)
 
   out <- if (is_grouped) {
-    group_by(out, grps, maintain_order = mo)
+    group_by(out, all_of(grps), maintain_order = mo)
   } else {
     out
   }
@@ -51,7 +51,7 @@ add_count.RPolarsDataFrame <- function(x, ..., sort = FALSE, name = "n") {
   out <- count_(x, vars, sort = sort, name = name, new_col = TRUE, missing_name = missing(name))
 
   out <- if (is_grouped) {
-    group_by(out, grps, maintain_order = mo)
+    group_by(out, all_of(grps), maintain_order = mo)
   } else {
     out
   }

diff --git a/R/fill.R b/R/fill.R
@@ -57,7 +57,7 @@ fill.RPolarsDataFrame <- function(data, ..., .direction = c("down", "up", "downu
 
   out <- if (is_grouped) {
     data$with_columns(expr) |>
-      group_by(grps, maintain_order = mo)
+      group_by(all_of(grps), maintain_order = mo)
   } else {
     data$with_columns(expr)
   }

diff --git a/R/filter.R b/R/filter.R
@@ -68,7 +68,7 @@ filter.RPolarsDataFrame <- function(.data, ..., .by = NULL) {
     }
   )
   out <- if (is_grouped && missing(.by)) {
-    group_by(out, grps, maintain_order = mo)
+    group_by(out, all_of(grps), maintain_order = mo)
   } else {
     out
   }

diff --git a/R/funs-default.R b/R/funs-default.R
@@ -230,6 +230,7 @@ pl_between_dplyr <- function(x, left, right, ...) {
 pl_case_match <- function(x, ..., .data) {
   env <- env_from_dots(...)
   new_vars <- new_vars_from_dots(...)
+  caller <- caller_from_dots(...)
   dots <- clean_dots(...)
 
   x <- polars::pl$col(deparse(substitute(x)))
@@ -241,12 +242,30 @@ pl_case_match <- function(x, ..., .data) {
   out <- NULL
   for (y in seq_along(dots)) {
     if (y == length(dots)) {
-      otw <- translate_expr(.data, dots[[y]], new_vars = new_vars, env = env)
+      otw <- translate_expr(
+        .data,
+        dots[[y]],
+        new_vars = new_vars,
+        env = env,
+        caller = caller
+      )
       out <- out$otherwise(otw)
       next
     }
-    lhs <- translate_expr(.data, dots[[y]][[2]], new_vars = new_vars, env = env)
-    rhs <- translate_expr(.data, dots[[y]][[3]], new_vars = new_vars, env = env)
+    lhs <- translate_expr(
+      .data,
+      dots[[y]][[2]],
+      new_vars = new_vars,
+      env = env,
+      caller = caller
+    )
+    rhs <- translate_expr(
+      .data,
+      dots[[y]][[3]],
+      new_vars = new_vars,
+      env = env,
+      caller = caller
+    )
     if (is.null(out)) {
       out <- polars::pl$when(x$is_in(lhs))$then(rhs)
     } else {
@@ -260,6 +279,7 @@ pl_case_match <- function(x, ..., .data) {
 pl_case_when <- function(..., .data) {
   env <- env_from_dots(...)
   new_vars <- new_vars_from_dots(...)
+  caller <- caller_from_dots(...)
   dots <- clean_dots(...)
 
   if (!".default" %in% names(dots)) {
@@ -269,12 +289,30 @@ pl_case_when <- function(..., .data) {
   out <- NULL
   for (y in seq_along(dots)) {
     if (y == length(dots)) {
-      otw <- translate_expr(.data, dots[[y]], new_vars = new_vars, env = env)
+      otw <- translate_expr(
+        .data,
+        dots[[y]],
+        new_vars = new_vars,
+        env = env,
+        caller = caller
+      )
       out <- out$otherwise(otw)
       next
     }
-    lhs <- translate_expr(.data, dots[[y]][[2]], new_vars = new_vars, env = env)
-    rhs <- translate_expr(.data, dots[[y]][[3]], new_vars = new_vars, env = env)
+    lhs <- translate_expr(
+      .data,
+      dots[[y]][[2]],
+      new_vars = new_vars,
+      env = env,
+      caller = caller
+    )
+    rhs <- translate_expr(
+      .data,
+      dots[[y]][[3]],
+      new_vars = new_vars,
+      env = env,
+      caller = caller
+    )
 
     if (is.null(out)) {
       out <- polars::pl$when(lhs)$then(rhs)
@@ -372,10 +410,29 @@ pl_ifelse <- function(cond, yes, no, .data, ...) {
   check_empty_dots(...)
   env <- env_from_dots(...)
   new_vars <- new_vars_from_dots(...)
-
-  cond <- translate_expr(.data, enexpr(cond), new_vars = new_vars, env = env)
-  yes <- translate_expr(.data, enexpr(yes), new_vars = new_vars, env = env)
-  no <- translate_expr(.data, enexpr(no), new_vars = new_vars, env = env)
+  caller <- caller_from_dots(...)
+
+  cond <- translate_expr(
+    .data,
+    enexpr(cond),
+    new_vars = new_vars,
+    env = env,
+    caller = caller
+  )
+  yes <- translate_expr(
+    .data,
+    enexpr(yes),
+    new_vars = new_vars,
+    env = env,
+    caller = caller
+  )
+  no <- translate_expr(
+    .data,
+    enexpr(no),
+    new_vars = new_vars,
+    env = env,
+    caller = caller
+  )
   pl$when(cond)$then(yes)$otherwise(no)
 }
 

diff --git a/R/mutate.R b/R/mutate.R
@@ -164,7 +164,7 @@ mutate.RPolarsDataFrame <- function(
   }
 
   out <- if (is_grouped && missing(.by)) {
-    group_by(.data, grps, maintain_order = mo)
+    group_by(.data, all_of(grps), maintain_order = mo)
   } else if (isTRUE(is_rowwise)) {
     rowwise(.data)
   } else {

diff --git a/R/slice.R b/R/slice.R
@@ -31,7 +31,7 @@ slice_tail.RPolarsDataFrame <- function(.data, ..., n, by = NULL) {
   }
 
   out <- if (is_grouped && missing(by)) {
-    group_by(out, grps, maintain_order = mo)
+    group_by(out, all_of(grps), maintain_order = mo)
   } else {
     out
   }
@@ -61,7 +61,7 @@ slice_head.RPolarsDataFrame <- function(.data, ..., n, by = NULL) {
   }
 
   out <- if (is_grouped && missing(by)) {
-    group_by(out, grps, maintain_order = mo)
+    group_by(out, all_of(grps), maintain_order = mo)
   } else {
     out
   }
@@ -110,7 +110,7 @@ slice_sample.RPolarsDataFrame <- function(.data, ..., n = NULL, prop = NULL, rep
   }
 
   out <- if (is_grouped && missing(by)) {
-    group_by(out, grps, maintain_order = mo)
+    group_by(out, all_of(grps), maintain_order = mo)
   } else {
     out
   }

diff --git a/R/summarize.R b/R/summarize.R
@@ -57,7 +57,7 @@ summarize.RPolarsDataFrame <- function(.data, ..., .by = NULL) {
   }
 
   out <- if (is_grouped && missing(.by)) {
-    group_by(.data, grps, maintain_order = mo)
+    group_by(.data, all_of(grps), maintain_order = mo)
   } else if (isTRUE(is_rowwise)) {
     rowwise(.data)
   } else {

diff --git a/R/tinytest.R b/R/tinytest.R