From 100a425583204b0fe839900158cfe2296091ade8 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 18 Feb 2026 19:41:35 +0000
Subject: [PATCH 1/3] GH-48145: [R] Update to testthat 3.3.0 and use its
 expect_r6_class()

Generated-by: Claude
---
 r/DESCRIPTION                         | 2 +-
 r/tests/testthat/helper-expectation.R | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/r/DESCRIPTION b/r/DESCRIPTION
index d5c78fdaebe..5e678466ddf 100644
--- a/r/DESCRIPTION
+++ b/r/DESCRIPTION
@@ -68,7 +68,7 @@ Suggests:
     stringi,
     stringr,
     sys,
-    testthat (>= 3.1.0),
+    testthat (>= 3.3.0),
     tibble,
     tzdb,
     withr
diff --git a/r/tests/testthat/helper-expectation.R b/r/tests/testthat/helper-expectation.R
index df7d94138cc..a638905c7d5 100644
--- a/r/tests/testthat/helper-expectation.R
+++ b/r/tests/testthat/helper-expectation.R
@@ -24,11 +24,6 @@ expect_equal_data_frame <- function(x, y, ...) {
   expect_equal(as.data.frame(x), as.data.frame(y), ...)
 }
 
-expect_r6_class <- function(object, class) {
-  expect_s3_class(object, class)
-  expect_s3_class(object, "R6")
-}
-
 #' Mask `testthat::expect_equal()` in order to compare ArrowObjects using their
 #' `Equals` methods from the C++ library.
 expect_equal <- function(object, expected, ignore_attr = FALSE, ..., info = NULL, label = NULL) {

From 0aa1b77900baafa25516840ce6d81c433f03db9b Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 18 Feb 2026 19:54:10 +0000
Subject: [PATCH 2/3] GH-48145: [R] Use new testthat 3.3.0 expectations

- Replace expect_true(all(...)) with expect_all_true()
- Replace expect_false(any(...)) with expect_all_false()
- Replace expect_identical(dim(...), c(...)) with expect_shape()

Generated-by: Claude
---
 r/tests/testthat/test-Array.R               | 2 +-
 r/tests/testthat/test-RecordBatch.R         | 5 ++---
 r/tests/testthat/test-Table.R               | 2 +-
 r/tests/testthat/test-chunked-array.R       | 4 +---
 r/tests/testthat/test-compute-aggregate.R   | 2 +-
 r/tests/testthat/test-compute-no-bindings.R | 4 ++--
 r/tests/testthat/test-dataset.R             | 6 +++---
 r/tests/testthat/test-duckdb.R              | 4 ++--
 r/tests/testthat/test-memory-pool.R         | 2 +-
 r/tests/testthat/test-udf.R                 | 2 +-
 10 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/r/tests/testthat/test-Array.R b/r/tests/testthat/test-Array.R
index 96e80a499ae..03387f506fc 100644
--- a/r/tests/testthat/test-Array.R
+++ b/r/tests/testthat/test-Array.R
@@ -332,7 +332,7 @@ test_that("Timezone handling in Arrow roundtrip (ARROW-3543)", {
   )
   if (!identical(Sys.timezone(), "Pacific/Marquesas")) {
     # Confirming that the columns are in fact different
-    expect_false(any(df$no_tz == df$yes_tz))
+    expect_all_false(df$no_tz == df$yes_tz)
   }
   feather_file <- tempfile()
   on.exit(unlink(feather_file))
diff --git a/r/tests/testthat/test-RecordBatch.R b/r/tests/testthat/test-RecordBatch.R
index 5c9f3bc7b3c..aeae1165a9d 100644
--- a/r/tests/testthat/test-RecordBatch.R
+++ b/r/tests/testthat/test-RecordBatch.R
@@ -204,7 +204,7 @@ test_that("[[<- assignment", {
   # can use $
   batch$new <- NULL
   expect_null(as.vector(batch$new))
-  expect_identical(dim(batch), c(10L, 4L))
+  expect_shape(batch, nrow = 10L, ncol = 4L)
 
   batch$int <- 1:10
   expect_as_vector(batch$int, 1:10)
@@ -328,8 +328,7 @@ test_that("record_batch(schema=) does some basic consistency checking of the sch
 
 test_that("RecordBatch dim() and nrow() (ARROW-3816)", {
   batch <- record_batch(x = 1:10, y = 1:10)
-  expect_equal(dim(batch), c(10L, 2L))
-  expect_equal(nrow(batch), 10L)
+  expect_shape(batch, nrow = 10L, ncol = 2L)
 })
 
 test_that("record_batch() handles Array", {
diff --git a/r/tests/testthat/test-Table.R b/r/tests/testthat/test-Table.R
index e95915bcdd8..e2b98b10215 100644
--- a/r/tests/testthat/test-Table.R
+++ b/r/tests/testthat/test-Table.R
@@ -144,7 +144,7 @@ test_that("[[<- assignment", {
   # can use $
   tab$new <- NULL
   expect_null(as.vector(tab$new))
-  expect_identical(dim(tab), c(10L, 4L))
+  expect_shape(tab, nrow = 10L, ncol = 4L)
 
   tab$int <- 1:10
   expect_as_vector(tab$int, 1:10)
diff --git a/r/tests/testthat/test-chunked-array.R b/r/tests/testthat/test-chunked-array.R
index 75c9bf18110..bcadaa889f9 100644
--- a/r/tests/testthat/test-chunked-array.R
+++ b/r/tests/testthat/test-chunked-array.R
@@ -391,9 +391,7 @@ test_that("ChunkedArray$View() (ARROW-6542)", {
   b <- a$View(float32())
   expect_equal(b$type, float32())
   expect_equal(length(b), 7L)
-  expect_true(all(
-    sapply(b$chunks, function(.x) .x$type == float32())
-  ))
+  expect_all_true(sapply(b$chunks, function(.x) .x$type == float32()))
   # Input validation
   expect_error(a$View("not a type"), "type must be a DataType, not character")
 })
diff --git a/r/tests/testthat/test-compute-aggregate.R b/r/tests/testthat/test-compute-aggregate.R
index 090a31b8056..dd79682361b 100644
--- a/r/tests/testthat/test-compute-aggregate.R
+++ b/r/tests/testthat/test-compute-aggregate.R
@@ -20,7 +20,7 @@ test_that("list_compute_functions", {
   expect_false(all(grepl("min", allfuncs)))
   justmins <- list_compute_functions("^min")
   expect_true(length(justmins) > 0)
-  expect_true(all(grepl("min", justmins)))
+  expect_all_true(grepl("min", justmins))
   no_hash_funcs <- list_compute_functions("^hash")
   expect_true(length(no_hash_funcs) == 0)
 })
diff --git a/r/tests/testthat/test-compute-no-bindings.R b/r/tests/testthat/test-compute-no-bindings.R
index 8959a308596..02827bffada 100644
--- a/r/tests/testthat/test-compute-no-bindings.R
+++ b/r/tests/testthat/test-compute-no-bindings.R
@@ -127,8 +127,8 @@ test_that("non-bound compute kernels using PartitionNthOptions", {
   )
   # Order of indices on either side of the pivot is not deterministic
   # (depends on C++ standard library implementation)
-  expect_true(all(as.vector(result[1:3]) < 3))
-  expect_true(all(as.vector(result[4:10]) >= 3))
+  expect_all_true(as.vector(result[1:3]) < 3)
+  expect_all_true(as.vector(result[4:10]) >= 3)
 })
 
 
diff --git a/r/tests/testthat/test-dataset.R b/r/tests/testthat/test-dataset.R
index 31457eee8a3..32df8e9f743 100644
--- a/r/tests/testthat/test-dataset.R
+++ b/r/tests/testthat/test-dataset.R
@@ -51,7 +51,7 @@ test_that("IPC/Feather format data", {
   expect_r6_class(ds$format, "IpcFileFormat")
   expect_r6_class(ds$filesystem, "LocalFileSystem")
   expect_named(ds, c(names(df1), "part"))
-  expect_identical(dim(ds), c(20L, 7L))
+  expect_shape(ds, nrow = 20L, ncol = 7L)
 
   expect_equal(
     ds |>
@@ -370,12 +370,12 @@ test_that("Can set schema on dataset", {
 
 test_that("as.data.frame.Dataset", {
   ds <- open_dataset(dataset_dir, partitioning = schema(part = uint8()))
-  expect_identical(dim(as.data.frame(ds)), c(20L, 7L))
+  expect_shape(as.data.frame(ds), nrow = 20L, ncol = 7L)
 })
 
 test_that("dim method returns the correct number of rows and columns", {
   ds <- open_dataset(dataset_dir, partitioning = schema(part = uint8()))
-  expect_identical(dim(ds), c(20L, 7L))
+  expect_shape(ds, nrow = 20L, ncol = 7L)
 })
 
 test_that("dimnames, colnames on Dataset objects", {
diff --git a/r/tests/testthat/test-duckdb.R b/r/tests/testthat/test-duckdb.R
index 390aa09a508..4bc3e642c42 100644
--- a/r/tests/testthat/test-duckdb.R
+++ b/r/tests/testthat/test-duckdb.R
@@ -223,10 +223,10 @@ test_that("Joining, auto-cleanup enabled", {
   expect_identical(dim(res), c(9L, 14L))
 
   # clean up cleans up the tables
-  expect_true(all(c(table_one_name, table_two_name) %in% duckdb::duckdb_list_arrow(con)))
+  expect_all_true(c(table_one_name, table_two_name) %in% duckdb::duckdb_list_arrow(con))
   rm(table_one, table_two)
   gc()
-  expect_false(any(c(table_one_name, table_two_name) %in% duckdb::duckdb_list_arrow(con)))
+  expect_all_false(c(table_one_name, table_two_name) %in% duckdb::duckdb_list_arrow(con))
 })
 
 test_that("Joining, auto-cleanup disabled", {
diff --git a/r/tests/testthat/test-memory-pool.R b/r/tests/testthat/test-memory-pool.R
index 0aa18aadc20..e3adeb675fe 100644
--- a/r/tests/testthat/test-memory-pool.R
+++ b/r/tests/testthat/test-memory-pool.R
@@ -22,5 +22,5 @@ test_that("default_memory_pool and its attributes", {
   expect_type(pool$max_memory, "double")
   expect_true(pool$backend_name %in% c("system", "jemalloc", "mimalloc"))
 
-  expect_true(all(supported_memory_backends() %in% c("system", "jemalloc", "mimalloc")))
+  expect_all_true(supported_memory_backends() %in% c("system", "jemalloc", "mimalloc"))
 })
diff --git a/r/tests/testthat/test-udf.R b/r/tests/testthat/test-udf.R
index b071cdda9ee..2eadd87444b 100644
--- a/r/tests/testthat/test-udf.R
+++ b/r/tests/testthat/test-udf.R
@@ -17,7 +17,7 @@
 
 test_that("list_compute_functions() works", {
   expect_type(list_compute_functions(), "character")
-  expect_true(all(!grepl("^hash_", list_compute_functions())))
+  expect_all_false(grepl("^hash_", list_compute_functions()))
 })
 
 test_that("arrow_scalar_function() works", {

From a724e739221c989def4c01e1877e0e0d017b3849 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 18 Feb 2026 20:08:03 +0000
Subject: [PATCH 3/3] Fix expect_shape() to use dim parameter

Generated-by: Claude
---
 r/tests/testthat/test-RecordBatch.R | 4 ++--
 r/tests/testthat/test-Table.R       | 2 +-
 r/tests/testthat/test-dataset.R     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/r/tests/testthat/test-RecordBatch.R b/r/tests/testthat/test-RecordBatch.R
index aeae1165a9d..dbb21c06568 100644
--- a/r/tests/testthat/test-RecordBatch.R
+++ b/r/tests/testthat/test-RecordBatch.R
@@ -204,7 +204,7 @@ test_that("[[<- assignment", {
   # can use $
   batch$new <- NULL
   expect_null(as.vector(batch$new))
-  expect_shape(batch, nrow = 10L, ncol = 4L)
+  expect_shape(batch, dim = c(10L, 4L))
 
   batch$int <- 1:10
   expect_as_vector(batch$int, 1:10)
@@ -328,7 +328,7 @@ test_that("record_batch(schema=) does some basic consistency checking of the sch
 
 test_that("RecordBatch dim() and nrow() (ARROW-3816)", {
   batch <- record_batch(x = 1:10, y = 1:10)
-  expect_shape(batch, nrow = 10L, ncol = 2L)
+  expect_shape(batch, dim = c(10L, 2L))
 })
 
 test_that("record_batch() handles Array", {
diff --git a/r/tests/testthat/test-Table.R b/r/tests/testthat/test-Table.R
index e2b98b10215..1ca8832beb8 100644
--- a/r/tests/testthat/test-Table.R
+++ b/r/tests/testthat/test-Table.R
@@ -144,7 +144,7 @@ test_that("[[<- assignment", {
   # can use $
   tab$new <- NULL
   expect_null(as.vector(tab$new))
-  expect_shape(tab, nrow = 10L, ncol = 4L)
+  expect_shape(tab, dim = c(10L, 4L))
 
   tab$int <- 1:10
   expect_as_vector(tab$int, 1:10)
diff --git a/r/tests/testthat/test-dataset.R b/r/tests/testthat/test-dataset.R
index 32df8e9f743..a64ea4cc47f 100644
--- a/r/tests/testthat/test-dataset.R
+++ b/r/tests/testthat/test-dataset.R
@@ -51,7 +51,7 @@ test_that("IPC/Feather format data", {
   expect_r6_class(ds$format, "IpcFileFormat")
   expect_r6_class(ds$filesystem, "LocalFileSystem")
   expect_named(ds, c(names(df1), "part"))
-  expect_shape(ds, nrow = 20L, ncol = 7L)
+  expect_shape(ds, dim = c(20L, 7L))
 
   expect_equal(
     ds |>
@@ -370,12 +370,12 @@ test_that("Can set schema on dataset", {
 
 test_that("as.data.frame.Dataset", {
   ds <- open_dataset(dataset_dir, partitioning = schema(part = uint8()))
-  expect_shape(as.data.frame(ds), nrow = 20L, ncol = 7L)
+  expect_shape(as.data.frame(ds), dim = c(20L, 7L))
 })
 
 test_that("dim method returns the correct number of rows and columns", {
   ds <- open_dataset(dataset_dir, partitioning = schema(part = uint8()))
-  expect_shape(ds, nrow = 20L, ncol = 7L)
+  expect_shape(ds, dim = c(20L, 7L))
 })
 
 test_that("dimnames, colnames on Dataset objects", {