Improve tests

Author: jpnurmi

tests/unit/test_envelopes.c

@@ -316,7 +316,7 @@ SENTRY_TEST(basic_write_envelope_to_file)
     sentry_close();
 }
 
-SENTRY_TEST(write_envelope_to_file_null)
+SENTRY_TEST(read_write_envelope_to_file_null)
 {
     sentry_envelope_t *empty_envelope = sentry__envelope_new();
 
@@ -333,7 +333,7 @@ SENTRY_TEST(write_envelope_to_file_null)
     sentry_envelope_free(empty_envelope);
 }
 
-SENTRY_TEST(write_envelope_to_invalid_path)
+SENTRY_TEST(read_write_envelope_to_invalid_path)
 {
     sentry_envelope_t *envelope = create_test_envelope();
     const char *test_file_str = SENTRY_TEST_PATH_PREFIX
@@ -378,60 +378,61 @@ SENTRY_TEST(write_raw_envelope_to_file)
 
 SENTRY_TEST(parse_envelope)
 {
-    sentry_envelope_t *test_envelope = create_test_envelope();
     const char *test_file_str = SENTRY_TEST_PATH_PREFIX "sentry_test_envelope";
     sentry_path_t *test_file_path = sentry__path_from_str(test_file_str);
     TEST_CHECK_INT_EQUAL(
-        sentry_envelope_write_to_file(test_envelope, test_file_str), 0);
+        sentry__path_write_buffer(test_file_path, SERIALIZED_ENVELOPE_STR,
+            strlen(SERIALIZED_ENVELOPE_STR)),
+        0);
 
-    sentry_envelope_t *file_envelope
-        = sentry_envelope_read_from_file(test_file_str);
+    sentry_envelope_t *envelope = sentry_envelope_read_from_file(test_file_str);
+    TEST_CHECK(!!envelope);
 
-    TEST_CHECK_STRING_EQUAL(sentry_value_as_string(sentry_envelope_get_header(
-                                file_envelope, "dsn")),
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_envelope_get_header(envelope, "dsn")),
         "https://foo@sentry.invalid/42");
     TEST_CHECK_STRING_EQUAL(sentry_value_as_string(sentry_envelope_get_header(
-                                file_envelope, "event_id")),
+                                envelope, "event_id")),
         "c993afb6-b4ac-48a6-b61b-2558e601d65d");
 
-    sentry_uuid_t event_id = sentry__envelope_get_event_id(file_envelope);
+    sentry_uuid_t event_id = sentry__envelope_get_event_id(envelope);
     char event_id_str[37];
     sentry_uuid_as_string(&event_id, event_id_str);
     TEST_CHECK_STRING_EQUAL(
         event_id_str, "c993afb6-b4ac-48a6-b61b-2558e601d65d");
 
-    TEST_CHECK_INT_EQUAL(sentry__envelope_get_item_count(file_envelope), 3);
+    TEST_CHECK_INT_EQUAL(sentry__envelope_get_item_count(envelope), 3);
 
-    sentry_value_t event = sentry_envelope_get_event(file_envelope);
+    sentry_value_t event = sentry_envelope_get_event(envelope);
     TEST_CHECK(!sentry_value_is_null(event));
     TEST_CHECK_INT_EQUAL(
         sentry_value_as_int32(sentry_value_get_by_key(event, "some-context")),
         1234);
 
-    const sentry_envelope_item_t *ev
-        = sentry__envelope_get_item(file_envelope, 0);
-    TEST_CHECK(!!ev);
+    const sentry_envelope_item_t *item = sentry__envelope_get_item(envelope, 0);
+    TEST_CHECK(!!item);
     TEST_CHECK_STRING_EQUAL(
-        sentry_value_as_string(sentry__envelope_item_get_header(ev, "type")),
+        sentry_value_as_string(sentry__envelope_item_get_header(item, "type")),
         "event");
     size_t ev_len = 0;
-    TEST_CHECK_STRING_EQUAL(sentry__envelope_item_get_payload(ev, &ev_len),
+    TEST_CHECK_STRING_EQUAL(sentry__envelope_item_get_payload(item, &ev_len),
         "{\"event_id\":\"c993afb6-b4ac-48a6-b61b-2558e601d65d\","
         "\"some-context\":1234}");
 
-    const sentry_envelope_item_t *dmp
-        = sentry__envelope_get_item(file_envelope, 1);
-    TEST_CHECK(!!dmp);
+    const sentry_envelope_item_t *minidump
+        = sentry__envelope_get_item(envelope, 1);
+    TEST_CHECK(!!minidump);
     TEST_CHECK_STRING_EQUAL(
-        sentry_value_as_string(sentry__envelope_item_get_header(dmp, "type")),
+        sentry_value_as_string(
+            sentry__envelope_item_get_header(minidump, "type")),
         "minidump");
     size_t dmp_len = 0;
     TEST_CHECK_STRING_EQUAL(
-        sentry__envelope_item_get_payload(dmp, &dmp_len), "MDMP");
+        sentry__envelope_item_get_payload(minidump, &dmp_len), "MDMP");
     TEST_CHECK_INT_EQUAL(dmp_len, 4);
 
     const sentry_envelope_item_t *attachment
-        = sentry__envelope_get_item(file_envelope, 2);
+        = sentry__envelope_get_item(envelope, 2);
     TEST_CHECK(!!attachment);
     TEST_CHECK_STRING_EQUAL(
         sentry_value_as_string(
@@ -444,7 +445,6 @@ SENTRY_TEST(parse_envelope)
     TEST_CHECK_INT_EQUAL(attachment_len, 12);
 
     sentry__path_free(test_file_path);
-    sentry_envelope_free(test_envelope);
-    sentry_envelope_free(file_envelope);
+    sentry_envelope_free(envelope);
     sentry_close();
 }

tests/unit/tests.inc

@@ -97,6 +97,8 @@ XX(path_relative_filename)
 XX(procmaps_parser)
 XX(propagation_context_init)
 XX(rate_limit_parsing)
+XX(read_write_envelope_to_file_null)
+XX(read_write_envelope_to_invalid_path)
 XX(recursive_paths)
 XX(ringbuffer_append)
 XX(ringbuffer_append_invalid_decref_value)
@@ -188,6 +190,4 @@ XX(value_string_n)
 XX(value_unicode)
 XX(value_user)
 XX(value_wrong_type)
-XX(write_envelope_to_file_null)
-XX(write_envelope_to_invalid_path)
 XX(write_raw_envelope_to_file)