From aa2a31512b6d5bd1a3aab064ec79025335180a67 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 28 Apr 2020 10:47:29 -0400
Subject: [PATCH] refactor between to provide some more helpers
---
src/_zkapauthorizer/tests/matchers.py | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/_zkapauthorizer/tests/matchers.py b/src/_zkapauthorizer/tests/matchers.py
index 09afa8d..6c7ab45 100644
--- a/src/_zkapauthorizer/tests/matchers.py
+++ b/src/_zkapauthorizer/tests/matchers.py
@@ -104,19 +104,27 @@ class _Returns(Matcher):
return "Returns({})".format(self.result_matcher)
+def greater_or_equal(v):
+ """
+ Matches a value greater than or equal to ``v``.
+ """
+ return MatchesAny(GreaterThan(v), Equals(v))
+
+
+def lesser_or_equal(v):
+ """
+ Matches a value less than or equal to ``v``.
+ """
+ return MatchesAny(LessThan(v), Equals(v))
+
+
def between(low, high):
"""
Matches a value in the range [low, high].
"""
return MatchesAll(
- MatchesAny(
- Equals(low),
- GreaterThan(low),
- ),
- MatchesAny(
- Equals(high),
- LessThan(high),
- ),
+ greater_or_equal(low),
+ lesser_or_equal(high),
)
--
GitLab