@@ -60,7 +60,7 @@ OptionSetTests.test("IsEmpty.MultipleOptions") {
6060OptionSetTests . test ( " IsEmpty.EmptySet " ) {
6161 var s : Days = [ ]
6262
63- ( s. isEmpty)
63+ expectTrue ( s. isEmpty)
6464
6565 s. insert ( . monday)
6666
@@ -107,18 +107,18 @@ OptionSetTests.test("Contains.SingleOption") {
107107 expectFalse ( s. contains ( . wednesday) )
108108 expectFalse ( s. contains ( . thursday) )
109109 expectFalse ( s. contains ( . saturday) )
110- ( s. contains ( . friday) )
110+ expectTrue ( s. contains ( . friday) )
111111}
112112
113113OptionSetTests . test ( " Contains.MultipleOptions " ) {
114114 let s : Days = [ . monday, . tuesday, . wednesday, . thursday, . friday]
115115
116116 expectFalse ( s. contains ( . sunday) )
117- ( s. contains ( . monday) )
118- ( s. contains ( . tuesday) )
119- ( s. contains ( . wednesday) )
120- ( s. contains ( . thursday) )
121- ( s. contains ( . friday) )
117+ expectTrue ( s. contains ( . monday) )
118+ expectTrue ( s. contains ( . tuesday) )
119+ expectTrue ( s. contains ( . wednesday) )
120+ expectTrue ( s. contains ( . thursday) )
121+ expectTrue ( s. contains ( . friday) )
122122 expectFalse ( s. contains ( . saturday) )
123123}
124124
@@ -143,7 +143,7 @@ OptionSetTests.test("FormIntersection.SingleOption") {
143143
144144 s1. formIntersection ( s2)
145145
146- ( s1. contains ( . monday) )
146+ expectTrue ( s1. contains ( . monday) )
147147 expectFalse ( s1. contains ( . tuesday) )
148148 expectFalse ( s1. contains ( . sunday) )
149149 }
@@ -166,7 +166,7 @@ OptionSetTests.test("FormIntersection.MultipleOptions") {
166166
167167 s1. formIntersection ( s2)
168168
169- ( s1. contains ( . wednesday) )
169+ expectTrue ( s1. contains ( . wednesday) )
170170 expectFalse ( s1. contains ( . tuesday) )
171171 expectFalse ( s1. contains ( . sunday) )
172172 }
@@ -201,7 +201,7 @@ OptionSetTests.test("FormSymmetricDifference.SingleOption") {
201201
202202 s1. formSymmetricDifference ( s2)
203203
204- ( s1. contains ( . tuesday) )
204+ expectTrue ( s1. contains ( . tuesday) )
205205 expectFalse ( s1. contains ( . monday) )
206206 expectFalse ( s1. contains ( . sunday) )
207207 }
@@ -211,8 +211,8 @@ OptionSetTests.test("FormSymmetricDifference.SingleOption") {
211211
212212 s1. formSymmetricDifference ( s2)
213213
214- ( s1. contains ( . monday) )
215- ( s1. contains ( . tuesday) )
214+ expectTrue ( s1. contains ( . monday) )
215+ expectTrue ( s1. contains ( . tuesday) )
216216 expectFalse ( s1. contains ( . sunday) )
217217 }
218218}
@@ -224,7 +224,7 @@ OptionSetTests.test("FormSymmetricDifference.MultipleOptions") {
224224
225225 s1. formSymmetricDifference ( s2)
226226
227- ( s1. contains ( . tuesday) )
227+ expectTrue ( s1. contains ( . tuesday) )
228228 expectFalse ( s1. contains ( . wednesday) )
229229 expectFalse ( s1. contains ( . sunday) )
230230 }
@@ -233,8 +233,8 @@ OptionSetTests.test("FormSymmetricDifference.MultipleOptions") {
233233 let s2 : Days = [ . thursday, . friday, . saturday]
234234
235235 s1. formSymmetricDifference ( s2)
236- ( s1. contains ( . wednesday) )
237- ( s1. contains ( . thursday) )
236+ expectTrue ( s1. contains ( . wednesday) )
237+ expectTrue ( s1. contains ( . thursday) )
238238 expectFalse ( s1. contains ( . sunday) )
239239 }
240240}
@@ -244,7 +244,7 @@ OptionSetTests.test("FormSymmetricDifference.EmptySet") {
244244 let s2 : Days = [ . monday, . tuesday, . wednesday]
245245
246246 s1. formSymmetricDifference ( s2)
247- ( s1. contains ( . wednesday) )
247+ expectTrue ( s1. contains ( . wednesday) )
248248 expectFalse ( s1. contains ( . thursday) )
249249}
250250
@@ -256,17 +256,17 @@ OptionSetTests.test("FormUnion.SingleOption") {
256256 let s2 : Days = [ . monday, . tuesday, . wednesday]
257257
258258 s1. formUnion ( s2)
259- ( s1. contains ( . monday) )
260- ( s1. contains ( . tuesday) )
259+ expectTrue ( s1. contains ( . monday) )
260+ expectTrue ( s1. contains ( . tuesday) )
261261 expectFalse ( s1. contains ( . sunday) )
262262 }
263263 do {
264264 var s1 = Days . monday
265265 let s2 : Days = [ . tuesday, . wednesday, . friday]
266266
267267 s1. formUnion ( s2)
268- ( s1. contains ( . monday) )
269- ( s1. contains ( . tuesday) )
268+ expectTrue ( s1. contains ( . monday) )
269+ expectTrue ( s1. contains ( . tuesday) )
270270 expectFalse ( s1. contains ( . sunday) )
271271 }
272272}
@@ -742,7 +742,7 @@ OptionSetTests.test("UpdateWith.SingleOption") {
742742
743743 let member1 = s. update ( with: . tuesday)
744744
745- ( s. contains ( . monday) )
745+ expectTrue ( s. contains ( . monday) )
746746 expectTrue ( s. contains ( . tuesday) )
747747 expectFalse ( s. contains ( . sunday) )
748748 expectNil ( member1)
0 commit comments