authorgravatar for benjamin.feng@glassdoor.comBenjamin Feng <benjamin.feng@glassdoor.com> 2020-01-31 21:27:59-06:00
committergravatar for benjamin.feng@glassdoor.comBenjamin Feng <benjamin.feng@glassdoor.com> 2020-02-12 17:17:56-06:00
loga81ae1223d4ea4aea689fc8a03004abfb865a884
treee8e76511a33038a80abc040ee2cf1e96f82a5f4d
parent699c50a375fb6755a4116c94e6068620d070bd98

Convert a lot of json tests to use testing.allocator

2 files changed, 19 insertions(+), 25 deletions(-)

lib/std/json.zig+5-8
...@@ -1495,10 +1495,7 @@ fn unescapeString(output: []u8, input: []const u8) !void {...@@ -1495,10 +1495,7 @@ fn unescapeString(output: []u8, input: []const u8) !void {
1495}1495}
14961496
1497test "json.parser.dynamic" {1497test "json.parser.dynamic" {
1498 var memory: [1024 * 16]u8 = undefined;1498 var p = Parser.init(testing.allocator, false);
1499 var buf_alloc = std.heap.FixedBufferAllocator.init(&memory);
1500
1501 var p = Parser.init(&buf_alloc.allocator, false);
1502 defer p.deinit();1499 defer p.deinit();
15031500
1504 const s =1501 const s =
...@@ -1588,10 +1585,10 @@ test "write json then parse it" {...@@ -1588,10 +1585,10 @@ test "write json then parse it" {
15881585
1589 try jw.endObject();1586 try jw.endObject();
15901587
1591 var mem_buffer: [1024 * 20]u8 = undefined;1588 var parser = Parser.init(testing.allocator, false);
1592 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;1589 defer parser.deinit();
1593 var parser = Parser.init(allocator, false);1590 var tree = try parser.parse(slice_out_stream.getWritten());
1594 const tree = try parser.parse(slice_out_stream.getWritten());1591 defer tree.deinit();
15951592
1596 testing.expect(tree.root.Object.get("f").?.value.Bool == false);1593 testing.expect(tree.root.Object.get("f").?.value.Bool == false);
1597 testing.expect(tree.root.Object.get("t").?.value.Bool == true);1594 testing.expect(tree.root.Object.get("t").?.value.Bool == true);
lib/std/json/test.zig+14-17
...@@ -8,19 +8,18 @@ const std = @import("../std.zig");...@@ -8,19 +8,18 @@ const std = @import("../std.zig");
8fn ok(comptime s: []const u8) void {8fn ok(comptime s: []const u8) void {
9 std.testing.expect(std.json.validate(s));9 std.testing.expect(std.json.validate(s));
1010
11 var mem_buffer: [1024 * 20]u8 = undefined;11 var p = std.json.Parser.init(std.testing.allocator, false);
12 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;12 defer p.deinit();
13 var p = std.json.Parser.init(allocator, false);
1413
15 _ = p.parse(s) catch unreachable;14 var tree = p.parse(s) catch unreachable;
15 defer tree.deinit();
16}16}
1717
18fn err(comptime s: []const u8) void {18fn err(comptime s: []const u8) void {
19 std.testing.expect(!std.json.validate(s));19 std.testing.expect(!std.json.validate(s));
2020
21 var mem_buffer: [1024 * 20]u8 = undefined;21 var p = std.json.Parser.init(std.testing.allocator, false);
22 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;22 defer p.deinit();
23 var p = std.json.Parser.init(allocator, false);
2423
25 if (p.parse(s)) |_| {24 if (p.parse(s)) |_| {
26 unreachable;25 unreachable;
...@@ -30,9 +29,8 @@ fn err(comptime s: []const u8) void {...@@ -30,9 +29,8 @@ fn err(comptime s: []const u8) void {
30fn utf8Error(comptime s: []const u8) void {29fn utf8Error(comptime s: []const u8) void {
31 std.testing.expect(!std.json.validate(s));30 std.testing.expect(!std.json.validate(s));
3231
33 var mem_buffer: [1024 * 20]u8 = undefined;32 var p = std.json.Parser.init(std.testing.allocator, false);
34 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;33 defer p.deinit();
35 var p = std.json.Parser.init(allocator, false);
3634
37 if (p.parse(s)) |_| {35 if (p.parse(s)) |_| {
38 unreachable;36 unreachable;
...@@ -44,19 +42,18 @@ fn utf8Error(comptime s: []const u8) void {...@@ -44,19 +42,18 @@ fn utf8Error(comptime s: []const u8) void {
44fn any(comptime s: []const u8) void {42fn any(comptime s: []const u8) void {
45 _ = std.json.validate(s);43 _ = std.json.validate(s);
4644
47 var mem_buffer: [1024 * 20]u8 = undefined;45 var p = std.json.Parser.init(std.testing.allocator, false);
48 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;46 defer p.deinit();
49 var p = std.json.Parser.init(allocator, false);
5047
51 _ = p.parse(s) catch {};48 var tree = p.parse(s) catch return;
49 defer tree.deinit();
52}50}
5351
54fn anyStreamingErrNonStreaming(comptime s: []const u8) void {52fn anyStreamingErrNonStreaming(comptime s: []const u8) void {
55 _ = std.json.validate(s);53 _ = std.json.validate(s);
5654
57 var mem_buffer: [1024 * 20]u8 = undefined;55 var p = std.json.Parser.init(std.testing.allocator, false);
58 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;56 defer p.deinit();
59 var p = std.json.Parser.init(allocator, false);
6057
61 if (p.parse(s)) |_| {58 if (p.parse(s)) |_| {
62 unreachable;59 unreachable;