Skip to content

Commit 1a86c62

Browse files
committed
Merge branch 'features/Code_cleanup'
2 parents e8d2e8e + cb3fab9 commit 1a86c62

File tree

7 files changed

+606
-10
lines changed

7 files changed

+606
-10
lines changed

src/Here.Tests/Maybe/MaybeTests.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,21 +274,37 @@ public void MaybeCompare()
274274
Assert.AreEqual(0, maybeInt1.CompareTo((object)maybeInt2));
275275
Assert.AreEqual(0, maybeInt2.CompareTo(maybeInt1));
276276
Assert.AreEqual(0, maybeInt2.CompareTo((object)maybeInt1));
277+
Assert.IsFalse(maybeInt1 < maybeInt2);
278+
Assert.IsTrue(maybeInt1 <= maybeInt2);
279+
Assert.IsFalse(maybeInt1 > maybeInt2);
280+
Assert.IsTrue(maybeInt1 >= maybeInt2);
277281

278282
Assert.AreEqual(-1, maybeInt1.CompareTo(maybeInt3));
279283
Assert.AreEqual(-1, maybeInt1.CompareTo((object)maybeInt3));
280284
Assert.AreEqual(1, maybeInt3.CompareTo(maybeInt1));
281285
Assert.AreEqual(1, maybeInt3.CompareTo((object)maybeInt1));
286+
Assert.IsTrue(maybeInt1 < maybeInt3);
287+
Assert.IsTrue(maybeInt1 <= maybeInt3);
288+
Assert.IsFalse(maybeInt1 > maybeInt3);
289+
Assert.IsFalse(maybeInt1 >= maybeInt3);
282290

283291
Assert.AreEqual(1, maybeInt1.CompareTo(emptyMaybeInt1));
284292
Assert.AreEqual(1, maybeInt1.CompareTo((object)emptyMaybeInt1));
285293
Assert.AreEqual(-1, emptyMaybeInt1.CompareTo(maybeInt1));
286294
Assert.AreEqual(-1, emptyMaybeInt1.CompareTo((object)maybeInt1));
295+
Assert.IsFalse(maybeInt1 < emptyMaybeInt1);
296+
Assert.IsFalse(maybeInt1 <= emptyMaybeInt1);
297+
Assert.IsTrue(maybeInt1 > emptyMaybeInt1);
298+
Assert.IsTrue(maybeInt1 >= emptyMaybeInt1);
287299

288300
Assert.AreEqual(0, emptyMaybeInt1.CompareTo(emptyMaybeInt2));
289301
Assert.AreEqual(0, emptyMaybeInt1.CompareTo((object)emptyMaybeInt2));
290302
Assert.AreEqual(0, emptyMaybeInt2.CompareTo(emptyMaybeInt1));
291303
Assert.AreEqual(0, emptyMaybeInt2.CompareTo((object)emptyMaybeInt1));
304+
Assert.IsFalse(emptyMaybeInt1 < emptyMaybeInt2);
305+
Assert.IsTrue(emptyMaybeInt1 <= emptyMaybeInt2);
306+
Assert.IsFalse(emptyMaybeInt1 > emptyMaybeInt2);
307+
Assert.IsTrue(emptyMaybeInt1 >= emptyMaybeInt2);
292308

293309
// Mixed
294310
Assert.AreEqual(1, maybeInt1.CompareTo(null)); // Null initialize a Maybe.None

src/Here.Tests/Result/ResultLogicTests.cs

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,119 @@ public void ResultLogicErrorEquality()
185185
Assert.IsTrue(logicOk1 != null);
186186
Assert.IsTrue(null != logicOk1);
187187
}
188+
189+
[Test]
190+
public void ResultLogicCompare()
191+
{
192+
// Results
193+
var logicOk1 = new ResultLogic();
194+
var logicOk2 = new ResultLogic();
195+
var logicWarn1 = new ResultLogic(true, "My warning", null);
196+
var logicWarn2 = new ResultLogic(true, "My warning", null);
197+
var logicWarn3 = new ResultLogic(true, "My warning 2", null);
198+
var logicFail1 = new ResultLogic(false, "My failure", null);
199+
var logicFail2 = new ResultLogic(false, "My failure", null);
200+
var logicFail3 = new ResultLogic(false, "My failure 2", null);
201+
202+
Assert.IsFalse(logicOk1 < logicOk2);
203+
Assert.IsTrue(logicOk1 <= logicOk2);
204+
Assert.IsFalse(logicOk1 > logicOk2);
205+
Assert.IsTrue(logicOk1 >= logicOk2);
206+
207+
Assert.IsFalse(logicOk1 < logicWarn1);
208+
Assert.IsFalse(logicOk1 <= logicWarn1);
209+
Assert.IsTrue(logicOk1 > logicWarn1);
210+
Assert.IsTrue(logicOk1 >= logicWarn1);
211+
212+
Assert.IsFalse(logicOk1 < logicFail1);
213+
Assert.IsFalse(logicOk1 <= logicFail1);
214+
Assert.IsTrue(logicOk1 > logicFail1);
215+
Assert.IsTrue(logicOk1 >= logicFail1);
216+
217+
218+
Assert.IsFalse(logicWarn1 < logicWarn2);
219+
Assert.IsTrue(logicWarn1 <= logicWarn2);
220+
Assert.IsFalse(logicWarn1 > logicWarn2);
221+
Assert.IsTrue(logicWarn1 >= logicWarn2);
222+
223+
Assert.IsFalse(logicWarn1 < logicWarn3);
224+
Assert.IsTrue(logicWarn1 <= logicWarn3);
225+
Assert.IsFalse(logicWarn1 > logicWarn3);
226+
Assert.IsTrue(logicWarn1 >= logicWarn3);
227+
228+
Assert.IsFalse(logicWarn1 < logicFail1);
229+
Assert.IsFalse(logicWarn1 <= logicFail1);
230+
Assert.IsTrue(logicWarn1 > logicFail1);
231+
Assert.IsTrue(logicWarn1 >= logicFail1);
232+
233+
234+
Assert.IsFalse(logicFail1 < logicFail2);
235+
Assert.IsTrue(logicFail1 <= logicFail2);
236+
Assert.IsFalse(logicFail1 > logicFail2);
237+
Assert.IsTrue(logicFail1 >= logicFail2);
238+
239+
Assert.IsFalse(logicFail1 < logicFail3);
240+
Assert.IsTrue(logicFail1 <= logicFail3);
241+
Assert.IsFalse(logicFail1 > logicFail3);
242+
Assert.IsTrue(logicFail1 >= logicFail3);
243+
}
244+
245+
[Test]
246+
public void ResultLogicErrorCompare()
247+
{
248+
var customErrorObject = new CustomErrorTest { ErrorCode = -1 };
249+
250+
// Results
251+
var logicOk1 = new ResultLogic<CustomErrorTest>();
252+
var logicOk2 = new ResultLogic<CustomErrorTest>();
253+
var logicWarn1 = new ResultLogic<CustomErrorTest>(true, "My warning", null, null);
254+
var logicWarn2 = new ResultLogic<CustomErrorTest>(true, "My warning", null, null);
255+
var logicWarn3 = new ResultLogic<CustomErrorTest>(true, "My warning 2", null, null);
256+
var logicFail1 = new ResultLogic<CustomErrorTest>(false, "My failure", customErrorObject, null);
257+
var logicFail2 = new ResultLogic<CustomErrorTest>(false, "My failure", customErrorObject, null);
258+
var logicFail3 = new ResultLogic<CustomErrorTest>(false, "My failure 2", customErrorObject, null);
259+
260+
Assert.IsFalse(logicOk1 < logicOk2);
261+
Assert.IsTrue(logicOk1 <= logicOk2);
262+
Assert.IsFalse(logicOk1 > logicOk2);
263+
Assert.IsTrue(logicOk1 >= logicOk2);
264+
265+
Assert.IsFalse(logicOk1 < logicWarn1);
266+
Assert.IsFalse(logicOk1 <= logicWarn1);
267+
Assert.IsTrue(logicOk1 > logicWarn1);
268+
Assert.IsTrue(logicOk1 >= logicWarn1);
269+
270+
Assert.IsFalse(logicOk1 < logicFail1);
271+
Assert.IsFalse(logicOk1 <= logicFail1);
272+
Assert.IsTrue(logicOk1 > logicFail1);
273+
Assert.IsTrue(logicOk1 >= logicFail1);
274+
275+
276+
Assert.IsFalse(logicWarn1 < logicWarn2);
277+
Assert.IsTrue(logicWarn1 <= logicWarn2);
278+
Assert.IsFalse(logicWarn1 > logicWarn2);
279+
Assert.IsTrue(logicWarn1 >= logicWarn2);
280+
281+
Assert.IsFalse(logicWarn1 < logicWarn3);
282+
Assert.IsTrue(logicWarn1 <= logicWarn3);
283+
Assert.IsFalse(logicWarn1 > logicWarn3);
284+
Assert.IsTrue(logicWarn1 >= logicWarn3);
285+
286+
Assert.IsFalse(logicWarn1 < logicFail1);
287+
Assert.IsFalse(logicWarn1 <= logicFail1);
288+
Assert.IsTrue(logicWarn1 > logicFail1);
289+
Assert.IsTrue(logicWarn1 >= logicFail1);
290+
291+
292+
Assert.IsFalse(logicFail1 < logicFail2);
293+
Assert.IsTrue(logicFail1 <= logicFail2);
294+
Assert.IsFalse(logicFail1 > logicFail2);
295+
Assert.IsTrue(logicFail1 >= logicFail2);
296+
297+
Assert.IsFalse(logicFail1 < logicFail3);
298+
Assert.IsTrue(logicFail1 <= logicFail3);
299+
Assert.IsFalse(logicFail1 > logicFail3);
300+
Assert.IsTrue(logicFail1 >= logicFail3);
301+
}
188302
}
189303
}

0 commit comments

Comments
 (0)