@@ -479,8 +479,12 @@ TEST(Array, Misc2)
479
479
UniqueArray<Real> v;
480
480
v.resize (3 );
481
481
v[0 ] = 1.2 ;
482
- v[ 1 ] = -1.3 ;
482
+ v. at ( 1 ) = -1.3 ;
483
483
v[2 ] = 7.6 ;
484
+ ASSERT_EQ (v[0 ], 1.2 );
485
+ ASSERT_EQ (v[1 ], -1.3 );
486
+ ASSERT_EQ (v.at (2 ), 7.6 );
487
+
484
488
v.add (4.3 );
485
489
for (Real x : v) {
486
490
std::cout << " Value: " << x << ' \n ' ;
@@ -826,7 +830,7 @@ TEST(SharedArray, Allocator)
826
830
ASSERT_EQ (a1.size (), 5 );
827
831
828
832
std::cout << " Array a3\n " ;
829
- SharedArray<Int32> a3 (allocator1);
833
+ SharedArray<Int32> a3 (MemoryAllocationOptions{ allocator1 } );
830
834
a3.add (4 );
831
835
a3.add (6 );
832
836
a3.add (2 );
@@ -837,19 +841,24 @@ TEST(SharedArray, Allocator)
837
841
ASSERT_EQ (a3.constSpan (), a1.constSpan ());
838
842
839
843
std::cout << " Array a4\n " ;
840
- SharedArray<Int32> a4 (allocator1);
844
+ SharedArray<Int32> a4 (allocator1, 2 );
845
+ ASSERT_EQ (a4.size (), 2 );
841
846
a4.add (4 );
842
847
a4.add (6 );
843
848
a4.add (2 );
844
- ASSERT_EQ (a4.size (), 3 );
849
+ ASSERT_EQ (a4.size (), 5 );
850
+ ASSERT_EQ (a4[2 ], 4 );
851
+ ASSERT_EQ (a4[3 ], 6 );
852
+ ASSERT_EQ (a4[4 ], 2 );
853
+
845
854
a4 = a1.span ();
846
855
ASSERT_EQ (a4.allocator (), allocator1);
847
856
848
857
a4 = SharedArray<Int32>(&printable_allocator2);
849
858
850
859
SharedArray<Int32> array[2 ];
851
860
IMemoryAllocator* allocator3 = allocator1;
852
- for ( Integer i= 0 ; i< 2 ; ++i ) {
861
+ for ( Integer i = 0 ; i < 2 ; ++i) {
853
862
array[i] = SharedArray<Int32>(allocator3);
854
863
}
855
864
ASSERT_EQ (array[0 ].allocator (), allocator3);
@@ -1008,6 +1017,7 @@ TEST(Array, DebugInfo)
1008
1017
MemoryAllocationOptions allocate_options2 (&m_default_allocator, eMemoryLocationHint::None, 0 );
1009
1018
1010
1019
String a1_name (" Array1" );
1020
+ String sa1_name (" SharedArray1" );
1011
1021
UniqueArray<Int32> a3;
1012
1022
{
1013
1023
std::cout << " Array a1\n " ;
@@ -1019,6 +1029,17 @@ TEST(Array, DebugInfo)
1019
1029
ASSERT_EQ (a1.data (), nullptr );
1020
1030
ASSERT_EQ (a1.debugName (), a1_name);
1021
1031
1032
+ std::cout << " SharedArray sa1\n " ;
1033
+ SharedArray<Int32> sa1 (allocate_options2);
1034
+ sa1.setDebugName (sa1_name);
1035
+ ASSERT_EQ (sa1.allocationOptions (), allocate_options2);
1036
+ ASSERT_EQ (sa1.size (), 0 );
1037
+ ASSERT_EQ (sa1.capacity (), 0 );
1038
+ ASSERT_EQ (sa1.data (), nullptr );
1039
+ ASSERT_EQ (sa1.debugName (), sa1_name);
1040
+
1041
+ ASSERT_EQ (a1.debugName (), a1_name);
1042
+
1022
1043
std::cout << " Array a2\n " ;
1023
1044
UniqueArray<Int32> a2 (a1);
1024
1045
ASSERT_SAME_ARRAY_INFOS (a2, a1);
0 commit comments