chore: Remove resetApp (#700)

appium · Dec 5, 2023 · 37f3b0b · 37f3b0b
1 parent 499530c
commit 37f3b0b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 24 deletions.
diff --git a/src/Appium.Net/Appium/AppiumCommand.cs b/src/Appium.Net/Appium/AppiumCommand.cs
@@ -121,8 +121,6 @@ public class AppiumCommand
                 "/session/{sessionId}/appium/app/launch"),
             new AppiumCommand(HttpCommandInfo.PostCommand, AppiumDriverCommand.CloseApp,
                 "/session/{sessionId}/appium/app/close"),
-            new AppiumCommand(HttpCommandInfo.PostCommand, AppiumDriverCommand.ResetApp,
-                "/session/{sessionId}/appium/app/reset"),
 
             #endregion (Deprecated) legacy app management
 

diff --git a/src/Appium.Net/Appium/AppiumDriver.cs b/src/Appium.Net/Appium/AppiumDriver.cs
@@ -204,8 +204,6 @@ public void PushFile(string pathOnDevice, FileInfo file) =>
         public void LaunchApp() => ((IExecuteMethod)this).Execute(AppiumDriverCommand.LaunchApp);
         [Obsolete("The CloseApp API is deprecated and will be removed in future versions. Please use TerminateApp instead \r\n See https://github.com/appium/appium/issues/15807")]
         public void CloseApp() => ((IExecuteMethod)this).Execute(AppiumDriverCommand.CloseApp);
-        [Obsolete("The ResetApp API is deprecated and will be removed in future versions. Please use TerminateApp & ActivateApp instead \r\n See https://github.com/appium/appium/issues/15807")]
-        public void ResetApp() => ((IExecuteMethod)this).Execute(AppiumDriverCommand.ResetApp);
 
         public void FingerPrint(int fingerprintId) =>
             AppiumCommandExecutionHelper.FingerPrint(this, fingerprintId);

diff --git a/src/Appium.Net/Appium/AppiumDriverCommand.cs b/src/Appium.Net/Appium/AppiumDriverCommand.cs
@@ -155,11 +155,6 @@ public class AppiumDriverCommand
         /// </summary>
         public const string CloseApp = "closeApp";
 
-        /// <summary>
-        /// Reset App Command.
-        /// </summary>
-        public const string ResetApp = "resetApp";
-
         #endregion (Deprecated) legacy app management
 
         /// <summary>

diff --git a/src/Appium.Net/Appium/Interfaces/IInteractsWithApps.cs b/src/Appium.Net/Appium/Interfaces/IInteractsWithApps.cs
@@ -37,11 +37,6 @@ public interface IInteractsWithApps : IExecuteMethod
         /// <return>a boolean indicating if the app is installed.</return>
         bool IsAppInstalled(string bundleId);
 
-        /// <summary>
-        /// Resets the current app.
-        /// </summary>
-        void ResetApp();
-
         /// <summary>
         /// Deactivates app completely (as "Home" button does).  
         /// </summary>

diff --git a/test/integration/Android/Device/KeyPressTest.cs b/test/integration/Android/Device/KeyPressTest.cs
@@ -24,7 +24,9 @@ public void BeforeAll()
         [SetUp]
         public void SetUp()
         {
-            _driver?.ResetApp();
+            string appId = Apps.GetId(Apps.androidApiDemos);
+            _driver.TerminateApp(appId);
+            _driver.ActivateApp(appId);
         }
 
         [OneTimeTearDown]

diff --git a/test/integration/helpers/Apps.cs b/test/integration/helpers/Apps.cs
@@ -9,8 +9,12 @@ public class Apps
     {
         private static bool _isInited;
         private static Dictionary<string, string> _testApps;
-
-        private static string _testAppsDir = $"{AppDomain.CurrentDomain.BaseDirectory}..//..//..//apps";
+        private static readonly Dictionary<string, string> _testAppsIds = new Dictionary<string, string>
+        {
+            {androidApiDemos, "io.appium.android.apis"},
+            {iosTestApp, "io.appium.TestApp"},
+            {iosUICatalogApp, "com.example.apple-samplecode.UICatalog" }
+        };
 
         private static void Init()
         {
@@ -39,8 +43,6 @@ private static void Init()
 
 
 
-
-
                     _testApps = new Dictionary<string, string>
                     {
                         {iosTestApp, new FileInfo($"{Path.GetTempPath()}/TestApp.app.zip").FullName},
@@ -61,10 +63,16 @@ public static string Get(string appKey)
             return _testApps[appKey];
         }
 
-        public static string iosTestApp = "iosTestApp";
-        public static string iosWebviewApp = "iosWebviewApp";
-        public static string iosUICatalogApp = "iosUICatalogApp";
-        public static string androidApiDemos = "androidApiDemos";
-        public static string vodqaApp = "vodqaApp";
+        public static string GetId(string appKey)
+        {
+            return _testAppsIds[appKey];
+        }
+
+        public const string iosTestApp = "iosTestApp";
+        public const string iosWebviewApp = "iosWebviewApp";
+        public const string iosUICatalogApp = "iosUICatalogApp";
+        public const string androidApiDemos = "androidApiDemos";
+        public const string vodqaApp = "vodqaApp";
+
     }
 }