NewsReader/UITest: Simplify local dev support (#92)

* NR/UITest: For local Android dev use release folder and build sets env variable for the APK

* Build: Simplify yml file

Author: jbe2277

.github/workflows/NewsReader.UITestAndroid.yml

@@ -6,7 +6,6 @@ on:
     types:
     - completed
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
@@ -37,10 +36,6 @@ jobs:
       run: |
         gh run download ${{ steps.get_run.outputs.run_id }} --name="NewsReaderAndroid" --dir=./NewsReaderAndroid
 
-    - shell: bash
-      run: |
-        ls ./NewsReaderAndroid
-
     - name: ⚙️ Enable KVM
       run: |
         echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -64,10 +59,6 @@ jobs:
         emulator -avd test_emulator -no-audio -no-boot-anim -no-window -no-snapshot &
         adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done; input keyevent 82'
 
-    - name: ⚙️ List Android Devices
-      run: |
-        $ANDROID_SDK_ROOT/platform-tools/adb devices
-
     - name: ⚙️ Install Appium Server
       run: |
         npm install appium -g
@@ -80,7 +71,7 @@ jobs:
     - name: 🖥️ UI Test
       run: |
         echo "## 🕵️ Test Results - NewsReader.UITest.sln" >> $Env:GITHUB_STEP_SUMMARY
-        dotnet test ./src/NewsReader.UITest/NewsReader.UITest.sln --filter DevicePlatform=Android --logger GitHubActions
+        dotnet test ./src/NewsReader.UITest/NewsReader.UITest.sln --filter DevicePlatform=Android --logger GitHubActions -e UITestApkFile=NewsReaderAndroid/src/NewsReader/NewsReader.MauiSystem/bin/Release/net9.0-android/publish/Waf.NewsReader-Signed.apk
 
     - name: 📦 Upload UI Test results
       uses: actions/upload-artifact@v4

src/NewsReader.UITest/NewsReader.UITest/UITest.cs

@@ -2,8 +2,8 @@
 
 namespace UITest.NewsReader;
 
-public class UITest() : UITestBase("Waf.NewsReader",
-        androidApkFile: "NewsReaderAndroid/src/NewsReader/NewsReader.MauiSystem/bin/Release/net9.0-android/publish/Waf.NewsReader-Signed.apk",
+public class UITest() : UITestBase("Waf.NewsReader",        
+        androidApkFile: Environment.GetEnvironmentVariable("UITestApkFile") ?? "src/NewsReader/NewsReader.MauiSystem/bin/Release/net9.0-android/Waf.NewsReader-Signed.apk",
         androidAppActivity: "Waf.NewsReader.MainActivity",
         windowsAppId: "Waf.NewsReader_a8txtqew917ny!App",
         Environment.GetEnvironmentVariable("UITestOutputPath") ?? "out/NewsReader.UITest/")

src/NewsReader.UITest/UITest.Core/UITestBase.cs

@@ -12,6 +12,7 @@ public abstract class UITestBase : IDisposable
     private readonly string appId;
     private readonly string app;
     private readonly string androidAppActivity;
+    private readonly string rootPath;
     private readonly string testOutPath;
 
     protected UITestBase(string appId, string androidApkFile, string androidAppActivity, string windowsAppId, string testOutputPath)
@@ -21,7 +22,7 @@ protected UITestBase(string appId, string androidApkFile, string androidAppActiv
         this.appId = appId;
         this.androidAppActivity = androidAppActivity;
         var assemblyPath = Assembly.GetAssembly(typeof(UITestBase))!.Location;
-        var rootPath = Path.GetFullPath(Path.Combine(assemblyPath, "../../../../../../../"));
+        rootPath = Path.GetFullPath(Path.Combine(assemblyPath, "../../../../../../../"));
         testOutPath = Path.GetFullPath(Path.IsPathFullyQualified(testOutputPath) ? testOutputPath : Path.Combine(rootPath, testOutputPath));
         Directory.CreateDirectory(testOutPath);
         app = devicePlatform switch
@@ -59,12 +60,14 @@ protected UITestBase(string appId, string androidApkFile, string androidAppActiv
 
     private AndroidDriver SetupAndroid(Uri serverUri)
     {
+        var apk = Path.GetFullPath(Path.IsPathFullyQualified(app) ? app : Path.Combine(rootPath, app));
+
         // See: https://github.com/appium/appium-uiautomator2-driver
         var driverOptions = new AppiumOptions()
         {
             AutomationName = AutomationName.AndroidUIAutomator2,
             PlatformName = MobilePlatform.Android,
-            App = app,
+            App = apk,
         };
         // TODO: Use this instead of App for local dev
         //driverOptions.AddAdditionalAppiumOption("appPackage", appId);