Internal change

PiperOrigin-RevId: 488770756

Author: OpenHTF Owners

openhtf/util/validators.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Module containing canned measurement validators.
 
 Additional validators may be registered by passing them to the Register()
@@ -246,8 +245,8 @@ def all_equals(value, type=None):  # pylint: disable=redefined-builtin
   if isinstance(value, numbers.Number):
     return AllInRangeValidator(minimum=value, maximum=value)
   elif isinstance(value, str):
-    assert type is None or issubclass(type, str), (
-        'Cannot use a non-string type when matching a string')
+    assert type is None or issubclass(
+        type, str), ('Cannot use a non-string type when matching a string')
     return matches_regex('^{}$'.format(re.escape(value)))
   else:
     return AllEqualsValidator(value)
@@ -385,8 +384,8 @@ def equals(value, type=None):  # pylint: disable=redefined-builtin
   if isinstance(value, numbers.Number):
     return InRange(minimum=value, maximum=value, type=type)
   elif isinstance(value, str):
-    assert type is None or issubclass(type, str), (
-        'Cannot use a non-string type when matching a string')
+    assert type is None or issubclass(
+        type, str), ('Cannot use a non-string type when matching a string')
     return matches_regex('^{}$'.format(re.escape(value)))
   else:
     return Equals(value, type=type)
@@ -449,10 +448,10 @@ def __init__(self, expected, percent, marginal_percent=None) -> None:
     super(WithinPercent, self).__init__()
     if percent < 0:
       raise ValueError('percent argument is {}, must be >0'.format(percent))
-    if marginal_percent is not None and marginal_percent < percent:
+    if marginal_percent is not None and marginal_percent >= percent:
       raise ValueError(
-          'marginal_percent argument is {}, must be < percent'.format(
-              marginal_percent))
+          'marginal_percent argument is {}, must be < {} percent'.format(
+              marginal_percent, percent))
     self.expected = expected
     self.percent = percent
     self.marginal_percent = marginal_percent
@@ -481,7 +480,7 @@ def marginal_minimum(self):
 
   @property
   def marginal_maximum(self):
-    return (self.expected -
+    return (self.expected +
             self._applied_marginal_percent if self.marginal_percent else None)
 
   def __call__(self, value) -> bool:

test/util/validators_test.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Unit tests for util/validators.py."""
 
 import copy
@@ -136,8 +135,7 @@ def test_is_marginal_false_within_bounds(self):
 
   def test_is_marginal_false_fully_out_of_range(self):
     self.assertFalse(
-        self.validator.is_marginal(
-            [self.minimum - 1, self.maximum + 1]))
+        self.validator.is_marginal([self.minimum - 1, self.maximum + 1]))
 
   def test_is_marginal_false_without_marginal_bounds(self):
     validator = validators.AllInRangeValidator(self.minimum, self.minimum)
@@ -266,6 +264,18 @@ def test_raises_for_negative_percentage(self):
     with self.assertRaisesRegex(ValueError, 'percent argument is'):
       validators.WithinPercent(expected=100, percent=-1)
 
+  def test_raises_for_larger_marginal_percent(self):
+    with self.assertRaisesRegex(ValueError, 'marginal_percent argument is'):
+      validators.WithinPercent(expected=100, percent=2, marginal_percent=3)
+
+  def test_is_marginal(self):
+    validator = validators.WithinPercent(
+        expected=100, percent=10, marginal_percent=5)
+    with self.subTest('returns_true_on_marginal_measurement'):
+      self.assertTrue(validator.is_marginal(106))
+    with self.subTest('returns_false_on_non_marginal_measurement'):
+      self.assertFalse(validator.is_marginal(102))
+
   def test_within_percent_less_than_one_hundred(self):
     validator = validators.WithinPercent(expected=100, percent=5)
     for valid_value in [95, 95.0, 100, 100.0, 105, 105.0]: