Skip to content

Commit 0245434

Browse files
jpnurmijpnurmi
committed
fix deprecation warnings in tests
1 parent c55b3d7 commit 0245434

File tree

6 files changed

+51
-28
lines changed

6 files changed

+51
-28
lines changed

‎tests/unit/test_attachments.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ typedef struct {
1111
} sentry_attachments_testdata_t;
1212

1313
static void
14-
send_envelope_test_attachments(const sentry_envelope_t *envelope, void *_data)
14+
send_envelope_test_attachments(sentry_envelope_t *envelope, void *_data)
1515
{
1616
sentry_attachments_testdata_t *data = _data;
1717
data->called += 1;
1818
sentry__envelope_serialize_into_stringbuilder(
1919
envelope, &data->serialized_envelope);
20+
sentry_envelope_free(envelope);
2021
}
2122

2223
SENTRY_TEST(lazy_attachments)
@@ -28,9 +29,10 @@ SENTRY_TEST(lazy_attachments)
2829
SENTRY_TEST_OPTIONS_NEW(options);
2930
sentry_options_set_auto_session_tracking(options, false);
3031
sentry_options_set_dsn(options, "https://[email protected]/42");
31-
sentry_options_set_transport(options,
32-
sentry_new_function_transport(
33-
send_envelope_test_attachments, &testdata));
32+
sentry_transport_t *transport
33+
= sentry_transport_new(send_envelope_test_attachments);
34+
sentry_transport_set_state(transport, &testdata);
35+
sentry_options_set_transport(options, transport);
3436
char rel[] = { 't', 'e', 's', 't' };
3537
sentry_options_set_release_n(options, rel, sizeof(rel));
3638

‎tests/unit/test_basic.c‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "sentry_testsupport.h"
55

66
static void
7-
send_envelope_test_basic(const sentry_envelope_t *envelope, void *data)
7+
send_envelope_test_basic(sentry_envelope_t *envelope, void *data)
88
{
99
uint64_t *called = data;
1010
*called += 1;
@@ -26,15 +26,18 @@ send_envelope_test_basic(const sentry_envelope_t *envelope, void *data)
2626
sentry_value_get_by_key(event, "transaction"));
2727
TEST_CHECK_STRING_EQUAL(trans, "demo-trans");
2828
}
29+
sentry_envelope_free(envelope);
2930
}
3031

3132
SENTRY_TEST(basic_function_transport)
3233
{
3334
uint64_t called = 0;
3435
SENTRY_TEST_OPTIONS_NEW(options);
3536
sentry_options_set_dsn(options, "https://[email protected]/42");
36-
sentry_options_set_transport(options,
37-
sentry_new_function_transport(send_envelope_test_basic, &called));
37+
sentry_transport_t *transport
38+
= sentry_transport_new(send_envelope_test_basic);
39+
sentry_transport_set_state(transport, &called);
40+
sentry_options_set_transport(options, transport);
3841
sentry_options_set_release(options, "prod");
3942
sentry_options_set_require_user_consent(options, true);
4043
sentry_init(options);
@@ -63,10 +66,11 @@ SENTRY_TEST(basic_function_transport)
6366
}
6467

6568
static void
66-
counting_transport_func(const sentry_envelope_t *UNUSED(envelope), void *data)
69+
counting_transport_func(sentry_envelope_t *envelope, void *data)
6770
{
6871
uint64_t *called = data;
6972
*called += 1;
73+
sentry_envelope_free(envelope);
7074
}
7175

7276
static sentry_value_t
@@ -85,9 +89,10 @@ SENTRY_TEST(sampling_before_send)
8589

8690
SENTRY_TEST_OPTIONS_NEW(options);
8791
sentry_options_set_dsn(options, "https://[email protected]/42");
88-
sentry_options_set_transport(options,
89-
sentry_new_function_transport(
90-
counting_transport_func, &called_transport));
92+
sentry_transport_t *transport
93+
= sentry_transport_new(counting_transport_func);
94+
sentry_transport_set_state(transport, &called_transport);
95+
sentry_options_set_transport(options, transport);
9196
sentry_options_set_before_send(options, before_send, &called_beforesend);
9297
sentry_options_set_sample_rate(options, 0.75);
9398
sentry_init(options);
@@ -127,9 +132,10 @@ SENTRY_TEST(discarding_before_send)
127132
sentry_options_set_dsn(options, "https://[email protected]/42");
128133
// Disable sessions or this test would fail if env:SENTRY_RELEASE is set.
129134
sentry_options_set_auto_session_tracking(options, 0);
130-
sentry_options_set_transport(options,
131-
sentry_new_function_transport(
132-
counting_transport_func, &called_transport));
135+
sentry_transport_t *transport
136+
= sentry_transport_new(counting_transport_func);
137+
sentry_transport_set_state(transport, &called_transport);
138+
sentry_options_set_transport(options, transport);
133139
sentry_options_set_before_send(
134140
options, discarding_before_send, &called_beforesend);
135141
sentry_init(options);

‎tests/unit/test_concurrency.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <sentry_sync.h>
55

66
static void
7-
send_envelope_test_concurrent(const sentry_envelope_t *envelope, void *data)
7+
send_envelope_test_concurrent(sentry_envelope_t *envelope, void *data)
88
{
99
sentry__atomic_fetch_and_add((long *)data, 1);
1010

@@ -15,15 +15,18 @@ send_envelope_test_concurrent(const sentry_envelope_t *envelope, void *data)
1515
TEST_CHECK_STRING_EQUAL(
1616
event_id, "4c035723-8638-4c3a-923f-2ab9d08b4018");
1717
}
18+
sentry_envelope_free(envelope);
1819
}
1920

2021
static void
2122
init_framework(long *called)
2223
{
2324
SENTRY_TEST_OPTIONS_NEW(options);
2425
sentry_options_set_dsn(options, "https://[email protected]/42");
25-
sentry_options_set_transport(options,
26-
sentry_new_function_transport(send_envelope_test_concurrent, called));
26+
sentry_transport_t *transport
27+
= sentry_transport_new(send_envelope_test_concurrent);
28+
sentry_transport_set_state(transport, called);
29+
sentry_options_set_transport(options, transport);
2730
sentry_options_set_release(options, "prod");
2831
sentry_options_set_require_user_consent(options, false);
2932
sentry_options_set_auto_session_tracking(options, true);

‎tests/unit/test_failures.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ transport_startup_fail(
1010
}
1111

1212
static void
13-
noop_send(const sentry_envelope_t *UNUSED(envelope), void *UNUSED(data))
13+
noop_send(sentry_envelope_t *envelope, void *UNUSED(data))
1414
{
15+
sentry_envelope_free(envelope);
1516
}
1617

1718
SENTRY_TEST(init_failure)
1819
{
19-
sentry_transport_t *transport
20-
= sentry_new_function_transport(noop_send, NULL);
20+
sentry_transport_t *transport = sentry_transport_new(noop_send);
2121
TEST_ASSERT(!!transport);
2222
sentry_transport_set_startup_func(transport, transport_startup_fail);
2323

‎tests/unit/test_info.c‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "sentry.h"
2+
#include "sentry_core.h"
13
#include "sentry_testsupport.h"
24

35
SENTRY_TEST(assert_sdk_version)
@@ -7,10 +9,16 @@ SENTRY_TEST(assert_sdk_version)
79

810
SENTRY_TEST(assert_sdk_name)
911
{
10-
TEST_CHECK_STRING_EQUAL(sentry_sdk_name(), SENTRY_SDK_NAME);
12+
SENTRY_WITH_OPTIONS (options) {
13+
TEST_CHECK_STRING_EQUAL(
14+
sentry_options_get_sdk_name(options), SENTRY_SDK_NAME);
15+
}
1116
}
1217

1318
SENTRY_TEST(assert_sdk_user_agent)
1419
{
15-
TEST_CHECK_STRING_EQUAL(sentry_sdk_user_agent(), SENTRY_SDK_USER_AGENT);
20+
SENTRY_WITH_OPTIONS (options) {
21+
TEST_CHECK_STRING_EQUAL(
22+
sentry_options_get_user_agent(options), SENTRY_SDK_USER_AGENT);
23+
}
1624
}

‎tests/unit/test_session.c‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "sentry_value.h"
55

66
static void
7-
send_envelope(const sentry_envelope_t *envelope, void *data)
7+
send_envelope(sentry_envelope_t *envelope, void *data)
88
{
99
uint64_t *called = data;
1010
*called += 1;
@@ -50,15 +50,17 @@ send_envelope(const sentry_envelope_t *envelope, void *data)
5050
"test");
5151

5252
sentry_value_decref(session);
53+
sentry_envelope_free(envelope);
5354
}
5455

5556
SENTRY_TEST(session_basics)
5657
{
5758
uint64_t called = 0;
5859
SENTRY_TEST_OPTIONS_NEW(options);
5960
sentry_options_set_dsn(options, "https://[email protected]/42");
60-
sentry_options_set_transport(
61-
options, sentry_new_function_transport(send_envelope, &called));
61+
sentry_transport_t *transport = sentry_transport_new(send_envelope);
62+
sentry_transport_set_state(transport, &called);
63+
sentry_options_set_transport(options, transport);
6264
sentry_options_set_release(options, "my_release");
6365

6466
// the default environment is always `production` if not overwritten by the
@@ -101,7 +103,7 @@ typedef struct {
101103
} session_assertion_t;
102104

103105
static void
104-
send_sampled_envelope(const sentry_envelope_t *envelope, void *data)
106+
send_sampled_envelope(sentry_envelope_t *envelope, void *data)
105107
{
106108
session_assertion_t *assertion = data;
107109

@@ -133,6 +135,7 @@ send_sampled_envelope(const sentry_envelope_t *envelope, void *data)
133135

134136
sentry_value_decref(session);
135137
}
138+
sentry_envelope_free(envelope);
136139
}
137140

138141
SENTRY_TEST(count_sampled_events)
@@ -141,8 +144,9 @@ SENTRY_TEST(count_sampled_events)
141144

142145
SENTRY_TEST_OPTIONS_NEW(options);
143146
sentry_options_set_dsn(options, "https://[email protected]/42");
144-
sentry_options_set_transport(options,
145-
sentry_new_function_transport(send_sampled_envelope, &assertion));
147+
sentry_transport_t *transport = sentry_transport_new(send_sampled_envelope);
148+
sentry_transport_set_state(transport, &assertion);
149+
sentry_options_set_transport(options, transport);
146150
sentry_options_set_release(options, "my_release");
147151
sentry_options_set_sample_rate(options, 0.5);
148152
sentry_init(options);

0 commit comments

Comments
 (0)