Merge branch 'main' into feature/voice-allocator

flucoma · Jul 17, 2024 · a2d385e · a2d385e
2 parents 17a49b2 + aa4f560
commit a2d385e
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/tests/data/TestFluidTensor.cpp b/tests/data/TestFluidTensor.cpp
@@ -20,7 +20,7 @@ TEST_CASE("FluidTensor can be created from a list of dimenions","[FluidTensor]")
 
     REQUIRE(x.size() == 3);     
     REQUIRE(x.rows() == 3); 
-    REQUIRE(x.cols() == 1); 
+    // REQUIRE(x.cols() == 1); 
     REQUIRE(std::distance(x.begin(),x.end()) == x.size()); 
   }
   SECTION("2D creation reports correct sizes"){
@@ -31,15 +31,15 @@ TEST_CASE("FluidTensor can be created from a list of dimenions","[FluidTensor]")
     REQUIRE(x.cols() == 2); 
     REQUIRE(std::distance(x.begin(),x.end()) == x.size()); 
   }
-  // SECTION("3D creation reports correct sizes"){
-  //   const FluidTensor<int,3> x(fluid::FluidDefaultAllocator(), 3,2,5); 
+  SECTION("3D creation reports correct sizes"){
+    const FluidTensor<int,3> x(3,2,5); 
 
-  //   REQUIRE(x.size() == (3 * 2 * 5));     
-  //   REQUIRE(x.rows() == 3); 
-  //   REQUIRE(x.cols() == 2); 
-  //   REQUIRE(x.descriptor().extents[2] == 5); 
-  //   REQUIRE(std::distance(x.begin(),x.end()) == x.size()); 
-  // }
+    REQUIRE(x.size() == (3 * 2 * 5));     
+    REQUIRE(x.rows() == 3); 
+    REQUIRE(x.cols() == 2); 
+    REQUIRE(x.descriptor().extents[2] == 5); 
+    REQUIRE(std::distance(x.begin(),x.end()) == x.size()); 
+  }
 }
 
 TEST_CASE("FluidTensor can be initialized from initializer lists","[FluidTensor]"){
@@ -62,7 +62,7 @@ TEST_CASE("FluidTensor can be initialized from initializer lists","[FluidTensor]
                           4}; 
     const std::array<int, 5> y{0,1,2,3,4}; 
     REQUIRE(x.rows() == 5); 
-    REQUIRE(x.cols() == 1); 
+  //   REQUIRE(x.cols() == 1); 
     REQUIRE(std::distance(x.begin(),x.end()) == x.size()); 
     REQUIRE(std::equal(x.begin(),x.end(), y.begin()));
   }