Skip to content

Commit 96bf99f

Browse files
grynspangrynspan
committed
Update ConditionMacroTests.requireMacro()
1 parent 40eed68 commit 96bf99f

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎Tests/TestingMacrosTests/ConditionMacroTests.swift

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -104,73 +104,73 @@ struct ConditionMacroTests {
104104
@Test("#require() macro",
105105
arguments: [
106106
##"#require(true)"##:
107-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(true, "true", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
107+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(true, "")) }, sourceCode: ["": "true"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
108108
##"#require(false)"##:
109-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(false, "false", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
109+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(false, "")) }, sourceCode: ["": "false"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
110110
##"#require(false, "Custom message")"##:
111-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(false, "false", "")) }, comments: ["Custom message"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
111+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(false, "")) }, sourceCode: ["": "false"], comments: ["Custom message"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
112112
##"#require(2 > 1)"##:
113-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(2, "2", "1c") > __ec(1, "1", [0, 2]), "2 > 1", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
113+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(2 > 1, "")) }, sourceCode: ["": "2 > 1"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
114114
##"#require(((true || false) && true) || Bool.random())"##:
115-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec((__ec((__ec(__ec(true, "true", [0, 1, 3, 4, 5, 7, 8, 9]) || __ec(false, "false", [0, 1, 3, 4, 5, 7, 8, 10]), "true || false", [0, 1, 3, 4, 5, 7, 8])) && __ec(true, "true", [0, 1, 3, 4, 12]), "(true || false) && true", [0, 1, 3, 4])) || __ec(Bool.random(), "Bool.random()", [0, 14]), "((true || false) && true) || Bool.random()", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
115+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(((true || false) && true), "2") || __ec(__ec(Bool.self, "e000000").random(), "2000000"), "")) }, sourceCode: ["2": "((true || false) && true)", "e000000": "Bool", "2000000": "Bool.random()", "": "((true || false) && true) || Bool.random()"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
116116
##"#require(9 > 8 && 7 > 6, "Some comment")"##:
117-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(9 > 8, [0, 4, 5, 6, 7]) && __ec(7 > 6, [0, 4, 5, 6, 16]), [0, 4, 5, 6])) }, sourceCode: [[0, 4, 5, 6, 7]: "9 > 8", [0, 4, 5, 6, 16]: "7 > 6", [0, 4, 5, 6]: "9 > 8 && 7 > 6"], comments: ["Some comment"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
117+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(9 > 8, "2") && __ec(7 > 6, "400"), "")) }, sourceCode: ["2": "9 > 8", "400": "7 > 6", "": "9 > 8 && 7 > 6"], comments: ["Some comment"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
118118
##"#require("a" == "b")"##:
119-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec("a", #""a""#, "1c") == __ec("b", #""b""#, [0, 2]), #""a" == "b""#, "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
119+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec("a" == "b", "")) }, sourceCode: ["": #""a" == "b""#], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
120120
##"#require(!Bool.random())"##:
121-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(!__ec(Bool.random(), "Bool.random()", "1c"), "!Bool.random()", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
121+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(!__ec(__ec(Bool.self, "1c").random(), "4"), "")) }, sourceCode: ["1c": "Bool", "4": "Bool.random()", "": "!Bool.random()"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
122122
##"#require((true && false))"##:
123-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry((__ec(__ec(true, "true", [0, 2, 3, 4]) && __ec(false, "false", [0, 2, 3, 5]), "true && false", [0, 2, 3]))) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
123+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec((true && false), "")) }, sourceCode: ["": "(true && false)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
124124
##"#require(try x())"##:
125-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(try __ec(x(), "x()", [0, 2])) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
125+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(try __ec(x(), "4")) }, sourceCode: ["4": "x()"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
126126
##"#require(1 is Int)"##:
127-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(1, "1", "1c"), #"__ec(1,"1",[0,1])"#, "", is: (Int).self, "Int")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
127+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec.__is(1 , __ec((Int).self, "10"), "10"), "")) }, sourceCode: ["10": "Int", "": "1 is Int"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
128128
##"#require("123") { 1 == 2 } then: { foo() }"##:
129129
##"Testing.__checkClosureCall(performing: { 1 == 2 }, then: { foo() }, sourceCode: "1 == 2", comments: ["123"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
130130
##"#require("123") { let x = 0 }"##:
131131
##"Testing.__checkClosureCall(performing: { let x = 0 }, sourceCode: "let x = 0", comments: ["123"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
132132
##"#require("123") { let x = 0; return x == 0 }"##:
133133
##"Testing.__checkClosureCall(performing: { let x = 0; return x == 0 }, sourceCode: "{ let x = 0; return x == 0 }", comments: ["123"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
134134
##"#require(a, "b", c: c)"##:
135-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a, "a", "")) }, c: c, comments: ["b"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
135+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a, "")) }, sourceCode: ["": "a"], c: c, comments: ["b"], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
136136
##"#require(a())"##:
137-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a(), "a()", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
137+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a(), "")) }, sourceCode: ["": "a()"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
138138
##"#require(b(c))"##:
139-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(b(__ec(c, "c", [0, 2])), "b(c)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
139+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(b(__ec(c, "70")), "")) }, sourceCode: ["70": "c", "": "b(c)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
140140
##"#require(a.b(c))"##:
141-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b(__ec(c, "c", [0, 3])), "a.b(c)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
141+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b(__ec(c, "700")), "")) }, sourceCode: ["6": "a", "700": "c", "": "a.b(c)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
142142
##"#require(a.b(c, d: e))"##:
143-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b(__ec(c, "c", [0, 3]), d: __ec(e, "e", [0, 4])), "a.b(c, d: e)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
143+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b(__ec(c, "700"), d: __ec(e, "12100")), "")) }, sourceCode: ["6": "a", "700": "c", "12100": "e", "": "a.b(c, d: e)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
144144
##"#require(a.b(&c))"##:
145-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b(&c), "a.b(&c)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
145+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b(&c), "")) }, sourceCode: ["6": "a", "": "a.b(&c)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
146146
##"#require(a.b(&c, &d.e))"##:
147-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b(&c, &d.e), "a.b(&c, &d.e)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
147+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b(&c, &d.e), "")) }, sourceCode: ["6": "a", "": "a.b(&c, &d.e)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
148148
##"#require(a.b(&c, d))"##:
149-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b(&c, __ec(d, "d", [0, 6])), "a.b(&c, d)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
149+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b(&c, __ec(d, "18100")), "")) }, sourceCode: ["6": "a", "18100": "d", "": "a.b(&c, d)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
150150
##"#require(a.b(try c()))"##:
151-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b(try __ec(c(), "c()", [0, 3, 5])), "a.b(try c())", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
151+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b(try __ec(c(), "1700")), "")) }, sourceCode: ["6": "a", "1700": "c()", "": "a.b(try c())"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
152152
##"#require(a?.b(c))"##:
153-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a?.b(__ec(c, "c", [0, 5])), "a?.b(c)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
153+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a, "e")?.b(__ec(c, "1c00")), "")) }, sourceCode: ["e": "a", "1c00": "c", "": "a?.b(c)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
154154
##"#require(a???.b(c))"##:
155-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a???.b(__ec(c, "c", [0, 9])), "a???.b(c)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
155+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a, "3e")???.b(__ec(c, "1c000")), "")) }, sourceCode: ["3e": "a", "1c000": "c", "": "a???.b(c)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
156156
##"#require(a?.b.c(d))"##:
157-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a?.b.c(__ec(d, "d", [0, 6])), "a?.b.c(d)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
157+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a, "1e")?.b.c(__ec(d, "1c000")), "")) }, sourceCode: ["1e": "a", "1c000": "d", "": "a?.b.c(d)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
158158
##"#require({}())"##:
159-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec({}(), "{}()", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
159+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec({}(), "")) }, sourceCode: ["": "{}()"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
160160
##"#require(a.b(c: d))"##:
161-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b(c: __ec(d, "d", [0, 3])), "a.b(c: d)", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
161+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b(c: __ec(d, "1300")), "")) }, sourceCode: ["6": "a", "1300": "d", "": "a.b(c: d)"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
162162
##"#require(a.b { c })"##:
163-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.b { c }, "a.b { c }", "")) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
163+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a.self, "6").b { c }, "")) }, sourceCode: ["6": "a", "": "a.b { c }"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
164164
##"#require(a, sourceLocation: someValue)"##:
165-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a, [0, 4, 5, 6])) }, sourceCode: [[0, 4, 5, 6]: "a"], comments: [], isRequired: true, sourceLocation: someValue).__required()"##,
165+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a, "")) }, sourceCode: ["": "a"], comments: [], isRequired: true, sourceLocation: someValue).__required()"##,
166166
##"#require(a.isB)"##:
167-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(a.isB) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
167+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a.isB, "")) }, sourceCode: ["": "a.isB"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
168168
##"#require(a???.isB)"##:
169-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(a???.isB) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
169+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a, "1e")???.isB, "")) }, sourceCode: ["1e": "a", "": "a???.isB"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
170170
##"#require(a?.b.isB)"##:
171-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(a?.b.isB) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
171+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(a, "e")?.b.isB, "")) }, sourceCode: ["e": "a", "": "a?.b.isB"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
172172
##"#require(a?.b().isB)"##:
173-
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(a?.b(), "a?.b()", "1c").isB) }, comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
173+
##"Testing.__checkCondition({ (__ec: inout Testing.__ExpectationContext) in try Testing.__requiringTry(__ec(__ec(__ec(a, "1e")?.b(), "2")?.isB, "")) }, sourceCode: ["1e": "a", "2": "a?.b()", "": "a?.b().isB"], comments: [], isRequired: true, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
174174
##"#require(isolation: somewhere) {}"##:
175175
##"Testing.__checkClosureCall(performing: {}, sourceCode: "{}", comments: [], isRequired: true, isolation: somewhere, sourceLocation: Testing.SourceLocation.__here()).__required()"##,
176176
]

0 commit comments

Comments
 (0)