From d8b628204be0e58fcef125798ab6fadacb139bcb Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Tue, 27 Oct 2026 09:24:05 +0100 Subject: [PATCH 1/5] update to roxygen2 8.1.1 --- DESCRIPTION | 2 +- NAMESPACE | 130 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 78 insertions(+), 54 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6b844a5..3d5701b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,7 +25,6 @@ Description: License: MIT + file LICENSE URL: https://github.com/dynverse/dynutils BugReports: https://github.com/dynverse/dynutils/issues -RoxygenNote: 7.3.2 Depends: R (>= 3.0.0) Imports: @@ -54,3 +53,4 @@ LinkingTo: Encoding: UTF-8 VignetteBuilder: knitr Roxygen: list(markdown = TRUE) +Config/roxygen2/version: 8.1.1 diff --git a/NAMESPACE b/NAMESPACE index 1c00168..cded5ca 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -54,60 +54,84 @@ export(tibble_as_list) export(walkdf) export(write_h5) export(write_h5_) -importFrom(Matrix,Matrix) -importFrom(Matrix,sparseMatrix) -importFrom(Matrix,t) +importFrom(Matrix, + Matrix, + sparseMatrix, + t +) importFrom(Rcpp,evalCpp) -importFrom(assertthat,"%has_name%") -importFrom(assertthat,"on_failure<-") -importFrom(assertthat,assert_that) -importFrom(crayon,bold) -importFrom(crayon,green) -importFrom(crayon,red) +importFrom(assertthat, + "%has_name%", + "on_failure<-", + assert_that +) +importFrom(crayon, + bold, + green, + red +) importFrom(desc,desc) -importFrom(dplyr,enquo) -importFrom(dplyr,n) -importFrom(dplyr,slice) -importFrom(magrittr,"%$%") -importFrom(magrittr,"%<>%") -importFrom(magrittr,set_colnames) -importFrom(magrittr,set_rownames) -importFrom(methods,as) -importFrom(methods,formalArgs) -importFrom(methods,is) -importFrom(methods,new) -importFrom(proxyC,dist) -importFrom(proxyC,simil) -importFrom(purrr,"%>%") -importFrom(purrr,"%||%") -importFrom(purrr,as_mapper) -importFrom(purrr,discard) -importFrom(purrr,keep) -importFrom(purrr,map) -importFrom(purrr,map2) -importFrom(purrr,map_at) -importFrom(purrr,map_chr) -importFrom(purrr,map_dbl) -importFrom(purrr,map_df) -importFrom(purrr,map_dfc) -importFrom(purrr,map_dfr) -importFrom(purrr,map_if) -importFrom(purrr,map_int) -importFrom(purrr,map_lgl) -importFrom(purrr,set_names) -importFrom(purrr,walk) +importFrom(dplyr, + enquo, + n, + slice +) +importFrom(magrittr, + "%$%", + "%<>%", + set_colnames, + set_rownames +) +importFrom(methods, + as, + formalArgs, + is, + new +) +importFrom(proxyC, + dist, + simil +) +importFrom(purrr, + "%>%", + "%||%", + as_mapper, + discard, + keep, + map, + map2, + map_at, + map_chr, + map_dbl, + map_df, + map_dfc, + map_dfr, + map_if, + map_int, + map_lgl, + set_names, + walk +) importFrom(remotes,install_cran) -importFrom(stats,quantile) -importFrom(stats,runif) -importFrom(stringr,str_detect) -importFrom(stringr,str_match) -importFrom(stringr,str_pad) -importFrom(stringr,str_replace) -importFrom(stringr,str_replace_all) -importFrom(stringr,str_subset) -importFrom(tibble,as_tibble) -importFrom(tibble,lst) -importFrom(tibble,tibble) -importFrom(utils,installed.packages) -importFrom(utils,setRepositories) +importFrom(stats, + quantile, + runif +) +importFrom(stringr, + str_detect, + str_match, + str_pad, + str_replace, + str_replace_all, + str_subset +) +importFrom(tibble, + as_tibble, + lst, + tibble +) +importFrom(utils, + installed.packages, + setRepositories +) useDynLib(dynutils) From 188f0438be1d09a187f5d50122b4f87787d523b8 Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Tue, 27 Oct 2026 09:24:05 +0100 Subject: [PATCH 2/5] use _PACKAGE for package docs --- R/package.R | 5 +---- man/{dynutils.Rd => dynutils-package.Rd} | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) rename man/{dynutils.Rd => dynutils-package.Rd} (96%) diff --git a/R/package.R b/R/package.R index 3dfc31f..7b3a78f 100644 --- a/R/package.R +++ b/R/package.R @@ -58,7 +58,4 @@ #' #' @useDynLib dynutils #' @importFrom Rcpp evalCpp -#' -#' @docType package -#' @name dynutils -NULL +"_PACKAGE" diff --git a/man/dynutils.Rd b/man/dynutils-package.Rd similarity index 96% rename from man/dynutils.Rd rename to man/dynutils-package.Rd index a25a9b8..0e435e0 100644 --- a/man/dynutils.Rd +++ b/man/dynutils-package.Rd @@ -1,9 +1,9 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/package.R \docType{package} -\name{dynutils} -\alias{dynutils-package} +\name{dynutils-package} \alias{dynutils} +\alias{dynutils-package} \title{Common functionality for the dynverse packages} \description{ Provides common functionality for the dynverse packages. @@ -113,6 +113,7 @@ Useful links: Authors: \itemize{ + \item Robrecht Cannoodt \email{rcannood@gmail.com} (\href{https://orcid.org/0000-0003-3641-729X}{ORCID}) \item Wouter Saelens \email{wouter.saelens@gmail.com} (\href{https://orcid.org/0000-0002-7114-6248}{ORCID}) } From 64fb166d4092fdc5efcb90f26852f495c1ca60ee Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Tue, 27 Oct 2026 09:24:05 +0100 Subject: [PATCH 3/5] migrate tests to testthat 3e --- DESCRIPTION | 3 +- NEWS.md | 2 + tests/testthat/test-add_class.R | 2 - tests/testthat/test-assertions.R | 2 - tests/testthat/test-calculate_distance.R | 8 +-- tests/testthat/test-calculate_mean.R | 2 - tests/testthat/test-check_packages.R | 2 - tests/testthat/test-expand_matrix.R | 2 - tests/testthat/test-extend_with.R | 10 ++- tests/testthat/test-h5.R | 65 ++++++++++---------- tests/testthat/test-inherit_default_params.R | 2 - tests/testthat/test-mapdf.R | 2 - tests/testthat/test-news.R | 4 +- tests/testthat/test-project_to_segments.R | 2 - tests/testthat/test-random_time_string.R | 2 - tests/testthat/test-safe_tempdir.R | 2 - tests/testthat/test-scaling.R | 34 +++++----- tests/testthat/test-spearman_rank_sparse.R | 4 +- tests/testthat/test-tibble.R | 2 - 19 files changed, 61 insertions(+), 91 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3d5701b..2f7b6df 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -47,10 +47,11 @@ Suggests: hdf5r (>= 1.3.4), knitr, rmarkdown, - testthat + testthat (>= 3.0.0) LinkingTo: Rcpp Encoding: UTF-8 VignetteBuilder: knitr Roxygen: list(markdown = TRUE) +Config/testthat/edition: 3 Config/roxygen2/version: 8.1.1 diff --git a/NEWS.md b/NEWS.md index 9924aaa..509c9ef 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,8 @@ * BUG FIX `calculate_similarity()`, `calculate_distance()`: Fix Spearman correlations of RsparseMatrix, TsparseMatrix and symmetric inputs (PR #37). +* MINOR CHANGE: Update to roxygen2 8.1.1 and testthat 3rd edition (PR #38). + # dynutils 1.0.12 * DOCUMENTATION: Fix roxygen docs (PR #36). diff --git a/tests/testthat/test-add_class.R b/tests/testthat/test-add_class.R index e144c65..ef75785 100644 --- a/tests/testthat/test-add_class.R +++ b/tests/testthat/test-add_class.R @@ -1,5 +1,3 @@ -context("Testing add_class") - test_that("Test add_class", { add1 <- add_class(list(1), "banana") expect_equal(class(add1), c("banana", "list")) diff --git a/tests/testthat/test-assertions.R b/tests/testthat/test-assertions.R index 27800eb..72c2bfe 100644 --- a/tests/testthat/test-assertions.R +++ b/tests/testthat/test-assertions.R @@ -1,5 +1,3 @@ -context("test-assertions") - test_that("is_single_numeric works", { expect_true(is_single_numeric(23)) expect_true(is_single_numeric(182L)) diff --git a/tests/testthat/test-calculate_distance.R b/tests/testthat/test-calculate_distance.R index 6bb6b92..9d5d80e 100644 --- a/tests/testthat/test-calculate_distance.R +++ b/tests/testthat/test-calculate_distance.R @@ -1,5 +1,3 @@ -context("Testing calculate_distance") - check_output <- function(x, y, o, e) { expect_equal(nrow(o), nrow(x)) expect_equal(rownames(o), rownames(x)) @@ -75,7 +73,7 @@ test_that("calculate_distance returns correct solutions", { calculate_distance(x, y, method = n)[1,1] }) - expect_equivalent(observed, expected) + expect_equal(observed, expected, ignore_attr = TRUE) }) @@ -95,7 +93,7 @@ test_that("calculate_similarity returns correct solutions", { calculate_similarity(x, y, method = n)[1,1] }) - expect_equivalent(observed, expected) + expect_equal(observed, expected, ignore_attr = TRUE) }) @@ -188,7 +186,7 @@ test_that("calculate_distance gives the same result for every storage format and test_that(".as_column_vectors reuses the slots of a CSR matrix for margin 1", { x <- as(y_any, "RsparseMatrix") - expect_is(x, "dgRMatrix") + expect_s4_class(x, "dgRMatrix") expect_identical(.as_column_vectors(x, margin = 1), Matrix::t(as(x, "CsparseMatrix"))) expect_identical(.as_column_vectors(x, margin = 2), as(x, "CsparseMatrix")) }) diff --git a/tests/testthat/test-calculate_mean.R b/tests/testthat/test-calculate_mean.R index de6ddeb..567ea12 100644 --- a/tests/testthat/test-calculate_mean.R +++ b/tests/testthat/test-calculate_mean.R @@ -1,5 +1,3 @@ -context("Means") - test_that(paste0("calculate_mean"), { testthat::expect_equal(calculate_arithmetic_mean(0.5, 0.6, 0.7), 0.6) testthat::expect_equal(calculate_harmonic_mean(0.5, 1, 1), 0.75) diff --git a/tests/testthat/test-check_packages.R b/tests/testthat/test-check_packages.R index 6491a04..eccf77b 100644 --- a/tests/testthat/test-check_packages.R +++ b/tests/testthat/test-check_packages.R @@ -1,5 +1,3 @@ -context("Testing check_packages") - test_that("Test check_packages", { check <- check_packages(c("dplyr", "dynutils", "jhrveioohvovwhrei", "ijewiojwijoweew")) expect_equal(check, c(dplyr = TRUE, dynutils = TRUE, jhrveioohvovwhrei = FALSE, ijewiojwijoweew = FALSE)) diff --git a/tests/testthat/test-expand_matrix.R b/tests/testthat/test-expand_matrix.R index 0c731ee..816f52b 100644 --- a/tests/testthat/test-expand_matrix.R +++ b/tests/testthat/test-expand_matrix.R @@ -1,5 +1,3 @@ -context("Testing expand_matrix") - test_that("Test expand_matrix", { mat <- matrix(runif(12), nrow = 3, dimnames = list(letters[1:3], LETTERS[1:4])) mat2 <- expand_matrix(mat, rownames = letters[1:6], colnames = LETTERS[1:5], fill = 1) diff --git a/tests/testthat/test-extend_with.R b/tests/testthat/test-extend_with.R index 46e3dd7..5c0c763 100644 --- a/tests/testthat/test-extend_with.R +++ b/tests/testthat/test-extend_with.R @@ -1,5 +1,3 @@ -context("Testing extend_with") - test_that("Test extend_with", { orig_list <- list(a = 1, b = 2) @@ -8,8 +6,8 @@ test_that("Test extend_with", { list(b = "3", c = list(1)) ) - testthat::expect_is(new_list, "extension") - testthat::expect_is(new_list, "list") + testthat::expect_s3_class(new_list, "extension") + testthat::expect_type(new_list, "list") testthat::expect_equal(length(new_list), 3) testthat::expect_equal(new_list$a, 1) @@ -26,8 +24,8 @@ test_that("Test extend_with with ... functionality", { c = "10" ) - testthat::expect_is(new_list, "extension2") - testthat::expect_is(new_list, "list") + testthat::expect_s3_class(new_list, "extension2") + testthat::expect_type(new_list, "list") testthat::expect_equal(length(new_list), 3) testthat::expect_equal(new_list$a, 1) diff --git a/tests/testthat/test-h5.R b/tests/testthat/test-h5.R index d845331..0a3bd00 100644 --- a/tests/testthat/test-h5.R +++ b/tests/testthat/test-h5.R @@ -1,47 +1,46 @@ -context("Testing write_h5 and read_h5") - -if (require("hdf5r")) { +test_that("write_h5 and read_h5 works", { + skip_if_not_installed("hdf5r") obj <- get_h5_test_data() - test_that("write_h5 and read_h5 works", { - file <- tempfile() - on.exit(file.remove(file)) + file <- tempfile() + on.exit(file.remove(file)) - write_h5(obj, file) + write_h5(obj, file) - obj2 <- read_h5(file) + obj2 <- read_h5(file) - testthat::expect_equivalent(obj2, obj) - }) + expect_equal(obj2, obj, ignore_attr = TRUE) +}) - test_that("test_h5_installation works", { - expect_true(test_h5_installation()) - expect_message(test_h5_installation(detailed = TRUE), "HDF5 test successful") +test_that("test_h5_installation works", { + skip_if_not_installed("hdf5r") - expect_output(expect_error(test_h5_installation_write(detailed = TRUE, obj = list(x = print)))) - expect_output(expect_error(test_h5_installation_read(detailed = TRUE, file = tempfile()))) - expect_output(expect_error(test_h5_installation_equal(detailed = TRUE, obj = 1, obj2 = 2))) - }) + expect_true(test_h5_installation()) + expect_message(test_h5_installation(detailed = TRUE), "HDF5 test successful") - test_that("is_sparse works", { - expect_false(is_sparse(matrix(c(1:10)))) + expect_output(expect_error(test_h5_installation_write(detailed = TRUE, obj = list(x = print)))) + expect_output(expect_error(test_h5_installation_read(detailed = TRUE, file = tempfile()))) + expect_output(expect_error(test_h5_installation_equal(detailed = TRUE, obj = 1, obj2 = 2))) +}) - m <- Matrix::Matrix(matrix(c(1:10)), sparse = FALSE) - expect_false(is_sparse(m)) - expect_true(is_sparse(methods::as(m, "CsparseMatrix"))) - expect_false(is_sparse(methods::as(m, "denseMatrix"))) - }) +test_that("is_sparse works", { + expect_false(is_sparse(matrix(c(1:10)))) + m <- Matrix::Matrix(matrix(c(1:10)), sparse = FALSE) + expect_false(is_sparse(m)) + expect_true(is_sparse(methods::as(m, "CsparseMatrix"))) + expect_false(is_sparse(methods::as(m, "denseMatrix"))) +}) - test_that("errors gracefully", { - file <- tempfile() - on.exit(file.remove(file)) +test_that("errors gracefully", { + skip_if_not_installed("hdf5r") - h5file <- hdf5r::H5File$new(file, mode = "w") - h5file[["a"]] <- 1 - h5file$close_all() + file <- tempfile() + on.exit(file.remove(file)) - expect_error(read_h5(file), regexp = "Object class not found") - }) + h5file <- hdf5r::H5File$new(file, mode = "w") + h5file[["a"]] <- 1 + h5file$close_all() -} + expect_error(read_h5(file), regexp = "Object class not found") +}) diff --git a/tests/testthat/test-inherit_default_params.R b/tests/testthat/test-inherit_default_params.R index a96b9a9..0fa40ca 100644 --- a/tests/testthat/test-inherit_default_params.R +++ b/tests/testthat/test-inherit_default_params.R @@ -1,5 +1,3 @@ -context("Testing inherit_default_params") - fun1 <- function(a = 10, b = 7) { runif(a, -b, b) } diff --git a/tests/testthat/test-mapdf.R b/tests/testthat/test-mapdf.R index 24e186e..3f4c206 100644 --- a/tests/testthat/test-mapdf.R +++ b/tests/testthat/test-mapdf.R @@ -1,5 +1,3 @@ -context("Testing mapdf functions") - tib <- tibble( a = c(1, 2), b = list(log10, sqrt), diff --git a/tests/testthat/test-news.R b/tests/testthat/test-news.R index d0ad458..c48108d 100644 --- a/tests/testthat/test-news.R +++ b/tests/testthat/test-news.R @@ -1,5 +1,3 @@ -context("Testing news helpers") - dir_loc <- tempfile() dir.create(dir_loc) dir.create(paste0(dir_loc, "/inst")) @@ -32,7 +30,7 @@ test_that("update_news works", { recent_news <- recent_news(path = dir_loc, 2) # check contents - expect_is(recent_news, "character") + expect_type(recent_news, "character") expect_true(any(grepl("testing 0.1.1", recent_news))) expect_false(any(grepl("testing 0.0.1", recent_news))) }) diff --git a/tests/testthat/test-project_to_segments.R b/tests/testthat/test-project_to_segments.R index c353014..db80fb3 100644 --- a/tests/testthat/test-project_to_segments.R +++ b/tests/testthat/test-project_to_segments.R @@ -1,5 +1,3 @@ -context("Test project_to_segments") - segment_points <- cbind( c(0, 1, 2, 0, -2, -1, 0), c(1, 2, 1, -1, 1, 2, 1) diff --git a/tests/testthat/test-random_time_string.R b/tests/testthat/test-random_time_string.R index 0aad997..5f059b3 100644 --- a/tests/testthat/test-random_time_string.R +++ b/tests/testthat/test-random_time_string.R @@ -1,5 +1,3 @@ -context("Random time string helper") - test_that("Generating random strings", { random_strings <- sapply(seq_len(1000), function(x) random_time_string()) expect_equal(length(unique(random_strings)), length(random_strings)) diff --git a/tests/testthat/test-safe_tempdir.R b/tests/testthat/test-safe_tempdir.R index 1b99773..57189c6 100644 --- a/tests/testthat/test-safe_tempdir.R +++ b/tests/testthat/test-safe_tempdir.R @@ -1,5 +1,3 @@ -context("Testing safe_tempdir") - test_that("safe_tempdir works correctly", { dir1 <- safe_tempdir("mydir") dir2 <- safe_tempdir("mydir") diff --git a/tests/testthat/test-scaling.R b/tests/testthat/test-scaling.R index 34b4422..a331dd2 100644 --- a/tests/testthat/test-scaling.R +++ b/tests/testthat/test-scaling.R @@ -1,5 +1,3 @@ -context("Scaling") - test_that("Testing scale_uniform", { # generate some random data num_samples <- 40 @@ -10,7 +8,7 @@ test_that("Testing scale_uniform", { data_sc <- scale_uniform(data, center = 0, max_range = 1) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal(max(ranges[2,] - ranges[1,]), 1) @@ -25,7 +23,7 @@ test_that("Testing scale_uniform", { data_sc <- scale_uniform(data, center = 10, max_range = 1000) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal(max(ranges[2,] - ranges[1,]), 1000) @@ -43,7 +41,7 @@ test_that("Testing scale_uniform with edge case", { data_sc <- scale_uniform(data, center = 0, max_range = 1) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal(max(ranges[2,] - ranges[1,]), 0) # 0 because only 1 sample @@ -57,7 +55,7 @@ test_that("Testing scale_uniform with edge case", { data_sc <- scale_uniform(data, center = 10, max_range = 1000) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal(max(ranges[2,] - ranges[1,]), 0) # 0 because only 1 sample @@ -73,7 +71,7 @@ test_that("Testing scale_uniform with another edge case", { data_sc <- scale_uniform(data, center = 0, max_range = 1) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal(max(ranges[2,] - ranges[1,]), 1) @@ -87,7 +85,7 @@ test_that("Testing scale_uniform with another edge case", { data_sc <- scale_uniform(data, center = 10, max_range = 1000) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal(max(ranges[2,] - ranges[1,]), 1000) @@ -102,7 +100,7 @@ test_that("Testing scale_uniform with vector", { data_sc <- scale_uniform(data, center = 0, max_range = 1) ranges <- range(data_sc) - expect_is( data_sc, "numeric" ) + expect_type(data_sc, "double") expect_equal( length(data_sc), length(data) ) expect_equal(max(ranges[[2]] - ranges[[1]]), 1) expect_equal(mean(ranges), 0) @@ -115,7 +113,7 @@ test_that("Testing scale_uniform with vector", { data_sc <- scale_uniform(data, center = 10, max_range = 1000) ranges <- range(data_sc) - expect_is( data_sc, "numeric" ) + expect_type(data_sc, "double") expect_equal( length(data_sc), length(data) ) expect_equal(max(ranges[[2]] - ranges[[1]]), 1000) expect_equal(mean(ranges), 10) @@ -136,7 +134,7 @@ test_that("Testing scale_quantile", { data_sc <- scale_quantile(data, outlier_cutoff = 0.05) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal( ranges, matrix(rep(c(0, 1), num_dims), ncol = num_dims, dimnames = list(NULL, colnames(data))) ) @@ -150,7 +148,7 @@ test_that("Testing scale_quantile", { data_sc <- scale_quantile(data, outlier_cutoff = 0) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal( ranges, matrix(rep(c(0, 1), num_dims), ncol = num_dims, dimnames = list(NULL, colnames(data))) ) @@ -168,7 +166,7 @@ test_that("Testing scale_quantile with edge case", { data_sc <- scale_quantile(data, outlier_cutoff = 0.05) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal( ranges, matrix(rep(c(0, 0), num_dims), ncol = num_dims) ) @@ -181,7 +179,7 @@ test_that("Testing scale_quantile with edge case", { data_sc <- scale_quantile(data, outlier_cutoff = 0) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal( ranges, matrix(rep(c(0, 0), num_dims), ncol = num_dims) ) @@ -199,7 +197,7 @@ test_that("Testing scale_quantile with another edge case", { data_sc <- scale_quantile(data, outlier_cutoff = 0.05) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal( ranges, matrix(rep(c(0, 1), num_dims), ncol = num_dims) ) @@ -212,7 +210,7 @@ test_that("Testing scale_quantile with another edge case", { data_sc <- scale_quantile(data, outlier_cutoff = 0) ranges <- apply(data_sc, 2, range) - expect_is( data_sc, "matrix" ) + expect_true(is.matrix(data_sc)) expect_equal( nrow(data_sc), nrow(data) ) expect_equal( ncol(data_sc), ncol(data) ) expect_equal( ranges, matrix(rep(c(0, 1), num_dims), ncol = num_dims) ) @@ -230,7 +228,7 @@ test_that("Testing scale_quantile with a vector", { data_sc <- scale_quantile(data, outlier_cutoff = 0.05) ranges <- range(data_sc) - expect_is( data_sc, "numeric" ) + expect_type(data_sc, "double") expect_equal( length(data_sc), length(data) ) expect_equal( ranges, c(0, 1) ) @@ -242,7 +240,7 @@ test_that("Testing scale_quantile with a vector", { data_sc <- scale_quantile(data, outlier_cutoff = 0) ranges <- range(data_sc) - expect_is( data_sc, "numeric" ) + expect_type(data_sc, "double") expect_equal( length(data_sc), length(data) ) expect_equal( ranges, c(0, 1) ) diff --git a/tests/testthat/test-spearman_rank_sparse.R b/tests/testthat/test-spearman_rank_sparse.R index 9227b70..86c67de 100644 --- a/tests/testthat/test-spearman_rank_sparse.R +++ b/tests/testthat/test-spearman_rank_sparse.R @@ -1,5 +1,3 @@ -context("Testing spearman_rank_sparse()") - r_control_implementation <- function(x, p, nr) { y <- x for (i in seq_len(length(p) - 1)) { @@ -46,7 +44,7 @@ test_that("spearman_rank_sparse works as intended with small example", { out2 <- r_control_implementation(x, p, nr) - expect_equivalent(out1, out2) + expect_equal(out1, out2, ignore_attr = TRUE) }) test_that("spearman_rank_sparse works as intended with another example", { diff --git a/tests/testthat/test-tibble.R b/tests/testthat/test-tibble.R index 0436a93..11f2deb 100644 --- a/tests/testthat/test-tibble.R +++ b/tests/testthat/test-tibble.R @@ -1,5 +1,3 @@ -context("Testing tibble helpers") - li <- list( list(a = 1, b = log10, c = "parrot", d = c(1L, 2L, 3L)) %>% add_class("myobject"), list(a = 2, b = sqrt, c = "quest", d = c("a", "b", "c")) %>% add_class("yourobject"), From 750eb21795b8862f550500fa0d5162518292083c Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Tue, 27 Oct 2026 09:24:05 +0100 Subject: [PATCH 4/5] sync check workflow with r-lib template --- .github/workflows/R-CMD-check.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 562fe0f..73bfb21 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -30,7 +30,7 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: r-lib/actions/setup-pandoc@v2 @@ -38,7 +38,6 @@ jobs: with: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} - use-public-rspm: true - uses: r-lib/actions/setup-r-dependencies@v2 with: From 402af25acd1caa9a6725611f22b539c9a7828fcf Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Tue, 27 Oct 2026 10:05:02 +0100 Subject: [PATCH 5/5] bump actions/checkout to v7 --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 73bfb21..e579355 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -30,7 +30,7 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: r-lib/actions/setup-pandoc@v2