From ae2d5063d760a6f383ca195d766e44e5f8bcc6ed Mon Sep 17 00:00:00 2001 From: Jimmi HC Date: Tue, 19 Jun 2018 14:29:29 +0200 Subject: Updated to newest version of zig --- tests/core.zig | 136 ++++++++++++++++++++++++----------------------------- tests/extended.zig | 68 +++++++++++++-------------- 2 files changed, 93 insertions(+), 111 deletions(-) (limited to 'tests') diff --git a/tests/core.zig b/tests/core.zig index 91b62fe..765b161 100644 --- a/tests/core.zig +++ b/tests/core.zig @@ -19,116 +19,102 @@ fn testNoErr(params: []const Param(u8), args: []const []const u8, ids: []const u var i: usize = 0; while (iter.next() catch unreachable) |arg| : (i += 1) { debug.assert(ids[i] == arg.param.id); - const expected_value = values[i] ?? { + const expected_value = values[i] orelse { debug.assert(arg.value == null); continue; }; - const actual_value = arg.value ?? unreachable; + const actual_value = arg.value orelse unreachable; debug.assert(mem.eql(u8, expected_value, actual_value)); } } test "clap.core: short" { - const params = []Param(u8) { + const params = []Param(u8){ Param(u8).init(0, false, Names.short('a')), Param(u8).init(1, false, Names.short('b')), - Param(u8).init(2, true, Names.short('c')), + Param(u8).init(2, true, Names.short('c')), }; - testNoErr(params, [][]const u8 { "-a" }, []u8{0}, []?[]const u8{null}); - testNoErr(params, [][]const u8 { "-a", "-b" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "-ab" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "-c=100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "-c100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "-c", "100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "-abc", "100" }, []u8{0,1,2}, []?[]const u8{null,null,"100"}); - testNoErr(params, [][]const u8 { "-abc=100" }, []u8{0,1,2}, []?[]const u8{null,null,"100"}); - testNoErr(params, [][]const u8 { "-abc100" }, []u8{0,1,2}, []?[]const u8{null,null,"100"}); + testNoErr(params, [][]const u8{"-a"}, []u8{0}, []?[]const u8{null}); + testNoErr(params, [][]const u8{ "-a", "-b" }, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"-ab"}, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"-c=100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{"-c100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "-c", "100" }, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "-abc", "100" }, []u8{ 0, 1, 2 }, []?[]const u8{ null, null, "100" }); + testNoErr(params, [][]const u8{"-abc=100"}, []u8{ 0, 1, 2 }, []?[]const u8{ null, null, "100" }); + testNoErr(params, [][]const u8{"-abc100"}, []u8{ 0, 1, 2 }, []?[]const u8{ null, null, "100" }); } test "clap.core: long" { - const params = []Param(u8) { + const params = []Param(u8){ Param(u8).init(0, false, Names.long("aa")), Param(u8).init(1, false, Names.long("bb")), - Param(u8).init(2, true, Names.long("cc")), + Param(u8).init(2, true, Names.long("cc")), }; - testNoErr(params, [][]const u8 { "--aa" }, []u8{0}, []?[]const u8{null}); - testNoErr(params, [][]const u8 { "--aa", "--bb" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "--cc=100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "--cc", "100" }, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{"--aa"}, []u8{0}, []?[]const u8{null}); + testNoErr(params, [][]const u8{ "--aa", "--bb" }, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"--cc=100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "--cc", "100" }, []u8{2}, []?[]const u8{"100"}); } test "clap.core: bare" { - const params = []Param(u8) { + const params = []Param(u8){ Param(u8).init(0, false, Names.bare("aa")), Param(u8).init(1, false, Names.bare("bb")), - Param(u8).init(2, true, Names.bare("cc")), + Param(u8).init(2, true, Names.bare("cc")), }; - testNoErr(params, [][]const u8 { "aa" }, []u8{0}, []?[]const u8{null}); - testNoErr(params, [][]const u8 { "aa", "bb" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "cc=100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "cc", "100" }, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{"aa"}, []u8{0}, []?[]const u8{null}); + testNoErr(params, [][]const u8{ "aa", "bb" }, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"cc=100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "cc", "100" }, []u8{2}, []?[]const u8{"100"}); } test "clap.core: none" { - const params = []Param(u8) { - Param(u8).init(0, true, Names.none()), - }; + const params = []Param(u8){Param(u8).init(0, true, Names.none())}; - testNoErr(params, [][]const u8 { "aa" }, []u8{0}, []?[]const u8{"aa"}); + testNoErr(params, [][]const u8{"aa"}, []u8{0}, []?[]const u8{"aa"}); } test "clap.core: all" { - const params = []Param(u8) { - Param(u8).init( - 0, - false, - Names{ - .bare = "aa", - .short = 'a', - .long = "aa", - } - ), - Param(u8).init( - 1, - false, - Names{ - .bare = "bb", - .short = 'b', - .long = "bb", - } - ), - Param(u8).init( - 2, - true, - Names{ - .bare = "cc", - .short = 'c', - .long = "cc", - } - ), + const params = []Param(u8){ + Param(u8).init(0, false, Names{ + .bare = "aa", + .short = 'a', + .long = "aa", + }), + Param(u8).init(1, false, Names{ + .bare = "bb", + .short = 'b', + .long = "bb", + }), + Param(u8).init(2, true, Names{ + .bare = "cc", + .short = 'c', + .long = "cc", + }), Param(u8).init(3, true, Names.none()), }; - testNoErr(params, [][]const u8 { "-a" }, []u8{0}, []?[]const u8{null}); - testNoErr(params, [][]const u8 { "-a", "-b" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "-ab" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "-c=100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "-c100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "-c", "100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "-abc", "100" }, []u8{0,1,2}, []?[]const u8{null,null,"100"}); - testNoErr(params, [][]const u8 { "-abc=100" }, []u8{0,1,2}, []?[]const u8{null,null,"100"}); - testNoErr(params, [][]const u8 { "-abc100" }, []u8{0,1,2}, []?[]const u8{null,null,"100"}); - testNoErr(params, [][]const u8 { "--aa" }, []u8{0}, []?[]const u8{null}); - testNoErr(params, [][]const u8 { "--aa", "--bb" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "--cc=100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "--cc", "100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "aa" }, []u8{0}, []?[]const u8{null}); - testNoErr(params, [][]const u8 { "aa", "bb" }, []u8{0,1}, []?[]const u8{null,null}); - testNoErr(params, [][]const u8 { "cc=100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "cc", "100" }, []u8{2}, []?[]const u8{"100"}); - testNoErr(params, [][]const u8 { "dd" }, []u8{3}, []?[]const u8{"dd"}); + testNoErr(params, [][]const u8{"-a"}, []u8{0}, []?[]const u8{null}); + testNoErr(params, [][]const u8{ "-a", "-b" }, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"-ab"}, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"-c=100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{"-c100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "-c", "100" }, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "-abc", "100" }, []u8{ 0, 1, 2 }, []?[]const u8{ null, null, "100" }); + testNoErr(params, [][]const u8{"-abc=100"}, []u8{ 0, 1, 2 }, []?[]const u8{ null, null, "100" }); + testNoErr(params, [][]const u8{"-abc100"}, []u8{ 0, 1, 2 }, []?[]const u8{ null, null, "100" }); + testNoErr(params, [][]const u8{"--aa"}, []u8{0}, []?[]const u8{null}); + testNoErr(params, [][]const u8{ "--aa", "--bb" }, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"--cc=100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "--cc", "100" }, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{"aa"}, []u8{0}, []?[]const u8{null}); + testNoErr(params, [][]const u8{ "aa", "bb" }, []u8{ 0, 1 }, []?[]const u8{ null, null }); + testNoErr(params, [][]const u8{"cc=100"}, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{ "cc", "100" }, []u8{2}, []?[]const u8{"100"}); + testNoErr(params, [][]const u8{"dd"}, []u8{3}, []?[]const u8{"dd"}); } diff --git a/tests/extended.zig b/tests/extended.zig index 78c319e..3dbb87d 100644 --- a/tests/extended.zig +++ b/tests/extended.zig @@ -29,18 +29,14 @@ pub fn Test(comptime Expect: type) type { pub fn success(args: []const []const u8, expected: *const Expect) Self { return Self{ .args = args, - .kind = Kind{ - .Success = expected.*, - }, + .kind = Kind{ .Success = expected.* }, }; } pub fn fail(args: []const []const u8, err: error) Self { return Self{ .args = args, - .kind = Kind{ - .Fail = err, - }, + .kind = Kind{ .Fail = err }, }; } @@ -86,74 +82,74 @@ test "clap.extended: short" { break :p res; }, Param.option("b", Names.short('b'), &Parser.int(u8, 10)), - } + }, }; const T = Test(S); const tests = []T{ T.success( - [][]const u8 { "-a" }, + [][]const u8{"-a"}, S{ .a = true, .b = 0, }, ), T.success( - [][]const u8 { "-a", "-b", "100" }, + [][]const u8{ "-a", "-b", "100" }, S{ .a = true, .b = 100, }, ), T.success( - [][]const u8 { "-a", "-b=100" }, + [][]const u8{ "-a", "-b=100" }, S{ .a = true, .b = 100, }, ), T.success( - [][]const u8 { "-a", "-b100" }, + [][]const u8{ "-a", "-b100" }, S{ .a = true, .b = 100, }, ), T.success( - [][]const u8 { "-ab", "100" }, + [][]const u8{ "-ab", "100" }, S{ .a = true, .b = 100, }, ), T.success( - [][]const u8 { "-ab=100" }, + [][]const u8{"-ab=100"}, S{ .a = true, .b = 100, }, ), T.success( - [][]const u8 { "-ab100" }, + [][]const u8{"-ab100"}, S{ .a = true, .b = 100, }, ), T.fail( - [][]const u8 { "-q" }, + [][]const u8{"-q"}, error.InvalidArgument, ), T.fail( - [][]const u8 { "--a" }, + [][]const u8{"--a"}, error.InvalidArgument, ), T.fail( - [][]const u8 { "-b=100" }, + [][]const u8{"-b=100"}, error.ParamNotHandled, ), T.fail( - [][]const u8 { "-b=100", "-a" }, + [][]const u8{ "-b=100", "-a" }, error.InvalidArgument, ), }; @@ -182,50 +178,50 @@ test "clap.extended: long" { break :p res; }, Param.option("b", Names.long('b'), &Parser.int(u8, 10)), - } + }, }; const T = Test(S); const tests = []T{ T.success( - [][]const u8 { "--a" }, + [][]const u8{"--a"}, S{ .a = true, .b = 0, }, ), T.success( - [][]const u8 { "--a", "--b", "100" }, + [][]const u8{ "--a", "--b", "100" }, S{ .a = true, .b = 100, }, ), T.success( - [][]const u8 { "--a", "--b=100" }, + [][]const u8{ "--a", "--b=100" }, S{ .a = true, .b = 100, }, ), T.fail( - [][]const u8 { "--a=100" }, + [][]const u8{"--a=100"}, error.DoesntTakeValue, ), T.fail( - [][]const u8 { "--q" }, + [][]const u8{"--q"}, error.InvalidArgument, ), T.fail( - [][]const u8 { "-a" }, + [][]const u8{"-a"}, error.InvalidArgument, ), T.fail( - [][]const u8 { "--b=100" }, + [][]const u8{"--b=100"}, error.ParamNotHandled, ), T.fail( - [][]const u8 { "--b=100", "--a" }, + [][]const u8{ "--b=100", "--a" }, error.InvalidArgument, ), }; @@ -254,50 +250,50 @@ test "clap.extended: bare" { break :p res; }, Param.option("b", Names.bare('b'), &Parser.int(u8, 10)), - } + }, }; const T = Test(S); const tests = []T{ T.success( - [][]const u8 { "a" }, + [][]const u8{"a"}, S{ .a = true, .b = 0, }, ), T.success( - [][]const u8 { "a", "b", "100" }, + [][]const u8{ "a", "b", "100" }, S{ .a = true, .b = 100, }, ), T.success( - [][]const u8 { "a", "b=100" }, + [][]const u8{ "a", "b=100" }, S{ .a = true, .b = 100, }, ), T.fail( - [][]const u8 { "a=100" }, + [][]const u8{"a=100"}, error.DoesntTakeValue, ), T.fail( - [][]const u8 { "--a" }, + [][]const u8{"--a"}, error.InvalidArgument, ), T.fail( - [][]const u8 { "-a" }, + [][]const u8{"-a"}, error.InvalidArgument, ), T.fail( - [][]const u8 { "b=100" }, + [][]const u8{"b=100"}, error.ParamNotHandled, ), T.fail( - [][]const u8 { "b=100", "--a" }, + [][]const u8{ "b=100", "--a" }, error.InvalidArgument, ), }; -- cgit v1.2.3