commit f59f18fc09d8d768765d4a88f43410310b4a2e7a
author Clemenz Portmann <portmannc@google.com> Fri Aug 13 14:05:34 2021 -0700
committer Clemenz Portmann <portmannc@google.com> Tue Aug 24 14:38:29 2021 +0000
tree cbddbb3e4e954ddfdd563e228c78b1c583224729
parent ebfcc1eb04b484b323e561e72cb55f17f53108f8

ITS: use raise AssertionError instead of assert: scene3

bug: 197516648

Change-Id: Ia4e2367a5c896dc4a7f57ff696b03918ac269a0a

apps/CameraITS/tests/scene3/test_edge_enhancement.py

diff --git a/apps/CameraITS/tests/scene3/test_edge_enhancement.py b/apps/CameraITS/tests/scene3/test_edge_enhancement.py
index 9539971..ad03cac 100644
--- a/apps/CameraITS/tests/scene3/test_edge_enhancement.py
+++ b/apps/CameraITS/tests/scene3/test_edge_enhancement.py
@@ -141,24 +141,26 @@
                     str(sharpness_regular))
 
       logging.debug('Verify HQ is sharper than OFF')
-      e_msg = 'HQ: %.3f, OFF: %.3f' % (sharpness_regular[EDGE_MODES['HQ']],
-                                       sharpness_regular[EDGE_MODES['OFF']])
-      assert (sharpness_regular[EDGE_MODES['HQ']] >
-              sharpness_regular[EDGE_MODES['OFF']]), e_msg
+      if (sharpness_regular[EDGE_MODES['HQ']] <=
+          sharpness_regular[EDGE_MODES['OFF']]):
+        raise AssertionError(f"HQ: {sharpness_regular[EDGE_MODES['HQ']]:.3f}, "
+                             f"OFF: {sharpness_regular[EDGE_MODES['OFF']]:.3f}")
 
       logging.debug('Verify OFF is not sharper than FAST')
-      e_msg = 'FAST: %.3f, OFF: %.3f, RTOL: %.2f' % (
-          sharpness_regular[EDGE_MODES['FAST']],
-          sharpness_regular[EDGE_MODES['OFF']], SHARPNESS_RTOL)
-      assert (sharpness_regular[EDGE_MODES['FAST']] >
-              sharpness_regular[EDGE_MODES['OFF']]*(1.0-SHARPNESS_RTOL)), e_msg
+      if (sharpness_regular[EDGE_MODES['FAST']] <=
+          sharpness_regular[EDGE_MODES['OFF']]*(1.0-SHARPNESS_RTOL)):
+        raise AssertionError(
+            f"FAST: {sharpness_regular[EDGE_MODES['FAST']]:.3f}, "
+            f"OFF: {sharpness_regular[EDGE_MODES['OFF']]:.3f}, "
+            f"RTOL: {SHARPNESS_RTOL}")
 
       logging.debug('Verify FAST is not sharper than HQ')
-      e_msg = 'HQ: %.3f, FAST: %.3f, RTOL: %.2f' % (
-          sharpness_regular[EDGE_MODES['HQ']],
-          sharpness_regular[EDGE_MODES['FAST']], SHARPNESS_RTOL)
-      assert (sharpness_regular[EDGE_MODES['HQ']] >
-              sharpness_regular[EDGE_MODES['FAST']]*(1.0-SHARPNESS_RTOL)), e_msg
+      if (sharpness_regular[EDGE_MODES['HQ']] <=
+          sharpness_regular[EDGE_MODES['FAST']]*(1.0-SHARPNESS_RTOL)):
+        raise AssertionError(
+            f"HQ: {sharpness_regular[EDGE_MODES['HQ']]:.3f}, "
+            f"FAST: {sharpness_regular[EDGE_MODES['FAST']]:.3f}, "
+            f"RTOL: {SHARPNESS_RTOL}")
 
 if __name__ == '__main__':
   test_runner.main()