fix unit-test cases

single-cell-data · Oct 16, 2024 · 42c8e3c · 42c8e3c
1 parent 5e9ebc0
commit 42c8e3c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/apis/r/R/SOMANDArrayBase.R b/apis/r/R/SOMANDArrayBase.R
@@ -102,7 +102,7 @@ SOMANDArrayBase <- R6::R6Class(
     resize = function(new_shape) {
       stopifnot(
         "resize is not supported for dense arrays until tiledbsoma 1.15" =
-          .dense_arrays_can_have_current_domain || private$.is_sparse,
+          .dense_arrays_can_have_current_domain() || private$.is_sparse,
         "'new_shape' must be a vector of integerish values, of the same length as maxshape" =
         rlang::is_integerish(new_shape, n = self$ndim()) ||
           (bit64::is.integer64(new_shape) && length(new_shape) == self$ndim())
@@ -119,7 +119,7 @@ SOMANDArrayBase <- R6::R6Class(
     tiledbsoma_upgrade_shape = function(shape) {
       stopifnot(
         "tiledbsoma_upgrade_shape is not supported for dense arrays until tiledbsoma 1.15" =
-          .dense_arrays_can_have_current_domain || private$.is_sparse,
+          .dense_arrays_can_have_current_domain() || private$.is_sparse,
         "'shape' must be a vector of integerish values, of the same length as maxshape" =
         rlang::is_integerish(shape, n = self$ndim()) ||
           (bit64::is.integer64(shape) && length(shape) == self$ndim())

diff --git a/apis/r/tests/testthat/test-shape.R b/apis/r/tests/testthat/test-shape.R
@@ -434,7 +434,8 @@ test_that("SOMASparseNDArray shape", {
 
       # Test resize up
       new_shape <- c(500, 600)
-      expect_no_error(ndarray$resize(new_shape))
+      ####expect_no_error(ndarray$resize(new_shape))
+      ndarray$resize(new_shape)
 
       # Test writes within new bounds
       soma_dim_0 <- c(200,300)
@@ -479,7 +480,11 @@ test_that("SOMADenseNDArray shape", {
     expect_equal(length(readback_shape), length(readback_maxshape))
 
     if (.new_shape_feature_flag_is_enabled()) {
-      expect_true(all(readback_shape < readback_maxshape))
+      if (.dense_arrays_can_have_current_domain()) {
+        expect_true(all(readback_shape < readback_maxshape))
+      } else {
+        expect_true(all(readback_shape == readback_maxshape))
+      }
     } else {
       expect_true(all(readback_shape == readback_maxshape))
     }