Commit 21550bb7cd5596e24a623f5ae1374502e879b553 | zig

author	xackus <14938807+xackus@users.noreply.github.com> 2020-12-05 11:10:44+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-12-08 19:16:17-05:00
log	21550bb7cd5596e24a623f5ae1374502e879b553
tree	9620fcd1953415df0f01eb214216ead02f07f386
parent	8ac711596d3fd698bf3ee84ec2514c8c84103680

std.json: unreachable -> expect in tests

1 files changed, 21 insertions(+), 34 deletions(-)

lib
- std
  - json
    test.zig

lib/std/json/test.zig+21-34

...	...	@@ -9,60 +9,47 @@
9	9	// Read also http://seriot.ch/parsing_json.php for a good overview.
10	10
11	11	const std = @import("../std.zig");
	12	const json = std.json;
	13	const testing = std.testing;
12	14
13		fn ok(comptime s: []const u8) void {
14		std.testing.expect(std.json.validate(s));
15
16		var p = std.json.Parser.init(std.testing.allocator, false);
	15	fn testNonStreaming(comptime s: []const u8) !void {
	16	var p = json.Parser.init(testing.allocator, false);
17	17	defer p.deinit();
18	18
19		var tree = p.parse(s) catch unreachable;
	19	var tree = try p.parse(s);
20	20	defer tree.deinit();
21	21	}
22	22
23		fn err(comptime s: []const u8) void {
24		std.testing.expect(!std.json.validate(s));
	23	fn ok(comptime s: []const u8) void {
	24	testing.expect(json.validate(s));
25	25
26		var p = std.json.Parser.init(std.testing.allocator, false);
27		defer p.deinit();
	26	testNonStreaming(s) catch testing.expect(false);
	27	}
	28
	29	fn err(comptime s: []const u8) void {
	30	testing.expect(!json.validate(s));
28	31
29		if (p.parse(s)) \|_\| {
30		unreachable;
31		} else \|_\| {}
	32	testNonStreaming(s) catch return;
	33	testing.expect(false);
32	34	}
33	35
34	36	fn utf8Error(comptime s: []const u8) void {
35		std.testing.expect(!std.json.validate(s));
	37	testing.expect(!json.validate(s));
36	38
37		var p = std.json.Parser.init(std.testing.allocator, false);
38		defer p.deinit();
39
40		if (p.parse(s)) \|_\| {
41		unreachable;
42		} else \|e\| {
43		std.testing.expect(e == error.InvalidUtf8Byte);
44		}
	39	testing.expectError(error.InvalidUtf8Byte, testNonStreaming(s));
45	40	}
46	41
47	42	fn any(comptime s: []const u8) void {
48		_ = std.json.validate(s);
49
50		var p = std.json.Parser.init(std.testing.allocator, false);
51		defer p.deinit();
	43	_ = json.validate(s);
52	44
53		var tree = p.parse(s) catch return;
54		defer tree.deinit();
	45	testNonStreaming(s) catch {};
55	46	}
56	47
57	48	fn anyStreamingErrNonStreaming(comptime s: []const u8) void {
58		_ = std.json.validate(s);
59
60		var p = std.json.Parser.init(std.testing.allocator, false);
61		defer p.deinit();
	49	_ = json.validate(s);
62	50
63		if (p.parse(s)) \|_\| {
64		unreachable;
65		} else \|_\| {}
	51	testNonStreaming(s) catch return;
	52	testing.expect(false);
66	53	}
67	54
68	55	////////////////////////////////////////////////////////////////////////////////////////////////////