assertMeasurement* methods now accept an optional value, just like assertMeasured

PiperOrigin-RevId: 743247605

Author: glados-verma

openhtf/util/test.py

@@ -933,25 +933,29 @@ def assertMeasured(self, phase_record, measurement, value=mock.ANY):
            phase_record.measurements[measurement].measured_value.value))
 
   @_assert_phase_or_test_record
-  def assertMeasurementPass(self, phase_record, measurement):
-    self.assertMeasured(phase_record, measurement)
+  def assertMeasurementPass(self, phase_record, measurement, value=mock.ANY):
+    self.assertMeasured(phase_record, measurement, value)
     self.assertIs(measurements.Outcome.PASS,
                   phase_record.measurements[measurement].outcome)
 
   @_assert_phase_or_test_record
-  def assertMeasurementFail(self, phase_record, measurement):
-    self.assertMeasured(phase_record, measurement)
+  def assertMeasurementFail(self, phase_record, measurement, value=mock.ANY):
+    self.assertMeasured(phase_record, measurement, value)
     self.assertIs(measurements.Outcome.FAIL,
                   phase_record.measurements[measurement].outcome)
 
   @_assert_phase_or_test_record
-  def assertMeasurementMarginal(self, phase_record, measurement):
-    self.assertMeasured(phase_record, measurement)
+  def assertMeasurementMarginal(
+      self, phase_record, measurement, value=mock.ANY
+  ):
+    self.assertMeasured(phase_record, measurement, value)
     self.assertTrue(phase_record.measurements[measurement].marginal)
 
   @_assert_phase_or_test_record
-  def assertMeasurementNotMarginal(self, phase_record, measurement):
-    self.assertMeasured(phase_record, measurement)
+  def assertMeasurementNotMarginal(
+      self, phase_record, measurement, value=mock.ANY
+  ):
+    self.assertMeasured(phase_record, measurement, value)
     self.assertFalse(phase_record.measurements[measurement].marginal)
 
   @_assert_phase_or_test_record

test/util/test_test.py

@@ -157,8 +157,14 @@ def _run_my_phase_in_test_asserts(self, mock_my_plug, test_record):
     self.assertNotMeasured(test_record.phases[-1], 'unset_measurement')
     self.assertMeasured(test_record, 'test_measurement', _DO_STUFF_RETVAL)
     self.assertMeasured(test_record, 'othr_measurement', 0xDEAD)
-    self.assertMeasurementPass(test_record, 'passes')
-    self.assertMeasurementFail(test_record, 'fails')
+    with self.subTest(name='assert_measurement_pass_without_value'):
+      self.assertMeasurementPass(test_record, 'passes')
+    with self.subTest(name='assert_measurement_pass_with_value'):
+      self.assertMeasurementPass(test_record, 'passes', 5)
+    with self.subTest(name='assert_measurement_fail_without_value'):
+      self.assertMeasurementFail(test_record, 'fails')
+    with self.subTest(name='assert_measurement_fail_with_value'):
+      self.assertMeasurementFail(test_record, 'fails', 20)
 
   def test_execute_phase_or_test_test_with_patched_plugs(self):
     self.auto_mock_plugs(MyPlug)