Add app scoping to the WebExperiment for Frametime

+ Test fixes
+ some other fixes
! IN PROGRESS

Author: mhkarsten

AndroidRunner/Device.py

@@ -164,10 +164,11 @@ def plug(self):
 
     def current_activity(self):
         """Newer Android 10 does not have mCurrentFocus and mFocusedApp. Different approach to get the current activity"""
-        recent_activity = Adb.shell(self.id,'dumpsys activity recents | grep "Recent #0" | cut -d "=" -f2 | grep -o -p "[a-z|.]*"')
-
+        recent_activity = Adb.shell(self.id,'dumpsys activity recents | grep "Recent #0" | tr " }" "\n" | grep "=" | cut -d "=" -f 2 | sed -E "s/[^a-zA-Z.]+//g"')
+        
+        """Recent activities have both a type (home/standard/ect.) as well as a name e.g. com.android.chrome"""
         if recent_activity:
-            result = recent_activity
+            result = {"type": recent_activity.split("\n")[0], "name": recent_activity.split("\n")[1]}
             self.logger.debug('Current activity: %s' % result)
             return result
         else:

AndroidRunner/WebExperiment.py

@@ -15,6 +15,7 @@ def __init__(self, config, progress, restart):
         self.browsers = [BrowserFactory.get_browser(b)() for b in config.get('browsers', ['chrome'])]
         Tests.check_dependencies(self.devices, [b.package_name for b in self.browsers])
         self.duration = Tests.is_integer(config.get('duration', 0)) / 1000
+        self.config = config
 
     # Browsers have version specific formatting, allows re-creation if needed
     def regenerate_browsers(self, device):
@@ -27,7 +28,8 @@ def run(self, device, path, run, browser_name):
             if browser_name in browserItem.to_string():
                 browser = browserItem
         kwargs = {
-            'browser': browser
+            'browser': browser,
+            'app': browser.package_name
         }
         self.before_run(device, path, run, **kwargs)
         self.after_launch(device, path, run, **kwargs)

examples/android/Scripts/interaction.py

@@ -1,6 +1,18 @@
 from AndroidRunner.Device import Device
+from AndroidRunner.Experiment import Experiment
+import logging
 
+LOGGER = logging.getLogger()
 
-# noinspection PyUnusedLocal
 def main(device: Device, *args: tuple, **kwargs: dict):
-    pass
+    LOGGER.debug(args)
+    LOGGER.debug(kwargs)
+    
+    experiment: Experiment = args[0]
+    current_run = experiment.get_experiment()
+    
+    LOGGER.debug(device.current_activity())
+    LOGGER.debug(current_run)
+
+    print(device.current_activity())
+    print(current_run)

examples/android/config_web.json

@@ -19,6 +19,10 @@
         "cpu",
         "mem"
       ]
+    },
+    "Frametimes": {
+      "subject_aggregation" : "default",
+      "sample_interval": 1000
     }
   },
   "scripts": {

examples/performance/config.json

@@ -1,7 +1,7 @@
 {
   "type": "native",
   "devices": {
-    "nexus6p": {}
+    "Pixel 6": {}
   },
   "repetitions": 2,
   "apps": [

tests/unit/fixtures/FakeDevice.py

@@ -2,9 +2,10 @@
 class FakeDevice(object):
     def __init__(self, device_id):
         self.id = device_id
-
-    def current_activity(self):
-        return 'fake.activity'
+    
+    @staticmethod
+    def current_activity():
+        return {"type": "standard", "name": 'fake.activity'}
 
     def logcat_regex(self, regex):
         return regex

tests/unit/test_devices.py

@@ -7,7 +7,7 @@
 from AndroidRunner.Device import Device
 from AndroidRunner.Devices import Devices
 from AndroidRunner.util import ConfigError
-
+from tests.unit.fixtures.FakeDevice import FakeDevice
 
 class TestDevice(object):
 
@@ -372,8 +372,8 @@ def test_su_plug(self, adb_shell_su, device_root):
 
     @patch('AndroidRunner.Adb.shell')
     def test_current_activity_success(self, adb_shell, device):
-        adb_shell.return_value = "com.android.chrome"
-        assert device.current_activity() == "com.android.chrome"
+        adb_shell.return_value = 'test\norg.activity'
+        assert device.current_activity() == {'type': 'test', 'name': 'org.activity'}
 
     @patch('AndroidRunner.Adb.shell')
     def test_current_activity_error(self, adb_shell, device):

tests/unit/test_experiment.py

@@ -21,7 +21,7 @@
 from AndroidRunner.util import ConfigError, makedirs
 from tests.PluginTests import PluginTests
 from AndroidRunner.PrematureStoppableRun import PrematureStoppableRun
-
+from tests.unit.fixtures.FakeDevice import FakeDevice
 
 # noinspection PyUnusedLocal
 class TestExperiment(object):
@@ -498,7 +498,7 @@ def test_after_launch(self, script_run, default_experiment):
         kwargs = {'arg1': 1, 'arg2': 2}
         mock_device = Mock()
         mock_device.id = 123
-        current_activity = 'Working on theses'
+        current_activity = FakeDevice.current_activity()
         mock_device.current_activity.return_value = current_activity
         path = 'test/path'
         run = 1234566789
@@ -549,7 +549,7 @@ def test_before_close(self, script_run, default_experiment):
         kwargs = {'arg1': 1, 'arg2': 2}
         mock_device = Mock()
         mock_device.id = 123
-        current_activity = 'Working on theses'
+        current_activity = FakeDevice.current_activity()
         mock_device.current_activity.return_value = current_activity
         path = 'test/path'
         run = 1234566789
@@ -1090,7 +1090,7 @@ def test_before_run(self, before_run, sleep, web_experiment):
         kwargs = {'arg1': 1, 'arg2': 2, 'browser': mock_browser}
         mock_device = Mock()
         mock_device.id = 'id'
-        current_activity = "playing euro truck simulator 2"
+        current_activity = FakeDevice.current_activity()
         mock_device.current_activity.return_value = current_activity
         path = 'test/path'
         run = 123456789
@@ -1136,7 +1136,7 @@ def test_after_run(self, after_run,  sleep, web_experiment):
         kwargs = {'arg1': 1, 'arg2': 2, 'browser': mock_browser}
         mock_device = Mock()
         mock_device.id = 'id'
-        current_activity = "playing euro truck simulator 2"
+        current_activity = FakeDevice.current_activity()
         mock_device.current_activity.return_value = current_activity
         path = 'test/path'
         run = 123456789
@@ -1335,7 +1335,7 @@ def test_before_run(self, before_run, after_launch, native_experiment):
         kwargs = {'arg1': 1, 'arg2': 2}
         mock_device = Mock()
         mock_device.id = 'id'
-        current_activity = "playing euro truck simulator 2"
+        current_activity = FakeDevice.current_activity()
         mock_device.current_activity.return_value = current_activity
         path = 'test/path'
         run = 123456789
@@ -1377,7 +1377,7 @@ def test_after_run(self, after_run, native_experiment):
         kwargs = {'arg1': 1, 'arg2': 2}
         mock_device = Mock()
         mock_device.id = 'id'
-        current_activity = "playing euro truck simulator 2"
+        current_activity = FakeDevice.current_activity()
         mock_device.current_activity.return_value = current_activity
         path = 'test/path'
         run = 123456789