Author: brane
Date: Mon Jul 7 09:33:37 2025
New Revision: 1927025
URL: http://svn.apache.org/viewvc?rev=1927025&view=rev
Log:
Rename the testing 'batons' to make their meaning clearer.
* test/test_serf.h
(test_baton_t::user_number): Renamed from user_baton_l and changed
the type from long to apr_uint64_t.
(test_baton_t::user_status): Renamed from user_baton_s.
* test/test_buckets.c
(deflate_buckets, hold_open,
test_deflate_4GBplus_buckets): Use user_status instead of user_baton_l.
* test/test_context.c
(http_conn_setup_mock_socket,
test_aborted_connection,
test_aborted_connection_with_authn_cb,
test_reset_connection,
test_reset_connection_with_authn_cb): Use user_status instead of
user_baton_s.
* test/test_server.c
(client_generate_response,
test_listen_auth_http,
test_listen_auth_http2): Use user_number instead fo user_baton_l.
Modified:
serf/trunk/test/test_buckets.c
serf/trunk/test/test_context.c
serf/trunk/test/test_serf.h
serf/trunk/test/test_server.c
Modified: serf/trunk/test/test_buckets.c
URL:
http://svn.apache.org/viewvc/serf/trunk/test/test_buckets.c?rev=1927025&r1=1927024&r2=1927025&view=diff
==============================================================================
--- serf/trunk/test/test_buckets.c (original)
+++ serf/trunk/test/test_buckets.c Mon Jul 7 09:33:37 2025
@@ -2026,7 +2026,7 @@ static void deflate_buckets(CuTest *tc,
serf_bucket_aggregate_append(aggbkt, strbkt);
}
- tb->user_baton_l = APR_EOF;
+ tb->user_status = APR_EOF;
read_bucket_and_check_pattern(tc, defbkt, msg, nr_of_loops * strlen(msg));
/* Release a few MB of memory kept by zlib */
@@ -2048,7 +2048,7 @@ static apr_status_t hold_open(void *bato
{
test_baton_t *tb = baton;
- return tb->user_baton_l;
+ return tb->user_status;
}
static void put_32bit(unsigned char *buf, unsigned long x)
@@ -2109,7 +2109,7 @@ static void test_deflate_4GBplus_buckets
unsigned char uncompressed[BUFSIZE];
serf_bucket_aggregate_hold_open(aggbkt, hold_open, tb);
- tb->user_baton_l = APR_EAGAIN;
+ tb->user_status = APR_EAGAIN;
#if 0 /* Enable logging */
@@ -2176,7 +2176,7 @@ static void test_deflate_4GBplus_buckets
sizeof(gzip_trailer), alloc);
serf_bucket_aggregate_append(aggbkt, strbkt);
- tb->user_baton_l = APR_EOF;
+ tb->user_status = APR_EOF;
while (1) {
apr_size_t read_len;
Modified: serf/trunk/test/test_context.c
URL:
http://svn.apache.org/viewvc/serf/trunk/test/test_context.c?rev=1927025&r1=1927024&r2=1927025&view=diff
==============================================================================
--- serf/trunk/test/test_context.c (original)
+++ serf/trunk/test/test_context.c Mon Jul 7 09:33:37 2025
@@ -183,7 +183,7 @@ static apr_status_t http_conn_setup_mock
skt,
tb->bkt_alloc);
*input_bkt = serf_bucket_mock_sock_create(skt_bkt,
- tb->user_baton_s,
+ tb->user_status,
tb->bkt_alloc);
return APR_SUCCESS;
@@ -286,7 +286,7 @@ static void test_aborted_connection(CuTe
/* Set up a test context with a server. Use the mock socket to return
APR_ECONNABORTED instead of APR_EOF. */
setup_test_mock_server(tb);
- tb->user_baton_s = APR_ECONNABORTED;
+ tb->user_status = APR_ECONNABORTED;
status = setup_test_client_context(tb, http_conn_setup_mock_socket,
tb->pool);
CuAssertIntEquals(tc, APR_SUCCESS, status);
@@ -304,7 +304,7 @@ static void test_aborted_connection_with
/* Set up a test context with a server. Use the mock socket to return
APR_ECONNABORTED instead of APR_EOF. */
setup_test_mock_server(tb);
- tb->user_baton_s = APR_ECONNABORTED;
+ tb->user_status = APR_ECONNABORTED;
status = setup_test_client_context(tb, http_conn_setup_mock_socket,
tb->pool);
CuAssertIntEquals(tc, APR_SUCCESS, status);
@@ -323,7 +323,7 @@ static void test_reset_connection(CuTest
/* Set up a test context with a server. Use the mock socket to return
APR_ECONNRESET instead of APR_EOF. */
setup_test_mock_server(tb);
- tb->user_baton_s = APR_ECONNRESET;
+ tb->user_status = APR_ECONNRESET;
status = setup_test_client_context(tb, http_conn_setup_mock_socket,
tb->pool);
CuAssertIntEquals(tc, APR_SUCCESS, status);
@@ -341,7 +341,7 @@ static void test_reset_connection_with_a
/* Set up a test context with a server. Use the mock socket to return
APR_ECONNRESET instead of APR_EOF. */
setup_test_mock_server(tb);
- tb->user_baton_s = APR_ECONNRESET;
+ tb->user_status = APR_ECONNRESET;
status = setup_test_client_context(tb, http_conn_setup_mock_socket,
tb->pool);
CuAssertIntEquals(tc, APR_SUCCESS, status);
Modified: serf/trunk/test/test_serf.h
URL:
http://svn.apache.org/viewvc/serf/trunk/test/test_serf.h?rev=1927025&r1=1927024&r2=1927025&view=diff
==============================================================================
--- serf/trunk/test/test_serf.h (original)
+++ serf/trunk/test/test_serf.h Mon Jul 7 09:33:37 2025
@@ -89,8 +89,8 @@ typedef struct test_baton_t {
/* Extra batons which can be freely used by tests. */
void *user_baton;
- long user_baton_l;
- apr_status_t user_baton_s;
+ apr_uint64_t user_number;
+ apr_status_t user_status;
/* Flags that can be used to report situations, e.g. that a callback was
called. */
Modified: serf/trunk/test/test_server.c
URL:
http://svn.apache.org/viewvc/serf/trunk/test/test_server.c?rev=1927025&r1=1927024&r2=1927025&view=diff
==============================================================================
--- serf/trunk/test/test_server.c (original)
+++ serf/trunk/test/test_server.c Mon Jul 7 09:33:37 2025
@@ -78,8 +78,8 @@ static apr_status_t client_generate_resp
serf_bucket_t *headers;
#define CRLF "\r\n"
- if (tb->user_baton_l == 401) {
- tb->user_baton_l = 0;
+ if (tb->user_number == 401) {
+ tb->user_number = 0;
body = SERF_BUCKET_SIMPLE_STRING("NOT HERE" CRLF, allocator);
@@ -299,7 +299,7 @@ static void test_listen_auth_http(CuTest
create_new_request(tb, &handler_ctx[0], "GET", "/", 1);
create_new_request(tb, &handler_ctx[1], "GET", "/", 2);
- tb->user_baton_l = 401;
+ tb->user_number = 401;
tb->user_baton = tc;
status = run_client_server_loop(tb, num_requests,
@@ -327,7 +327,7 @@ static void test_listen_auth_http2(CuTes
create_new_request(tb, &handler_ctx[0], "GET", "/", 1);
create_new_request(tb, &handler_ctx[1], "GET", "/", 2);
- tb->user_baton_l = 401;
+ tb->user_number = 401;
tb->user_baton = tc;
status = run_client_server_loop(tb, num_requests,
