fix ios and android drivers

Author: Alvaro Laserna

src/main/java/testUI/TestUIDriver.java

@@ -130,6 +130,18 @@ public static void removeDriver(int driver) {
         TestUIDriver.driver.set(appiumDrivers);
     }
 
+    public static void removeiOSDriver(int driver) {
+        List<IOSDriver> appiumiOSDrivers = new ArrayList<>(getIOSDrivers());
+        appiumiOSDrivers.remove(driver);
+        TestUIDriver.IOSTestUIDriver.set(appiumiOSDrivers);
+    }
+
+    public static void removeAndroidDriver(int driver) {
+        List<AndroidDriver> appiumAndroidDrivers = new ArrayList<>(getAndroidDrivers());
+        appiumAndroidDrivers.remove(driver);
+        TestUIDriver.AndroidTestUIDriver.set(appiumAndroidDrivers);
+    }
+
     public static WebDriver getSelenideDriver() {
         return WebDriverRunner.getWebDriver();
     }

src/main/java/testUI/TestUIServer.java

@@ -278,11 +278,13 @@ public static void stop(int driver) {
             removeUsePort(driver - 1);
             removeUseBootstrapPort(driver - 1);
             if (Configuration.automationType.equals(IOS_PLATFORM)) {
-                if (getDrivers().size() != 0)
-                    getDrivers().get(driver - 1).close();
-                sleep(500);
+                if (!getIOSDrivers().isEmpty())
+                    removeiOSDriver(driver - 1);
+            } else if (Configuration.automationType.equals(ANDROID_PLATFORM)) {
+                if (!getAndroidDrivers().isEmpty())
+                    removeAndroidDriver(driver - 1);
             }
-            if (getDrivers().size() != 0) {
+            if (!getDrivers().isEmpty()) {
                 getDrivers().get(driver - 1).quit();
                 removeDriver(driver - 1);
             }
@@ -369,6 +371,13 @@ public static void stop() {
             removeUseBootstrapPort(driver - 1);
             getDrivers().get(driver - 1).quit();
             removeDriver(driver - 1);
+            if (Configuration.automationType.equals(IOS_PLATFORM)) {
+                if (!getIOSDrivers().isEmpty())
+                    removeiOSDriver(driver - 1);
+            } else if (Configuration.automationType.equals(ANDROID_PLATFORM)) {
+                if (!getAndroidDrivers().isEmpty())
+                    removeAndroidDriver(driver - 1);
+            }
             if (getAppiumServices() != null && getAppiumServices().size() >= driver) {
                 getAppiumServices().get(driver - 1).stop();
                 getAppiumServices().remove(driver - 1);

src/test/java/TestRunners/TestIOS.java

@@ -4,6 +4,7 @@
 import org.junit.Test;
 import testUI.Configuration;
 
+import static testUI.TestUIDriver.getIOSDrivers;
 import static testUI.TestUIServer.stop;
 import static testUI.UIOpen.open;
 
@@ -15,8 +16,11 @@ public void testIOSBrowser() {
         Configuration.automationType = Configuration.IOS_PLATFORM;
         Configuration.serverLogLevel = "debug";
         Configuration.useNewWDA = false;
+//        Configuration.appiumUrl = "http://IP:4723/wd/hub";
         open("https://www.facebook.com");
+        System.out.println(getIOSDrivers().size());
         stop();
+        System.out.println(getIOSDrivers().size());
         open("https://www.facebook.com");
     }
 }