Merge pull request #13 from 2gis/add-quit-command

Add quit command
2gis · Mar 4, 2015 · 8d84fbe · 8d84fbe
2 parents 73efc27 + 93027a9
commit 8d84fbe
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CloseExecutor.cs b/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CloseExecutor.cs
@@ -6,7 +6,11 @@ internal class CloseExecutor : CommandExecutorBase
 
         protected override string DoImpl()
         {
-            this.Automator.Deployer.Uninstall();
+            if (!this.Automator.ActualCapabilities.DebugConnectToRunningApp)
+            {
+                // TODO close should only close app, not uninstall
+                this.Automator.Deployer.Uninstall();
+            }
 
             return this.JsonResponse();
         }

diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/QuitExecuter.cs b/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/QuitExecuter.cs
@@ -0,0 +1,21 @@
+namespace WindowsUniversalAppDriver.CommandExecutors
+{
+    internal class QuitExecutor : CommandExecutorBase
+    {
+        #region Methods
+
+        protected override string DoImpl()
+        {
+            if (!this.Automator.ActualCapabilities.DebugConnectToRunningApp)
+            {
+                // TODO quit should close all open windows (apps) and possible close the emulator
+                this.Automator.Deployer.Uninstall();
+            }
+
+
+            return this.JsonResponse();
+        }
+
+        #endregion
+    }
+}
diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/Deployer81.cs b/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/Deployer81.cs
@@ -128,7 +128,14 @@ public void Terminate()
 
         public void Uninstall()
         {
+            if (this.application == null)
+            { 
+                Logger.Debug("Could not uninstall application that is already uninstalled.");
+                return;
+            }
+
             this.application.Uninstall();
+            this.application = null;
         }
 
         #endregion

diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/WindowsUniversalAppDriver.csproj b/WindowsUniversalAppDriver/WindowsUniversalAppDriver/WindowsUniversalAppDriver.csproj
@@ -89,6 +89,7 @@
     <Compile Include="CommandExecutors\MouseMoveToExecutor.cs" />
     <Compile Include="CommandExecutors\MouseUpExecutor.cs" />
     <Compile Include="CommandExecutors\NewSessionExecutor.cs" />
+    <Compile Include="CommandExecutors\QuitExecuter.cs" />
     <Compile Include="CommandExecutors\ScreenshotExecutor.cs" />
     <Compile Include="CommandExecutors\SendKeysToElementExecutor.cs" />
     <Compile Include="CommandExecutors\TouchFlickExecutor.cs" />