@@ -42,10 +42,10 @@ TYPED_TEST(Modifiers, InsertSingleConstRef) {
4242 }
4343
4444 T val{272 };
45- EXPECT_THROW (device.insert (device.begin (), val), std::bad_alloc);
45+ SAFE_EXPECT_THROW (device.insert (device.begin (), val), std::bad_alloc);
4646 EXPECT_EQ (device, reference);
4747
48- EXPECT_THROW (device.insert (device.begin (), val), std::bad_alloc);
48+ SAFE_EXPECT_THROW (device.insert (device.begin (), val), std::bad_alloc);
4949 EXPECT_EQ (device, reference);
5050}
5151
@@ -82,10 +82,10 @@ TYPED_TEST(Modifiers, InsertSingleRV) {
8282 }
8383 }
8484
85- EXPECT_THROW (device.insert (device.begin (), T{272 }), std::bad_alloc);
85+ SAFE_EXPECT_THROW (device.insert (device.begin (), T{272 }), std::bad_alloc);
8686 EXPECT_EQ (device, reference);
8787
88- EXPECT_THROW (device.insert (device.begin (), T{272 }), std::bad_alloc);
88+ SAFE_EXPECT_THROW (device.insert (device.begin (), T{272 }), std::bad_alloc);
8989 EXPECT_EQ (device, reference);
9090}
9191
@@ -121,10 +121,10 @@ TYPED_TEST(Modifiers, InsertEmplace) {
121121 }
122122 }
123123
124- EXPECT_THROW (device.emplace (device.begin (), 272 ), std::bad_alloc);
124+ SAFE_EXPECT_THROW (device.emplace (device.begin (), 272 ), std::bad_alloc);
125125 EXPECT_EQ (device, reference);
126126
127- EXPECT_THROW (device.emplace (device.begin (), 272 ), std::bad_alloc);
127+ SAFE_EXPECT_THROW (device.emplace (device.begin (), 272 ), std::bad_alloc);
128128 EXPECT_EQ (device, reference);
129129}
130130
@@ -161,7 +161,7 @@ TYPED_TEST(Modifiers, InsertMulti) {
161161 }
162162
163163 EXPECT_NO_THROW (device.insert (device.begin (), 0 , {2538 }));
164- EXPECT_THROW (device.insert (device.begin (), 1 , {2538 }), std::bad_alloc);
164+ SAFE_EXPECT_THROW (device.insert (device.begin (), 1 , {2538 }), std::bad_alloc);
165165}
166166
167167TYPED_TEST (Modifiers, InsertInitList) {
@@ -201,7 +201,7 @@ TYPED_TEST(Modifiers, InsertInitList) {
201201
202202 auto full = this ->unique ();
203203 EXPECT_NO_THROW (full.insert (full.begin (), {}));
204- EXPECT_THROW (full.insert (full.begin (), {T{25 }}), std::bad_alloc);
204+ SAFE_EXPECT_THROW (full.insert (full.begin (), {T{25 }}), std::bad_alloc);
205205}
206206
207207TYPED_TEST (Modifiers, InsertRange) {
@@ -257,8 +257,9 @@ TYPED_TEST(Modifiers, InsertRange) {
257257 EXPECT_NO_THROW (device.insert_range (device.begin (), std::array<T, 0 >{}));
258258 EXPECT_EQ (device, reference);
259259
260- EXPECT_THROW (device.insert_range (device.begin (), std::array<T, 1 >{T{25 }}),
261- std::bad_alloc);
260+ SAFE_EXPECT_THROW (
261+ device.insert_range (device.begin (), std::array<T, 1 >{T{25 }}),
262+ std::bad_alloc);
262263}
263264
264265TYPED_TEST (Modifiers, InsertItrRange) {
@@ -315,7 +316,7 @@ TYPED_TEST(Modifiers, InsertItrRange) {
315316 EXPECT_EQ (device, reference);
316317
317318 std::array<T, 1 > single_array{T{25 }};
318- EXPECT_THROW (
319+ SAFE_EXPECT_THROW (
319320 device.insert (device.begin (), single_array.begin (), single_array.end ()),
320321 std::bad_alloc);
321322}
@@ -375,7 +376,7 @@ TYPED_TEST(Modifiers, PushBackConstRef) {
375376 }
376377
377378 T val{0 };
378- EXPECT_THROW (device.push_back (val), std::bad_alloc);
379+ SAFE_EXPECT_THROW (device.push_back (val), std::bad_alloc);
379380}
380381
381382TYPED_TEST (Modifiers, PushBackRV) {
@@ -401,7 +402,7 @@ TYPED_TEST(Modifiers, PushBackRV) {
401402 }
402403
403404 T val{0 };
404- EXPECT_THROW (device.push_back (val), std::bad_alloc);
405+ SAFE_EXPECT_THROW (device.push_back (val), std::bad_alloc);
405406}
406407
407408// TODO: Check if there's extra copies
@@ -427,7 +428,7 @@ TYPED_TEST(Modifiers, EmplaceBack) {
427428 EXPECT_EQ (device, IV (reference.begin (), reference.begin () + i + 1 ));
428429 }
429430
430- EXPECT_THROW (device.emplace_back (0 ), std::bad_alloc);
431+ SAFE_EXPECT_THROW (device.emplace_back (0 ), std::bad_alloc);
431432}
432433
433434TYPED_TEST (Modifiers, TryEmplaceBack) {
@@ -701,7 +702,7 @@ TYPED_TEST(Modifiers, ReserveNonEmpty) {
701702 device.reserve (device.capacity ());
702703 EXPECT_EQ (device, reference);
703704
704- EXPECT_THROW (device.reserve (device.capacity () + 1 ), std::bad_alloc);
705+ SAFE_EXPECT_THROW (device.reserve (device.capacity () + 1 ), std::bad_alloc);
705706}
706707
707708TYPED_TEST (Modifiers, ReserveEmpty) {
@@ -723,7 +724,7 @@ TYPED_TEST(Modifiers, ReserveEmpty) {
723724 device.reserve (device.capacity ());
724725 EXPECT_EQ (device, IV ());
725726
726- EXPECT_THROW (device.reserve (device.capacity () + 1 ), std::bad_alloc);
727+ SAFE_EXPECT_THROW (device.reserve (device.capacity () + 1 ), std::bad_alloc);
727728}
728729
729730TYPED_TEST (Modifiers, ShrinkToFitNonEmpty) {
0 commit comments