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 {
14951495}
14961496
14971497test "json.parser.dynamic" {
1498 var memory: [1024 * 16]u8 = undefined;
1499 var buf_alloc = std.heap.FixedBufferAllocator.init(&memory);
1500
1501 var p = Parser.init(&buf_alloc.allocator, false);
1498 var p = Parser.init(testing.allocator, false);
15021499 defer p.deinit();
15031500
15041501 const s =
......@@ -1588,10 +1585,10 @@ test "write json then parse it" {
15881585
15891586 try jw.endObject();
15901587
1591 var mem_buffer: [1024 * 20]u8 = undefined;
1592 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;
1593 var parser = Parser.init(allocator, false);
1594 const tree = try parser.parse(slice_out_stream.getWritten());
1588 var parser = Parser.init(testing.allocator, false);
1589 defer parser.deinit();
1590 var tree = try parser.parse(slice_out_stream.getWritten());
1591 defer tree.deinit();
15951592
15961593 testing.expect(tree.root.Object.get("f").?.value.Bool == false);
15971594 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");
88fn ok(comptime s: []const u8) void {
99 std.testing.expect(std.json.validate(s));
1010
11 var mem_buffer: [1024 * 20]u8 = undefined;
12 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;
13 var p = std.json.Parser.init(allocator, false);
11 var p = std.json.Parser.init(std.testing.allocator, false);
12 defer p.deinit();
1413
15 _ = p.parse(s) catch unreachable;
14 var tree = p.parse(s) catch unreachable;
15 defer tree.deinit();
1616}
1717
1818fn err(comptime s: []const u8) void {
1919 std.testing.expect(!std.json.validate(s));
2020
21 var mem_buffer: [1024 * 20]u8 = undefined;
22 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;
23 var p = std.json.Parser.init(allocator, false);
21 var p = std.json.Parser.init(std.testing.allocator, false);
22 defer p.deinit();
2423
2524 if (p.parse(s)) |_| {
2625 unreachable;
......@@ -30,9 +29,8 @@ fn err(comptime s: []const u8) void {
3029fn utf8Error(comptime s: []const u8) void {
3130 std.testing.expect(!std.json.validate(s));
3231
33 var mem_buffer: [1024 * 20]u8 = undefined;
34 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;
35 var p = std.json.Parser.init(allocator, false);
32 var p = std.json.Parser.init(std.testing.allocator, false);
33 defer p.deinit();
3634
3735 if (p.parse(s)) |_| {
3836 unreachable;
......@@ -44,19 +42,18 @@ fn utf8Error(comptime s: []const u8) void {
4442fn any(comptime s: []const u8) void {
4543 _ = std.json.validate(s);
4644
47 var mem_buffer: [1024 * 20]u8 = undefined;
48 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;
49 var p = std.json.Parser.init(allocator, false);
45 var p = std.json.Parser.init(std.testing.allocator, false);
46 defer p.deinit();
5047
51 _ = p.parse(s) catch {};
48 var tree = p.parse(s) catch return;
49 defer tree.deinit();
5250}
5351
5452fn anyStreamingErrNonStreaming(comptime s: []const u8) void {
5553 _ = std.json.validate(s);
5654
57 var mem_buffer: [1024 * 20]u8 = undefined;
58 const allocator = &std.heap.FixedBufferAllocator.init(&mem_buffer).allocator;
59 var p = std.json.Parser.init(allocator, false);
55 var p = std.json.Parser.init(std.testing.allocator, false);
56 defer p.deinit();
6057
6158 if (p.parse(s)) |_| {
6259 unreachable;