Skip to content

Commit 53f3cdb

Browse files
author
Justin Boswell
authored
Removed OOM test, as OOM is no longer possible from aws allocators (#728)
1 parent 6492943 commit 53f3cdb

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

aws-encryption-sdk-cpp/tests/unit/t_cpputils.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@ using namespace Aws::Cryptosdk::Testing;
2424

2525
const char *TEST_STRING = "Hello World!";
2626

27-
static void *s_bad_malloc(struct aws_allocator *allocator, size_t size) {
28-
return NULL;
29-
}
30-
31-
static void s_bad_free(struct aws_allocator *allocator, void *ptr) {}
32-
33-
static void *s_bad_realloc(struct aws_allocator *allocator, void *ptr, size_t oldsize, size_t newsize) {
34-
return NULL;
35-
}
36-
37-
static struct aws_allocator default_bad_allocator = { s_bad_malloc, s_bad_free, s_bad_realloc };
38-
39-
struct aws_allocator *t_aws_bad_allocator() {
40-
return &default_bad_allocator;
41-
}
42-
4327
int awsStringFromCAwsByteBuf_validInputs_returnAwsString() {
4428
struct aws_byte_buf b = aws_byte_buf_from_c_str(TEST_STRING);
4529
Aws::String b_string = aws_string_from_c_aws_byte_buf(&b);
@@ -143,16 +127,6 @@ int appendKeyToEdks_appendSingleElement_elementIsAppended() {
143127
return 0;
144128
}
145129

146-
int appendKeyToEdks_allocatorThatDoesNotAllocateMemory_returnsOomError() {
147-
struct aws_allocator *oom_allocator = t_aws_bad_allocator();
148-
EdksTestData ed;
149-
TEST_ASSERT_ERROR(
150-
AWS_ERROR_OOM,
151-
t_append_c_str_key_to_edks(
152-
oom_allocator, &ed.edks.encrypted_data_keys, &ed.enc, ed.data_key_id, ed.key_provider));
153-
return 0;
154-
}
155-
156130
int appendKeyToEdks_multipleElementsAppended_elementsAreAppended() {
157131
EdksTestData ed1;
158132
EdksTestData ed2("enc2", "dk2", "kp2");
@@ -515,7 +489,6 @@ int main() {
515489
RUN_TEST(awsStringFromCAwsByteBuf_validInputs_returnAwsString());
516490
RUN_TEST(awsUtilsByteBufferFromCAwsByteBuf_validInputs_returnAwsUtils());
517491
RUN_TEST(appendKeyToEdks_appendSingleElement_elementIsAppended());
518-
RUN_TEST(appendKeyToEdks_allocatorThatDoesNotAllocateMemory_returnsOomError());
519492
RUN_TEST(appendKeyToEdks_multipleElementsAppended_elementsAreAppended());
520493
RUN_TEST(awsStringFromCAwsString_validInputs_returnAwsString());
521494
RUN_TEST(awsMapFromCAwsHashHable_hashMap_returnAwsMap());

0 commit comments

Comments
 (0)