From aa88ea7def694e12ee6010dcf1c84803d3c5ff1b Mon Sep 17 00:00:00 2001
From: Natalie Bunduwongse <nf1993@gmail.com>
Date: Wed, 15 Jan 2025 18:03:51 +1300
Subject: [PATCH] test: android ui tests for passport, imx and zkevm functions

---
 sample/Assets/Editor/MacBuilder.cs     |  3 ++-
 sample/Assets/Editor/MobileBuilder.cs  |  4 ++--
 sample/Assets/Editor/WindowsBuilder.cs |  3 ++-
 sample/Packages/manifest.json          |  8 ++++----
 sample/Packages/packages-lock.json     |  2 +-
 sample/Tests/test/test_android.py      | 18 ++++++++++++++++--
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/sample/Assets/Editor/MacBuilder.cs b/sample/Assets/Editor/MacBuilder.cs
index 32553406..1e71b73e 100644
--- a/sample/Assets/Editor/MacBuilder.cs
+++ b/sample/Assets/Editor/MacBuilder.cs
@@ -2,8 +2,9 @@
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using AltTester.AltTesterUnitySDK.Editor;
-using AltTester.AltTesterUnitySDK;
 using System;
+using AltTester.AltTesterUnitySDK.Commands;
+using AltTester.AltTesterUnitySDK.Driver;
 
 public class MacBuilder
 {
diff --git a/sample/Assets/Editor/MobileBuilder.cs b/sample/Assets/Editor/MobileBuilder.cs
index d80d5bf9..0b3261a0 100644
--- a/sample/Assets/Editor/MobileBuilder.cs
+++ b/sample/Assets/Editor/MobileBuilder.cs
@@ -2,9 +2,9 @@
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using AltTester.AltTesterUnitySDK.Editor;
-using AltTester.AltTesterUnitySDK;
 using System;
-using System.IO;
+using AltTester.AltTesterUnitySDK.Commands;
+using AltTester.AltTesterUnitySDK.Driver;
 
 public class MobileBuilder
 {
diff --git a/sample/Assets/Editor/WindowsBuilder.cs b/sample/Assets/Editor/WindowsBuilder.cs
index b8b659f3..b5c83163 100644
--- a/sample/Assets/Editor/WindowsBuilder.cs
+++ b/sample/Assets/Editor/WindowsBuilder.cs
@@ -2,8 +2,9 @@
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using AltTester.AltTesterUnitySDK.Editor;
-using AltTester.AltTesterUnitySDK;
 using System;
+using AltTester.AltTesterUnitySDK.Commands;
+using AltTester.AltTesterUnitySDK.Driver;
 
 public class WindowsBuilder
 {
diff --git a/sample/Packages/manifest.json b/sample/Packages/manifest.json
index 6d32af96..abd09528 100644
--- a/sample/Packages/manifest.json
+++ b/sample/Packages/manifest.json
@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "com.alttester.sdk": "2.1.1",
+    "com.alttester.sdk": "2.2.0",
     "com.cysharp.unitask": "2.3.3",
-    "com.immutable.passport": "file:../../src/Packages/Passport",
     "com.immutable.api.zkevm": "file:../../src/Packages/ZkEvmApi",
     "com.immutable.marketplace": "file:../../src/Packages/Marketplace",
+    "com.immutable.passport": "file:../../src/Packages/Passport",
     "com.unity.ai.navigation": "1.1.4",
     "com.unity.editorcoroutines": "1.0.0",
+    "com.unity.ide.rider": "3.0.20",
     "com.unity.ide.visualstudio": "2.0.21",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.ide.rider": "3.0.20",
     "com.unity.test-framework": "1.3.0",
     "com.unity.testtools.codecoverage": "1.2.5",
     "com.unity.textmeshpro": "3.0.9",
@@ -70,4 +70,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/sample/Packages/packages-lock.json b/sample/Packages/packages-lock.json
index 4e3dacd8..c10c870a 100644
--- a/sample/Packages/packages-lock.json
+++ b/sample/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.alttester.sdk": {
-      "version": "2.1.1",
+      "version": "2.2.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
diff --git a/sample/Tests/test/test_android.py b/sample/Tests/test/test_android.py
index 5f543e83..8699f952 100644
--- a/sample/Tests/test/test_android.py
+++ b/sample/Tests/test/test_android.py
@@ -10,13 +10,15 @@
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 
-from alttester import AltDriver, AltReversePortForwarding, By
+from alttester import *
+
+from test import UnityTest
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent / 'src'))
 from fetch_otp import EMAIL, fetch_code
 
 # To run this test on an actual Android device: appium --base-path /wd/hub --allow-insecure chromedriver_autodownload
-class TestBase(unittest.TestCase):
+class TestBase(UnityTest):
     altdriver = None
     appium_driver = None
 
@@ -74,3 +76,15 @@ def test_1_pkce_login(self):
 
         # Wait for authenticated screen
         self.altdriver.wait_for_current_scene_to_be("AuthenticatedScene")
+
+    def test_2_other_functions(self):
+        self.test_0_other_functions()
+
+    def test_3_passport_functions(self):
+        self.test_1_passport_functions()
+
+    def test_4_imx_functions(self):
+        self.test_2_imx_functions()
+
+    def test_5_zkevm_functions(self):
+        self.test_3_zkevm_functions()