feat: activate app with timeout (#579)

* Revert "Revert "activate app with timeout""

This reverts commit 893d0e1.

* do not revert #576

Author: agentran

src/Appium.Net/Appium/AppiumDriver.cs

@@ -139,6 +139,12 @@ public void RemoveApp(string appId) =>
 
         public void ActivateApp(string appId) =>
             Execute(AppiumDriverCommand.ActivateApp, AppiumCommandExecutionHelper.PrepareArgument("appId", appId));
+        
+        public void ActivateApp(string appId, TimeSpan timeout) =>
+            Execute(AppiumDriverCommand.ActivateApp,
+                    AppiumCommandExecutionHelper.PrepareArguments(new string[] {"appId", "options"},
+                        new object[]
+                            {appId, new Dictionary<string, object>() {{"timeout", (long) timeout.TotalMilliseconds}}}));
 
         public bool TerminateApp(string appId) =>
             Convert.ToBoolean(Execute(AppiumDriverCommand.TerminateApp,

test/integration/Android/Device/AppTests.cs

@@ -40,7 +40,16 @@ public void CanActivateAppTest()
             //Verify the expected app was activated
             Assert.DoesNotThrow(() => _driver.FindElement(MobileBy.AccessibilityId(ApiDemoElement)));
         }
+        
+        [Test]
+        public void CanActivateAppWithTimeoutTest()
+        {
+            //Activate an app to foreground
+            Assert.DoesNotThrow(() => _driver.ActivateApp(ApiDemosPackageName, TimeSpan.FromSeconds(20)));
 
+            //Verify the expected app was activated
+            Assert.DoesNotThrow(() => _driver.FindElement(MobileBy.AccessibilityId(ApiDemoElement)));
+        }
         [Test]
         public void CanActivateAppFromBackgroundTest()
         {

test/integration/IOS/Device/AppTests.cs

@@ -46,6 +46,16 @@ public void CanActivateAppTest()
             Assert.DoesNotThrow(() => _driver.FindElement(MobileBy.AccessibilityId(IosTestAppElement)));
         }
 
+        [Test]
+        public void CanActivateAppWithTimeoutTest()
+        {
+            //Activate an app to foreground
+            Assert.DoesNotThrow(() => _driver.ActivateApp(IosTestAppBundleId, TimeSpan.FromSeconds(20)));
+
+            //Verify the expected app was activated
+            Assert.DoesNotThrow(() => _driver.FindElement(MobileBy.AccessibilityId(IosTestAppElement)));
+        }
+        
         [Test]
         public void CanActivateViaScriptAppTest()
         {