Skip to content

Commit 8d26279

Browse files
rpmoorerpmoore
authored
Merge pull request #134 from DenverM80/cleanup_integration_tests
Cleanup integration tests
2 parents 19ca347 + 46921aa commit 8d26279

File tree

6 files changed

+42
-53
lines changed

6 files changed

+42
-53
lines changed

‎test/bulk_get.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ BOOST_AUTO_TEST_CASE( bulk_get ) {
173173
error = ds3_get_bulk_job_spectra_s3_request(client, request, &bulk_response);
174174
ds3_request_free(request);
175175
ds3_bulk_object_list_response_free(object_list);
176-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
176+
BOOST_CHECK(handle_error_and_return_is_null(error));
177177

178178
chunk_response = ensure_available_chunks(client, bulk_response->job_id);
179179
BOOST_REQUIRE(handle_error_and_return_is_null(error));

‎test/deletes_test.cpp‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ BOOST_AUTO_TEST_CASE( delete_objects ) {
2424
ds3_request* request = ds3_init_delete_objects_request(bucket_name, obj_list);
2525
ds3_delete_result_response* response;
2626
ds3_error* error = ds3_delete_objects_request(client, request, &response);
27+
ds3_delete_objects_response_free(obj_list);
28+
ds3_request_free(request);
29+
handle_error(error);
2730

2831
BOOST_CHECK(response->num_deleted_objects == 5);
32+
ds3_delete_result_response_free(response);
2933

3034
clear_bucket(client, bucket_name);
31-
32-
handle_error(error);
33-
34-
ds3_delete_objects_response_free(obj_list);
35-
ds3_delete_result_response_free(response);
36-
ds3_request_free(request);
3735
free_client(client);
3836
}
3937

@@ -53,15 +51,14 @@ BOOST_AUTO_TEST_CASE( delete_non_existant_object ) {
5351
ds3_request* request = ds3_init_delete_objects_request(bucket_name, obj_list);
5452
ds3_delete_result_response* response;
5553
ds3_error* error = ds3_delete_objects_request(client, request, &response);
56-
clear_bucket(client, bucket_name);
57-
58-
BOOST_CHECK(response->num_deleted_objects == 0);
59-
54+
ds3_delete_objects_response_free(obj_list);
55+
ds3_request_free(request);
6056
handle_error(error);
6157

62-
ds3_delete_objects_response_free(obj_list);
58+
BOOST_CHECK(response->num_deleted_objects == 0);
6359
ds3_delete_result_response_free(response);
64-
ds3_request_free(request);
60+
61+
clear_bucket(client, bucket_name);
6562
free_client(client);
6663
}
6764

@@ -72,11 +69,10 @@ BOOST_AUTO_TEST_CASE( delete_folder ) {
7269

7370
ds3_request* request = ds3_init_delete_folder_recursively_spectra_s3_request("resources", bucket_name);
7471
ds3_error* error = ds3_delete_folder_recursively_spectra_s3_request(client, request);
75-
clear_bucket(client, bucket_name);
76-
72+
ds3_request_free(request);
7773
handle_error(error);
7874

79-
ds3_request_free(request);
75+
clear_bucket(client, bucket_name);
8076
free_client(client);
8177
}
8278

@@ -88,12 +84,12 @@ BOOST_AUTO_TEST_CASE( delete_non_existant_folder ) {
8884
ds3_request* request = ds3_init_delete_folder_recursively_spectra_s3_request(fake_folder, bucket_name);
8985

9086
ds3_error* error = ds3_delete_folder_recursively_spectra_s3_request(client, request);
91-
clear_bucket(client, bucket_name);
92-
9387
ds3_request_free(request);
94-
free_client(client);
95-
96-
BOOST_CHECK(error!=NULL);
88+
BOOST_CHECK(error != NULL);
89+
BOOST_CHECK(error->error != NULL);
9790
BOOST_CHECK(error->error->http_error_code == 404);
9891
ds3_error_free(error);
92+
93+
clear_bucket(client, bucket_name);
94+
free_client(client);
9995
}

‎test/job_tests.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ BOOST_AUTO_TEST_CASE(get_job){
2020
request = ds3_init_get_bucket_request(bucket_name);
2121
error = ds3_get_bucket_request(client, request, &response);
2222
ds3_request_free(request);
23-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
23+
handle_error(error);
2424

2525
object_list = ds3_convert_object_list((const ds3_contents_response**)response->objects, response->num_objects);
2626
ds3_list_bucket_result_response_free(response);
@@ -65,14 +65,14 @@ BOOST_AUTO_TEST_CASE(cancel_job){
6565

6666
request = ds3_init_get_job_spectra_s3_request(job_id->value);
6767
error = ds3_get_job_spectra_s3_request(client, request, &bulk_response);
68+
ds3_str_free(job_id);
69+
ds3_request_free(request);
6870
handle_error(error);
6971

7072
BOOST_CHECK(bulk_response->status == DS3_JOB_STATUS_CANCELED);
71-
ds3_request_free(request);
7273
ds3_master_object_list_response_free(bulk_response);
7374

7475
clear_bucket(client, bucket_name);
75-
ds3_str_free(job_id);
7676
free_client(client);
7777
}
7878

@@ -150,11 +150,11 @@ BOOST_AUTO_TEST_CASE(get_jobs){
150150
uint8_t job_index;
151151
for( job_index = 0; job_index < get_jobs_response->num_jobs; job_index++ ) {
152152
ds3_job_response* job_response = get_jobs_response->jobs[job_index];
153-
BOOST_CHECK( job_response->bucket_name->value != NULL);
154-
BOOST_CHECK( job_response->job_id->value != NULL);
155-
BOOST_CHECK( job_response->start_date->value != NULL);
156-
BOOST_CHECK( job_response->user_id->value != NULL);
157-
BOOST_CHECK( job_response->user_name->value != NULL);
153+
BOOST_CHECK(job_response->bucket_name->value != NULL);
154+
BOOST_CHECK(job_response->job_id->value != NULL);
155+
BOOST_CHECK(job_response->start_date->value != NULL);
156+
BOOST_CHECK(job_response->user_id->value != NULL);
157+
BOOST_CHECK(job_response->user_name->value != NULL);
158158
if(0 == strcmp(job_response->job_id->value, bucket1_job_id->value)) {
159159
found_bucket1_job = True;
160160
} else if(0 == strcmp(job_response->job_id->value, bucket2_job_id->value)) {
@@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE(get_jobs){
169169
ds3_str_free(bucket1_job_id);
170170
ds3_str_free(bucket2_job_id);
171171
ds3_job_list_response_free(get_jobs_response);
172-
BOOST_REQUIRE(True == found_bucket1_job);
173-
BOOST_REQUIRE(True == found_bucket2_job);
172+
BOOST_CHECK(True == found_bucket1_job);
173+
BOOST_CHECK(True == found_bucket2_job);
174174
}
175175

‎test/metadata_tests.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ BOOST_AUTO_TEST_CASE( put_metadata ) {
5252
error = ds3_head_object_request(client, request, &metadata_result);
5353
ds3_request_free(request);
5454
handle_error(error);
55-
BOOST_REQUIRE(metadata_result != NULL);
55+
BOOST_CHECK(metadata_result != NULL);
5656

5757
metadata_count = ds3_metadata_size(metadata_result);
5858
BOOST_CHECK(metadata_count == 1);
5959

6060
metadata_entry = ds3_metadata_get_entry(metadata_result, "name");
61-
BOOST_REQUIRE(metadata_entry != NULL);
61+
BOOST_CHECK(metadata_entry != NULL);
6262
BOOST_CHECK(g_strcmp0(metadata_entry->name->value, "name") == 0);
6363

6464
ds3_metadata_entry_free(metadata_entry);
@@ -119,7 +119,7 @@ BOOST_AUTO_TEST_CASE( put_emtpy_metadata ) {
119119
BOOST_CHECK(metadata_count == 0);
120120

121121
metadata_entry = ds3_metadata_get_entry(metadata_result, "name");
122-
BOOST_REQUIRE(metadata_entry == NULL);
122+
BOOST_CHECK(metadata_entry == NULL);
123123

124124
ds3_metadata_entry_free(metadata_entry);
125125
ds3_metadata_free(metadata_result);
@@ -179,7 +179,7 @@ BOOST_AUTO_TEST_CASE( put_null_metadata ) {
179179
BOOST_CHECK(metadata_count == 0);
180180

181181
metadata_entry = ds3_metadata_get_entry(metadata_result, "name");
182-
BOOST_REQUIRE(metadata_entry == NULL);
182+
BOOST_CHECK(metadata_entry == NULL);
183183

184184
ds3_metadata_entry_free(metadata_entry);
185185
ds3_metadata_free(metadata_result);
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE( head_folder ) {
225225
error = ds3_head_object_request(client, request, &metadata_result);
226226
ds3_request_free(request);
227227
handle_error(error);
228-
BOOST_REQUIRE(metadata_result != NULL);
228+
BOOST_CHECK(metadata_result != NULL);
229229
ds3_metadata_free(metadata_result);
230230

231231
clear_bucket(client, bucket_name);
@@ -273,19 +273,19 @@ BOOST_AUTO_TEST_CASE( put_multiple_metadata_items ) {
273273
error = ds3_head_object_request(client, request, &metadata_result);
274274
ds3_request_free(request);
275275
handle_error(error);
276-
BOOST_REQUIRE(metadata_result != NULL);
276+
BOOST_CHECK(metadata_result != NULL);
277277

278278
metadata_count = ds3_metadata_size(metadata_result);
279279
BOOST_CHECK(metadata_count == 2);
280280

281281
metadata_entry = ds3_metadata_get_entry(metadata_result, "name");
282-
BOOST_REQUIRE(metadata_entry != NULL);
282+
BOOST_CHECK(metadata_entry != NULL);
283283
BOOST_CHECK(g_strcmp0(metadata_entry->name->value, "name") == 0);
284284
BOOST_CHECK(g_strcmp0(metadata_entry->values[0]->value, "value") == 0);
285285
ds3_metadata_entry_free(metadata_entry);
286286

287287
metadata_entry = ds3_metadata_get_entry(metadata_result, "key");
288-
BOOST_REQUIRE(metadata_entry != NULL);
288+
BOOST_CHECK(metadata_entry != NULL);
289289
BOOST_CHECK(g_strcmp0(metadata_entry->name->value, "key") == 0);
290290
BOOST_CHECK(g_strcmp0(metadata_entry->values[0]->value, "value2") == 0);
291291

@@ -349,13 +349,13 @@ BOOST_AUTO_TEST_CASE( metadata_keys ) {
349349
error = ds3_head_object_request(client, request, &metadata_result);
350350
ds3_request_free(request);
351351
handle_error(error);
352-
BOOST_REQUIRE(metadata_result != NULL);
352+
BOOST_CHECK(metadata_result != NULL);
353353

354354
metadata_count = ds3_metadata_size(metadata_result);
355355
BOOST_CHECK(metadata_count == 2);
356356

357357
metadata_keys = ds3_metadata_keys(metadata_result);
358-
BOOST_REQUIRE(metadata_keys != NULL);
358+
BOOST_CHECK(metadata_keys != NULL);
359359

360360
BOOST_CHECK(metadata_keys->num_keys == 2);
361361
BOOST_CHECK(contains_key(metadata_keys, "key"));
@@ -415,13 +415,13 @@ BOOST_AUTO_TEST_CASE( put_metadata_using_get_object_retrieval ) {
415415
ds3_master_object_list_response_free(bulk_response);
416416
fclose(file);
417417
handle_error(error);
418-
BOOST_REQUIRE(metadata_result != NULL);
418+
BOOST_CHECK(metadata_result != NULL);
419419

420420
metadata_count = ds3_metadata_size(metadata_result);
421421
BOOST_CHECK(metadata_count == 1);
422422

423423
metadata_entry = ds3_metadata_get_entry(metadata_result, "name");
424-
BOOST_REQUIRE(metadata_entry != NULL);
424+
BOOST_CHECK(metadata_entry != NULL);
425425
BOOST_CHECK(g_strcmp0(metadata_entry->name->value, "name") == 0);
426426

427427
ds3_metadata_entry_free(metadata_entry);

‎test/test.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,19 +176,13 @@ void print_error(const ds3_error* error) {
176176
}
177177

178178
void handle_error(ds3_error* error) {
179+
BOOST_CHECK(error == NULL);
179180
if (error != NULL) {
180181
print_error(error);
181182
ds3_error_free(error);
182-
BOOST_FAIL("Test failed with a ds3_error");
183183
}
184184
}
185185

186-
bool handle_error_and_return_is_null(ds3_error* error){
187-
bool result = (error == NULL);
188-
handle_error(error);
189-
return result;
190-
}
191-
192186
void clear_bucket(const ds3_client* client, const char* bucket_name) {
193187
ds3_request* request;
194188
ds3_error* error;
@@ -250,8 +244,8 @@ ds3_master_object_list_response* ensure_available_chunks(const ds3_client* clien
250244
error = ds3_get_job_chunks_ready_for_client_processing_spectra_s3_request(client, request, &chunk_response);
251245
ds3_request_free(request);
252246

253-
BOOST_REQUIRE(handle_error_and_return_is_null(error));
254-
BOOST_REQUIRE(chunk_response != NULL);
247+
handle_error(error);
248+
BOOST_CHECK(chunk_response != NULL);
255249

256250
if (chunk_response->num_objects == 0) {
257251
// if this happens we need to try the request

‎test/test.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ void populate_with_objects_from_bulk(const ds3_client* client, const char* bucke
3737
ds3_master_object_list_response* ensure_available_chunks(const ds3_client* client, ds3_str* job_id);
3838

3939
void handle_error(ds3_error* error);
40-
bool handle_error_and_return_is_null(ds3_error* error);
4140

4241
void free_client(ds3_client* client);
4342

0 commit comments

Comments
 (0)