Merge branch 'datashield:v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/standardise-df

Author: StuartWheater

DESCRIPTION

@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
                     comment = c(ORCID = "0009-0003-2419-1964")))
 License: GPL-3
 Depends:
-    R (>= 4.0.0),
+    R (>= 4.1.0),
     DSI (>= 1.7.1)
 Imports:
     fields,

tests/testthat/perf_files/armadillo_hp-laptop-quay_perf-profile.csv

@@ -3,8 +3,8 @@
 "ds.abs::perf::0","2.473","0.5","2"
 "ds.asCharacter::perf::0","2.295","0.5","2"
 "ds.asDataMatrix::perf::0","1.999","0.5","2"
-"ds.asInteger::perf:0","1.148","0.5","2"
-"ds.asList::perf:0","3.398","0.5","2"
+"ds.asInteger::perf:0","2.221","0.5","2"
+"ds.asList::perf:0","4.880","0.5","2"
 "ds.asLogical::perf::0","1.660","0.5","2"
 "ds.asMatrix::perf::0","1.835","0.5","2"
 "ds.asNumeric::perf:0","1.632","0.5","2"
@@ -27,4 +27,4 @@
 "ds.sqrt::perf::0","2.278","0.5","2"
 "ds.standardiseDf:::perf::0","9.50","0.5","2"
 "ds.unique::perf::combine:0","3.909","0.5","2"
-"void::perf::void::0","20280.0","0.5","2"
+"void::perf::void::0","20280.0","0.5","2"

tests/testthat/test-smk-ds.standardiseDf.R

@@ -104,7 +104,7 @@ test_that(".stop_if_cols_identical doesn't throw error if data frames have diffe
 
 test_that(".get_var_classes returns correct output", {
 
-  expected <- tibble(
+  expected <- data.frame(
     server = c("sim1", "sim2", "sim3"),
     fac_col1 = c("factor", "factor", "factor"),
     fac_col2 = c("factor", "factor", "factor"),
@@ -124,10 +124,11 @@ test_that(".get_var_classes returns correct output", {
     col11 = c(NA, NA, "integer"),
     col14 = c(NA, NA, "logical"),
     col17 = c(NA, NA, "character"),
-    col20 = c(NA, NA, "numeric")
+    col20 = c(NA, NA, "numeric"),
+    stringsAsFactors = FALSE
   )
 
-  expect_equal(var_class, expected)
+  expect_equal(as.data.frame(var_class), expected)
 
 })
 
@@ -207,9 +208,10 @@ test_that("prompt_user_class_decision_all_vars returns correct value", {
       prompt_user_class_decision_all_vars(
         vars = c("test_var_1", "test_var_2"),
         all_servers = c("sim2", "sim2", "sim3"),
-        all_classes = tibble(
+        all_classes = data.frame(
           test_var_1 = c("numeric", "character", "factor"),
-          test_var_2 = c("logical", "integer", "factor")
+          test_var_2 = c("logical", "integer", "factor"),
+          stringsAsFactors = FALSE
         ),
         "test_df",
         conns),