Add a new scenario folder named genericandroidstartup and updated the…

… android startup scenarios doc to use it.

docs/android-startup-scenarios.md

@@ -18,13 +18,13 @@
     . ./init.sh  # or `.\init.ps1` on Windows. Can specify custom dotnet install with -dotnetdir <dir>, but dotnet install should not impact Android Startup testing itself.
     ```
 
-2. Navigate to the `helloandroid` scenario directory:
+2. Navigate to the `genericandroidstartup` scenario directory:
 
     ```sh
-    cd helloandroid
+    cd genericandroidstartup
     ```
 
-3. Copy the APK into the `helloandroid` directory.
+3. Copy the APK into the `genericandroidstartup` directory.
 4. Run the test:
 
     ```sh

src/scenarios/genericandroidstartup/post.py

@@ -0,0 +1,7 @@
+'''
+post cleanup script
+'''
+
+from shared.postcommands import clean_directories
+
+clean_directories()

src/scenarios/genericandroidstartup/pre.py

@@ -0,0 +1,49 @@
+'''
+pre-command
+'''
+import sys
+import os
+from zipfile import ZipFile
+from performance.logger import setup_loggers, getLogger
+from shutil import copyfile
+from shared.precommands import PreCommands
+from shared.const import PUBDIR
+from argparse import ArgumentParser
+
+setup_loggers(True)
+
+parser = ArgumentParser()
+parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
+parser.add_argument(
+        '--apk-name',
+        dest='apk',
+        required=True,
+        type=str,
+        help='Name of the APK to setup (with .apk)')
+args = parser.parse_args()
+
+if not os.path.exists(PUBDIR):
+    os.mkdir(PUBDIR)
+apkname = args.apk
+apknamezip = '%s.zip' % (apkname)
+if not os.path.exists(apkname):
+    getLogger().error('Cannot find %s' % (apkname))
+    exit(-1)
+if args.unzip:
+    if not os.path.exists(apknamezip):
+        copyfile(apkname, apknamezip)
+
+    with ZipFile(apknamezip) as zip:
+        zip.extractall(os.path.join('.', PUBDIR))
+
+    assets_dir = os.path.join(PUBDIR, 'assets')
+    assets_zip = os.path.join(assets_dir, 'assets.zip')
+    with ZipFile(assets_zip) as zip:
+        zip.extractall(assets_dir)
+
+    os.remove(assets_zip)
+else:
+    copyfile(apkname, os.path.join(PUBDIR, apkname))
+
+
+

src/scenarios/genericandroidstartup/test.py

@@ -0,0 +1,12 @@
+'''
+C# Console app
+'''
+from shared.runner import TestTraits, Runner
+
+EXENAME = 'GenericAndroidStartup'
+
+if __name__ == "__main__":
+    traits = TestTraits(exename=EXENAME,
+                        guiapp='false',
+                        )
+    Runner(traits).run()