commit 148b8ff81b4846300c44ab962e8c382032c9b9f8
author Clemenz Portmann <portmannc@google.com> Mon Feb 22 15:00:43 2021 -0800
committer Clemenz Portmann <portmannc@google.com> Tue Feb 23 16:01:06 2021 +0000
tree e8fdad45cd46fa38e6002a721c4c8a14857247f3
parent 981000112934c5117c1d6e171dd85093e02a2086

ITS: use its_session_utils.py to load scene

bug: 180758370
Change-Id: Iff9e82487eba9ec8c254ecfc4a80d1c983a05e76

apps/CameraITS2.0/tests/scene2_a/test_effects.py

diff --git a/apps/CameraITS2.0/tests/scene2_a/test_effects.py b/apps/CameraITS2.0/tests/scene2_a/test_effects.py
index d5bfcab..59c01ef 100644
--- a/apps/CameraITS2.0/tests/scene2_a/test_effects.py
+++ b/apps/CameraITS2.0/tests/scene2_a/test_effects.py
@@ -61,16 +61,9 @@
       props = cam.override_with_hidden_physical_camera_props(props)
       mono_camera = camera_properties_utils.mono_camera(props)
 
-      # Calculate camera_fov which will determine the image to load on tablet.
-      camera_fov = cam.calc_camera_fov(props)
-      file_name = cam.get_file_name_to_load(self.chart_distance, camera_fov,
-                                            self.scene)
-      logging.debug('Displaying %s on the tablet', file_name)
-
-      # Display the scene on the tablet depending on camera_fov.
-      self.tablet.adb.shell(
-          'am start -a android.intent.action.VIEW -d file:/sdcard/Download/%s'%
-          file_name)
+      # Load chart for scene.
+      its_session_utils.load_scene(
+          cam, props, self.scene, self.tablet, self.chart_distance)
 
       # Determine available effects and run test(s)
       effects = props['android.control.availableEffects']