mirrors/zits
1
0
Fork 0
mirror of https://git.robbyzambito.me/zits synced 2026-02-04 11:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests to work again

Browse Source
This commit is contained in:
Robby Zambito
2026-01-05 18:26:17 -05:00
parent 1d2af4a69a
commit 3342aa22ab
1 changed files with 114 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
src/server/message_parser.zig
View File

@@ -452,10 +452,10 @@ test parseSub {
{ {
var in: Reader = .fixed(" foo 1\r\n"); var in: Reader = .fixed(" foo 1\r\n");
var res = try parseSub(alloc, &in); var res = try parseSub(alloc, &in);
defer res.sub.deinit(alloc); defer res.SUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.sub = .{ .SUB = .{
.subject = "foo", .subject = "foo",
.queue_group = null, .queue_group = null,
.sid = "1", .sid = "1",
@@ -467,10 +467,10 @@ test parseSub {
{ {
var in: Reader = .fixed(" foo 1\r\n"); var in: Reader = .fixed(" foo 1\r\n");
var res = try parseSub(alloc, &in); var res = try parseSub(alloc, &in);
defer res.sub.deinit(alloc); defer res.SUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.sub = .{ .SUB = .{
.subject = "foo", .subject = "foo",
.queue_group = null, .queue_group = null,
.sid = "1", .sid = "1",
@@ -482,10 +482,10 @@ test parseSub {
{ {
var in: Reader = .fixed(" foo q 1\r\n"); var in: Reader = .fixed(" foo q 1\r\n");
var res = try parseSub(alloc, &in); var res = try parseSub(alloc, &in);
defer res.sub.deinit(alloc); defer res.SUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.sub = .{ .SUB = .{
.subject = "foo", .subject = "foo",
.queue_group = "q", .queue_group = "q",
.sid = "1", .sid = "1",
@@ -497,10 +497,10 @@ test parseSub {
{ {
var in: Reader = .fixed(" 1 q 1\r\n"); var in: Reader = .fixed(" 1 q 1\r\n");
var res = try parseSub(alloc, &in); var res = try parseSub(alloc, &in);
defer res.sub.deinit(alloc); defer res.SUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.sub = .{ .SUB = .{
.subject = "1", .subject = "1",
.queue_group = "q", .queue_group = "q",
.sid = "1", .sid = "1",
@@ -512,10 +512,10 @@ test parseSub {
{ {
var in: Reader = .fixed(" $SRV.PING 4\r\n"); var in: Reader = .fixed(" $SRV.PING 4\r\n");
var res = try parseSub(alloc, &in); var res = try parseSub(alloc, &in);
defer res.sub.deinit(alloc); defer res.SUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.sub = .{ .SUB = .{
.subject = "$SRV.PING", .subject = "$SRV.PING",
.queue_group = null, .queue_group = null,
.sid = "4", .sid = "4",
@@ -527,10 +527,10 @@ test parseSub {
{ {
var in: Reader = .fixed(" foo.echo q 10\r\n"); var in: Reader = .fixed(" foo.echo q 10\r\n");
var res = try parseSub(alloc, &in); var res = try parseSub(alloc, &in);
defer res.sub.deinit(alloc); defer res.SUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.sub = .{ .SUB = .{
.subject = "foo.echo", .subject = "foo.echo",
.queue_group = "q", .queue_group = "q",
.sid = "10", .sid = "10",
@@ -613,10 +613,10 @@ test parseUnsub {
{ {
var in: Reader = .fixed(" 1\r\n"); var in: Reader = .fixed(" 1\r\n");
var res = try parseUnsub(alloc, &in); var res = try parseUnsub(alloc, &in);
defer res.unsub.deinit(alloc); defer res.UNSUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.unsub = .{ .UNSUB = .{
.sid = "1", .sid = "1",
.max_msgs = null, .max_msgs = null,
}, },
@@ -629,10 +629,10 @@ test parseUnsub {
{ {
var in: Reader = .fixed(" 1 1\r\n"); var in: Reader = .fixed(" 1 1\r\n");
var res = try parseUnsub(alloc, &in); var res = try parseUnsub(alloc, &in);
defer res.unsub.deinit(alloc); defer res.UNSUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.unsub = .{ .UNSUB = .{
.sid = "1", .sid = "1",
.max_msgs = 1, .max_msgs = 1,
}, },
@@ -738,13 +738,21 @@ test parsePub {
{ {
var in: Reader = .fixed(" foo 3\r\nbar\r\n"); var in: Reader = .fixed(" foo 3\r\nbar\r\n");
var res = try parsePub(alloc, &in); var res = try parsePub(alloc, &in);
defer res.@"pub".deinit(alloc); defer res.PUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.@"pub" = .{ .PUB = .{
.subject = "foo", .subject = "foo",
.reply_to = null, .reply_to = null,
.payload = "bar", .payload = .{
.len = 3,
.short = blk: {
var s: [128]u8 = undefined;
@memcpy(s[0..3], "bar");
break :blk s;
},
.long = null,
},
}, },
}, },
res, res,
@@ -755,13 +763,21 @@ test parsePub {
{ {
var in: Reader = .fixed(" foo reply.to 3\r\nbar\r\n"); var in: Reader = .fixed(" foo reply.to 3\r\nbar\r\n");
var res = try parsePub(alloc, &in); var res = try parsePub(alloc, &in);
defer res.@"pub".deinit(alloc); defer res.PUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.@"pub" = .{ .PUB = .{
.subject = "foo", .subject = "foo",
.reply_to = "reply.to", .reply_to = "reply.to",
.payload = "bar", .payload = .{
.len = 3,
.short = blk: {
var s: [128]u8 = undefined;
@memcpy(s[0..3], "bar");
break :blk s;
},
.long = null,
},
}, },
}, },
res, res,
@@ -773,13 +789,21 @@ test parsePub {
{ {
var in: Reader = .fixed(" foo 5 3\r\nbar\r\n"); var in: Reader = .fixed(" foo 5 3\r\nbar\r\n");
var res = try parsePub(alloc, &in); var res = try parsePub(alloc, &in);
defer res.@"pub".deinit(alloc); defer res.PUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.@"pub" = .{ .PUB = .{
.subject = "foo", .subject = "foo",
.reply_to = "5", .reply_to = "5",
.payload = "bar", .payload = .{
.len = 3,
.short = blk: {
var s: [128]u8 = undefined;
@memcpy(s[0..3], "bar");
break :blk s;
},
.long = null,
},
}, },
}, },
res, res,
@@ -912,15 +936,24 @@ test parseHPub {
{ {
var in: Reader = .fixed(" foo 22 33\r\nNATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!\r\n"); var in: Reader = .fixed(" foo 22 33\r\nNATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!\r\n");
var res = try parseHPub(alloc, &in); var res = try parseHPub(alloc, &in);
defer res.hpub.deinit(alloc); defer res.HPUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.hpub = .{ .HPUB = .{
.header_bytes = 22, .header_bytes = 22,
.@"pub" = .{ .@"pub" = .{
.subject = "foo", .subject = "foo",
.reply_to = null, .reply_to = null,
.payload = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!", .payload = .{
.len = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!".len,
.short = blk: {
var s: [128]u8 = undefined;
const str = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!";
@memcpy(s[0..str.len], str);
break :blk s;
},
.long = null,
},
}, },
}, },
}, },
@@ -932,15 +965,24 @@ test parseHPub {
{ {
var in: Reader = .fixed(" foo reply.to 22 33\r\nNATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!\r\n"); var in: Reader = .fixed(" foo reply.to 22 33\r\nNATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!\r\n");
var res = try parseHPub(alloc, &in); var res = try parseHPub(alloc, &in);
defer res.hpub.deinit(alloc); defer res.HPUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.hpub = .{ .HPUB = .{
.header_bytes = 22, .header_bytes = 22,
.@"pub" = .{ .@"pub" = .{
.subject = "foo", .subject = "foo",
.reply_to = "reply.to", .reply_to = "reply.to",
.payload = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!", .payload = .{
.len = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!".len,
.short = blk: {
var s: [128]u8 = undefined;
const str = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!";
@memcpy(s[0..str.len], str);
break :blk s;
},
.long = null,
},
}, },
}, },
}, },
@@ -952,15 +994,24 @@ test parseHPub {
{ {
var in: Reader = .fixed(" foo 6 22 33\r\nNATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!\r\n"); var in: Reader = .fixed(" foo 6 22 33\r\nNATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!\r\n");
var res = try parseHPub(alloc, &in); var res = try parseHPub(alloc, &in);
defer res.hpub.deinit(alloc); defer res.HPUB.deinit(alloc);
try expectEqualDeep( try expectEqualDeep(
Message{ Message{
.hpub = .{ .HPUB = .{
.header_bytes = 22, .header_bytes = 22,
.@"pub" = .{ .@"pub" = .{
.subject = "foo", .subject = "foo",
.reply_to = "6", .reply_to = "6",
.payload = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!", .payload = .{
.len = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!".len,
.short = blk: {
var s: [128]u8 = undefined;
const str = "NATS/1.0\r\nBar: Baz\r\n\r\nHello NATS!";
@memcpy(s[0..str.len], str);
break :blk s;
},
.long = null,
},
}, },
}, },
}, },
@@ -1041,27 +1092,40 @@ test "parsing a stream" {
{ {
const msg: Message = try Message.next(gpa, &reader); const msg: Message = try Message.next(gpa, &reader);
const expected: Message = .{ .connect = .{ const expected: Message = .{
.verbose = false, .CONNECT = .{
.pedantic = false, .verbose = false,
.tls_required = false, .pedantic = false,
.name = "NATS CLI Version v0.2.4", .tls_required = false,
.lang = "go", .name = "NATS CLI Version v0.2.4",
.version = "1.43.0", .lang = "go",
.protocol = 1, .version = "1.43.0",
.echo = true, .protocol = 1,
.headers = true, .echo = true,
.no_responders = true, .headers = true,
} }; .no_responders = true,
},
};
try expectEqualDeep(expected, msg); try expectEqualDeep(expected, msg);
} }
{ {
const msg: Message = try Message.next(gpa, &reader); const msg: Message = try Message.next(gpa, &reader);
const expected: Message = .{ .@"pub" = .{ const expected: Message = .{
.subject = "hi", .PUB = .{
.payload = "foo", .subject = "hi",
} }; .payload = .{
.len = 3,
.short = blk: {
var s: [128]u8 = undefined;
const str = "foo";
@memcpy(s[0..str.len], str);
break :blk s;
},
.long = null,
},
},
};
try expectEqualDeep(expected, msg); try expectEqualDeep(expected, msg);
} }
} }