Merge branch 'master' into patch-2

Author: AnilPatidar

src/main/java/com/appium/android/AndroidDeviceConfiguration.java

@@ -26,7 +26,7 @@ public AndroidDeviceConfiguration() {
     }
 
     /*
-     * This method gets the device model name
+     * This method gets the device model name..
      */
     public String getDeviceModel() {
         AppiumDevice getModel = getDevice();

src/main/java/com/appium/manager/AppiumDevice.java

@@ -76,10 +76,13 @@ public boolean isLocalDevice() {
     }
 
     public boolean isAvailable() {
+                System.out.println("inside isAvailable");
         return deviceState.equalsIgnoreCase(AVAILABLE);
     }
 
     public void blockDevice() {
+                System.out.println("inside blockDevice");
+
         deviceState = BUSY;
     }
 

src/main/java/com/appium/manager/AppiumDriverManager.java

@@ -59,6 +59,7 @@ private AppiumDriver<MobileElement> initialiseDriver(DesiredCapabilities desired
     private AppiumDriver createAppiumDriver(DesiredCapabilities desiredCapabilities,
                                              String remoteWDHubIP)
             throws MalformedURLException {
+                System.out.println("inside createAppiumDriver");
         AppiumDriver currentDriverSession;
         MobilePlatform mobilePlatform = getMobilePlatform();
         switch (mobilePlatform) {
@@ -95,6 +96,8 @@ private AppiumDriver<MobileElement> startAppiumDriverInstance(
             Optional<DesiredCapabilities> desiredCapabilities)
         throws Exception {
         LOGGER.info("startAppiumDriverInstance");
+        System.out.println("inside ATD:beforeInvocation");
+        LOGGER.info("startAppiumDriverInstance: capabilities: " + desiredCapabilities);
         AppiumDriver<MobileElement> currentDriverSession =
                 initialiseDriver(desiredCapabilities.get());
         AppiumDriverManager.setDriver(currentDriverSession);
@@ -105,6 +108,7 @@ private AppiumDriver<MobileElement> startAppiumDriverInstance(
     public AppiumDriver<MobileElement> startAppiumDriverInstance(String testMethodName)
             throws Exception {
         LOGGER.info("startAppiumDriverInstance");
+        System.out.println("inside startAppiumDriverInstance");
         return startAppiumDriverInstance(
                 Optional.ofNullable(buildDesiredCapabilities(testMethodName, CAPS.get())));
     }
@@ -152,4 +156,4 @@ public void stopAppiumDriver() throws Exception {
             AppiumDriverManager.getDriver().quit();
         }
     }
-}
+}

src/main/java/com/appium/manager/AppiumParallelMethodTestListener.java

@@ -93,6 +93,7 @@ private void startReportLogging(ITestResult iTestResult) throws IOException,
      */
     @Override
     public void beforeInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestResult) {
+        System.out.println("inside ATD:beforeInvocation");
         String testMethodName = iInvokedMethod.getTestMethod().getMethodName();
         allocateDeviceAndStartDriver(testMethodName, iTestResult);
         if (!isCloudExecution()) {
@@ -121,6 +122,7 @@ public void beforeInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestRes
 
     private void allocateDeviceAndStartDriver(String testMethodName, ITestResult iTestResult) {
         try {
+                    System.out.println("inside start of ATD:allocateDeviceAndStartDriver");
             AppiumDriver driver = AppiumDriverManager.getDriver();
             if (driver == null || driver.getSessionId() == null) {
                 deviceAllocationManager.allocateDevice(deviceAllocationManager
@@ -133,6 +135,8 @@ private void allocateDeviceAndStartDriver(String testMethodName, ITestResult iTe
         } catch (Exception e) {
             e.printStackTrace();
         }
+                System.out.println("inside end of ATD:allocateDeviceAndStartDriver");
+
     }
 
     /*
@@ -158,8 +162,10 @@ public void afterInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestResu
                     }
                 }
                 if (iInvokedMethod.isTestMethod()) {
-                    AppiumDriverManager.getDriver().quit();
+                   System.out.println("Releasing the Device");
                     deviceAllocationManager.freeDevice();
+                    AppiumDriverManager.getDriver().quit();
+                    System.out.println("Releasing the Device Done");
                     if (!isCloudExecution()) {
                         appiumDriverManager.stopAppiumDriver();
                     }

src/main/java/com/appium/manager/DeviceAllocationManager.java

@@ -48,11 +48,15 @@ public List<AppiumDevice> getDevices() {
 
     public synchronized AppiumDevice getNextAvailableDevice() {
         int i = 0;
+                System.out.println("inside getNextAvailableDevice");
+
         for (AppiumDevice device : allDevices) {
             Thread t = Thread.currentThread();
             t.setName("Thread_" + i);
             i++;
-            if (device.isAvailable()) {
+            boolean flag =device.isAvailable();
+                        System.out.println("isDevice available : "+flag);
+            if (flag) {
                 device.blockDevice();
                 return device;
             }