Skip to content

Commit 55e85ab

Browse files
tatsuhiro-ttatsuhiro-t
authored
Merge pull request #341 from ngtcp2/assertions-fix
Assertions fix
2 parents 20efc98 + 5027db7 commit 55e85ab

File tree

2 files changed

+37
-33
lines changed

2 files changed

+37
-33
lines changed

‎tests/nghttp3_conn_test.c‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ void test_nghttp3_conn_write_control(void) {
890890

891891
assert_int64(3, ==, stream_id);
892892
assert_ptrdiff(1, ==, sveccnt);
893-
assert_true(vec[0].len > 1);
893+
assert_size(1, <, vec[0].len);
894894
assert_uint8(NGHTTP3_STREAM_TYPE_CONTROL, ==, vec[0].base[0]);
895895

896896
nghttp3_conn_del(conn);
@@ -910,7 +910,7 @@ void test_nghttp3_conn_write_control(void) {
910910

911911
assert_int64(3, ==, stream_id);
912912
assert_ptrdiff(1, ==, sveccnt);
913-
assert_true(vec[0].len > 1);
913+
assert_size(1, <, vec[0].len);
914914
assert_uint8(NGHTTP3_STREAM_TYPE_CONTROL, ==, vec[0].base[0]);
915915

916916
++vec[0].base;
@@ -1146,7 +1146,7 @@ void test_nghttp3_conn_submit_request(void) {
11461146

11471147
assert_int64(0, ==, stream_id);
11481148
/* Extra vector */
1149-
assert_int64(2, ==, sveccnt);
1149+
assert_ptrdiff(2, ==, sveccnt);
11501150

11511151
rv = nghttp3_conn_add_write_offset(
11521152
conn, stream_id, (size_t)nghttp3_vec_len(vec, (size_t)sveccnt));
@@ -1181,7 +1181,7 @@ void test_nghttp3_conn_submit_request(void) {
11811181
nghttp3_arraylen(vec));
11821182

11831183
assert_int64(conn->tx.qenc->node.id, ==, stream_id);
1184-
assert_int64(1, ==, sveccnt);
1184+
assert_ptrdiff(1, ==, sveccnt);
11851185

11861186
tbuf = nghttp3_ringbuf_get(&conn->tx.qenc->outq,
11871187
nghttp3_ringbuf_len(&conn->tx.qenc->outq) - 1);
@@ -1214,7 +1214,7 @@ void test_nghttp3_conn_submit_request(void) {
12141214
nghttp3_arraylen(vec));
12151215

12161216
assert_int64(0, ==, stream_id);
1217-
assert_int64(1, ==, sveccnt);
1217+
assert_ptrdiff(1, ==, sveccnt);
12181218

12191219
rv = nghttp3_conn_add_write_offset(
12201220
conn, stream_id, (size_t)nghttp3_vec_len(vec, (size_t)sveccnt));
@@ -1233,7 +1233,7 @@ void test_nghttp3_conn_submit_request(void) {
12331233
nghttp3_arraylen(vec));
12341234

12351235
assert_int64(0, ==, stream_id);
1236-
assert_int64(1, ==, sveccnt);
1236+
assert_ptrdiff(1, ==, sveccnt);
12371237
assert_size(outq_idx - 1, ==, stream->outq_idx);
12381238

12391239
nghttp3_conn_del(conn);
@@ -1260,7 +1260,7 @@ void test_nghttp3_conn_submit_request(void) {
12601260

12611261
assert_int64(0, ==, stream_id);
12621262
assert_ptrdiff(1, ==, sveccnt);
1263-
assert_int(0, ==, fin);
1263+
assert_false(fin);
12641264

12651265
len = nghttp3_vec_len(vec, (size_t)sveccnt);
12661266

@@ -1277,7 +1277,7 @@ void test_nghttp3_conn_submit_request(void) {
12771277

12781278
assert_int64(0, ==, stream_id);
12791279
assert_ptrdiff(0, ==, sveccnt);
1280-
assert_int(1, ==, fin);
1280+
assert_true(fin);
12811281

12821282
/* This should not acknowledge fin which has not yet been handed out
12831283
to network. */
@@ -1290,7 +1290,7 @@ void test_nghttp3_conn_submit_request(void) {
12901290

12911291
assert_int64(0, ==, stream_id);
12921292
assert_ptrdiff(0, ==, sveccnt);
1293-
assert_int(1, ==, fin);
1293+
assert_true(fin);
12941294

12951295
rv = nghttp3_conn_add_write_offset(conn, stream_id, 0);
12961296

@@ -1377,7 +1377,7 @@ void test_nghttp3_conn_http_request(void) {
13771377
sveccnt = nghttp3_conn_writev_stream(cl, &stream_id, &fin, vec,
13781378
nghttp3_arraylen(vec));
13791379

1380-
assert_true(sveccnt >= 0);
1380+
assert_ptrdiff(0, <=, sveccnt);
13811381

13821382
if (sveccnt <= 0) {
13831383
break;
@@ -1392,7 +1392,7 @@ void test_nghttp3_conn_http_request(void) {
13921392
sconsumed =
13931393
nghttp3_conn_read_stream(sv, stream_id, vec[i].base, vec[i].len,
13941394
fin && i == (size_t)sveccnt - 1);
1395-
assert_true(sconsumed >= 0);
1395+
assert_ptrdiff(0, <=, sconsumed);
13961396

13971397
nread += vec[i].len;
13981398
nconsumed += (size_t)sconsumed;
@@ -1418,7 +1418,7 @@ void test_nghttp3_conn_http_request(void) {
14181418
sveccnt = nghttp3_conn_writev_stream(sv, &stream_id, &fin, vec,
14191419
nghttp3_arraylen(vec));
14201420

1421-
assert_true(sveccnt >= 0);
1421+
assert_ptrdiff(0, <=, sveccnt);
14221422

14231423
if (sveccnt <= 0) {
14241424
break;
@@ -1433,7 +1433,7 @@ void test_nghttp3_conn_http_request(void) {
14331433
sconsumed =
14341434
nghttp3_conn_read_stream(cl, stream_id, vec[i].base, vec[i].len,
14351435
fin && i == (size_t)sveccnt - 1);
1436-
assert_true(sconsumed >= 0);
1436+
assert_ptrdiff(0, <=, sconsumed);
14371437

14381438
nread += vec[i].len;
14391439
nconsumed += (size_t)sconsumed;
@@ -1502,7 +1502,7 @@ static void check_http_header(const nghttp3_nv *nva, size_t nvlen, int request,
15021502
assert_ptrdiff(want_lib_error, ==, sconsumed);
15031503
}
15041504
} else {
1505-
assert_true(sconsumed > 0);
1505+
assert_ptrdiff(0, <, sconsumed);
15061506
}
15071507

15081508
nghttp3_conn_del(conn);
@@ -2806,7 +2806,7 @@ void test_nghttp3_conn_http_error(void) {
28062806
sconsumed = nghttp3_conn_read_stream(conn, 0, buf.pos, nghttp3_buf_len(&buf),
28072807
/* fin = */ 0);
28082808

2809-
assert_true(sconsumed > 0);
2809+
assert_ptrdiff(0, <, sconsumed);
28102810
assert_ptrdiff(sconsumed, !=, (nghttp3_ssize)nghttp3_buf_len(&buf));
28112811
assert_size(0, ==, ud.stop_sending_cb.ncalled);
28122812
assert_size(0, ==, ud.reset_stream_cb.ncalled);
@@ -2912,7 +2912,7 @@ void test_nghttp3_conn_qpack_blocked_stream(void) {
29122912
sconsumed = nghttp3_conn_read_stream(conn, 0, buf.pos, nghttp3_buf_len(&buf),
29132913
/* fin = */ 0);
29142914

2915-
assert_true(sconsumed > 0);
2915+
assert_ptrdiff(0, <, sconsumed);
29162916
assert_ptrdiff((nghttp3_ssize)nghttp3_buf_len(&buf), !=, sconsumed);
29172917

29182918
buffered_datalen = nghttp3_buf_len(&buf) - (size_t)sconsumed;
@@ -2995,7 +2995,7 @@ void test_nghttp3_conn_qpack_blocked_stream(void) {
29952995
conn, 0, buf.pos, 5 /* Frame header + Header Block Prefix */,
29962996
/* fin = */ 1);
29972997

2998-
assert_true(sconsumed > 0);
2998+
assert_ptrdiff(0, <, sconsumed);
29992999
assert_ptrdiff((nghttp3_ssize)nghttp3_buf_len(&buf), !=, sconsumed);
30003000

30013001
rv = nghttp3_conn_close_stream(conn, 0, NGHTTP3_H3_NO_ERROR);
@@ -3106,7 +3106,7 @@ void test_nghttp3_conn_just_fin(void) {
31063106

31073107
assert_ptrdiff(1, ==, sveccnt);
31083108
assert_int64(0, ==, stream_id);
3109-
assert_int(1, ==, fin);
3109+
assert_true(fin);
31103110

31113111
rv = nghttp3_conn_add_write_offset(
31123112
conn, stream_id, (size_t)nghttp3_vec_len(vec, (size_t)sveccnt));
@@ -3127,7 +3127,7 @@ void test_nghttp3_conn_just_fin(void) {
31273127

31283128
assert_ptrdiff(1, ==, sveccnt);
31293129
assert_int64(4, ==, stream_id);
3130-
assert_int(0, ==, fin);
3130+
assert_false(fin);
31313131

31323132
rv = nghttp3_conn_add_write_offset(
31333133
conn, stream_id, (size_t)nghttp3_vec_len(vec, (size_t)sveccnt));
@@ -3142,7 +3142,7 @@ void test_nghttp3_conn_just_fin(void) {
31423142

31433143
assert_ptrdiff(0, ==, sveccnt);
31443144
assert_int64(4, ==, stream_id);
3145-
assert_int(1, ==, fin);
3145+
assert_true(fin);
31463146

31473147
rv = nghttp3_conn_add_write_offset(
31483148
conn, stream_id, (size_t)nghttp3_vec_len(vec, (size_t)sveccnt));
@@ -3154,7 +3154,7 @@ void test_nghttp3_conn_just_fin(void) {
31543154

31553155
assert_ptrdiff(0, ==, sveccnt);
31563156
assert_int64(-1, ==, stream_id);
3157-
assert_int(0, ==, fin);
3157+
assert_false(fin);
31583158

31593159
nghttp3_conn_del(conn);
31603160
}
@@ -3196,7 +3196,7 @@ void test_nghttp3_conn_submit_response_read_blocked(void) {
31963196
sveccnt = nghttp3_conn_writev_stream(conn, &stream_id, &fin, vec,
31973197
nghttp3_arraylen(vec));
31983198

3199-
assert_true(sveccnt >= 0);
3199+
assert_ptrdiff(0, <=, sveccnt);
32003200

32013201
if (sveccnt <= 0) {
32023202
break;
@@ -3451,7 +3451,7 @@ void test_nghttp3_conn_shutdown_server(void) {
34513451
sveccnt = nghttp3_conn_writev_stream(conn, &stream_id, &fin, vec,
34523452
nghttp3_arraylen(vec));
34533453

3454-
assert_true(sveccnt > 0);
3454+
assert_ptrdiff(0, <, sveccnt);
34553455
assert_int64(3, ==, stream_id);
34563456

34573457
nghttp3_buf_reset(&buf);
@@ -3531,7 +3531,7 @@ void test_nghttp3_conn_shutdown_client(void) {
35313531
sveccnt = nghttp3_conn_writev_stream(conn, &stream_id, &fin, vec,
35323532
nghttp3_arraylen(vec));
35333533

3534-
assert_true(sveccnt > 0);
3534+
assert_ptrdiff(0, <, sveccnt);
35353535
assert_int64(2, ==, stream_id);
35363536

35373537
nghttp3_buf_reset(&buf);
@@ -3764,6 +3764,8 @@ void test_nghttp3_conn_request_priority(void) {
37643764
nconsumed = nghttp3_conn_read_stream(conn, 0, buf.pos, nghttp3_buf_len(&buf),
37653765
/* fin = */ 1);
37663766

3767+
assert_ptrdiff((nghttp3_ssize)nghttp3_buf_len(&buf), ==, nconsumed);
3768+
37673769
stream = nghttp3_conn_find_stream(conn, 0);
37683770

37693771
assert_not_null(stream);
@@ -3802,6 +3804,8 @@ void test_nghttp3_conn_request_priority(void) {
38023804
nconsumed = nghttp3_conn_read_stream(conn, 0, buf.pos, nghttp3_buf_len(&buf),
38033805
/* fin = */ 1);
38043806

3807+
assert_ptrdiff((nghttp3_ssize)nghttp3_buf_len(&buf), ==, nconsumed);
3808+
38053809
stream = nghttp3_conn_find_stream(conn, 0);
38063810

38073811
assert_not_null(stream);
@@ -3860,7 +3864,7 @@ void test_nghttp3_conn_set_stream_priority(void) {
38603864
}
38613865
#undef NGHTTP3_PRI_DATA
38623866

3863-
assert_true(i < nghttp3_ringbuf_len(&stream->frq));
3867+
assert_size(nghttp3_ringbuf_len(&stream->frq), >, i);
38643868

38653869
nghttp3_conn_del(conn);
38663870

@@ -3970,7 +3974,7 @@ void test_nghttp3_conn_shutdown_stream_read(void) {
39703974
sconsumed = nghttp3_conn_read_stream(conn, 0, buf.pos, nghttp3_buf_len(&buf),
39713975
/* fin = */ 0);
39723976

3973-
assert_true(sconsumed > 0);
3977+
assert_ptrdiff(0, <, sconsumed);
39743978
assert_ptrdiff((nghttp3_ssize)nghttp3_buf_len(&buf), !=, sconsumed);
39753979

39763980
consumed_total += (size_t)sconsumed;

‎tests/nghttp3_qpack_test.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static void check_decode_header(nghttp3_qpack_decoder *dec, nghttp3_buf *pbuf,
7878
nread = nghttp3_qpack_decoder_read_request(
7979
dec, &sctx, &qnv, &flags, rbuf->pos, nghttp3_buf_len(rbuf), 1);
8080

81-
assert_true(nread > 0);
81+
assert_ptrdiff(0, <, nread);
8282

8383
if (nread < 0) {
8484
break;
@@ -128,7 +128,7 @@ static void decode_header_block(nghttp3_qpack_decoder *dec, nghttp3_buf *pbuf,
128128
nread = nghttp3_qpack_decoder_read_request(
129129
dec, &sctx, &qnv, &flags, rbuf->pos, nghttp3_buf_len(rbuf), 1);
130130

131-
assert_true(nread >= 0);
131+
assert_ptrdiff(0, <=, nread);
132132

133133
if (nread < 0) {
134134
break;
@@ -142,7 +142,7 @@ static void decode_header_block(nghttp3_qpack_decoder *dec, nghttp3_buf *pbuf,
142142
break;
143143
}
144144

145-
assert_true(nread > 0);
145+
assert_ptrdiff(0, <, nread);
146146
assert_true(flags & NGHTTP3_QPACK_DECODE_FLAG_EMIT);
147147

148148
nghttp3_rcbuf_decref(qnv.name);
@@ -387,7 +387,7 @@ void test_nghttp3_qpack_encoder_still_blocked(void) {
387387
ref =
388388
*(nghttp3_qpack_header_block_ref **)nghttp3_ringbuf_get(&stream->refs, 0);
389389

390-
assert_true(nghttp3_ringbuf_len(&stream->refs) > 1);
390+
assert_size(1, <, nghttp3_ringbuf_len(&stream->refs));
391391
assert_uint64(ref->max_cnt, !=, nghttp3_qpack_stream_get_max_cnt(stream));
392392

393393
ref =
@@ -754,7 +754,7 @@ void test_nghttp3_qpack_decoder_feedback(void) {
754754
nghttp3_buf_reset(&dbuf);
755755
nghttp3_qpack_decoder_write_decoder(&dec, &dbuf);
756756

757-
assert_true(nghttp3_buf_len(&dbuf) > 0);
757+
assert_size(0, <, nghttp3_buf_len(&dbuf));
758758
assert_uint64(3, ==, dec.written_icnt);
759759

760760
nread =
@@ -773,7 +773,7 @@ void test_nghttp3_qpack_decoder_feedback(void) {
773773
nghttp3_buf_reset(&dbuf);
774774
nghttp3_qpack_decoder_write_decoder(&dec, &dbuf);
775775

776-
assert_true(nghttp3_buf_len(&dbuf) > 0);
776+
assert_size(0, <, nghttp3_buf_len(&dbuf));
777777

778778
nread =
779779
nghttp3_qpack_encoder_read_decoder(&enc, dbuf.pos, nghttp3_buf_len(&dbuf));
@@ -833,7 +833,7 @@ void test_nghttp3_qpack_huffman(void) {
833833
nwrite =
834834
nghttp3_qpack_huffman_decode(&ctx, dbuf, ebuf, (size_t)(end - ebuf), 1);
835835
if (nwrite <= 0) {
836-
assert_true(nwrite > 0);
836+
assert_ptrdiff(0, <, nwrite);
837837
continue;
838838
}
839839
assert_size(sizeof(raw), ==, (size_t)nwrite);

0 commit comments

Comments
 (0)