better logging and bumped version to 14.0.1 (#1105)

AppiumTestDistribution · Oct 17, 2023 · 75109e3 · 75109e3
1 parent 90ade75
commit 75109e3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.saikrishna321</groupId>
     <artifactId>AppiumTestDistribution</artifactId>
-    <version>14.0.0</version>
+    <version>14.0.1</version>
     <packaging>jar</packaging>
     <name>AppiumTestDistribution</name>
     <description>A tool run Android and iOS test in parallel across devices</description>

diff --git a/src/main/java/com/appium/manager/AppiumDriverManager.java b/src/main/java/com/appium/manager/AppiumDriverManager.java
@@ -15,8 +15,8 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URL;
+import java.util.stream.Collectors;
 
 import static com.appium.manager.AppiumDeviceManager.getMobilePlatform;
 import static com.appium.utils.ConfigFileManager.CAPS;
@@ -30,17 +30,23 @@ public static AppiumDriver getDriver() {
     }
 
     protected static void setDriver(AppiumDriver driver) {
-        LOGGER.info("AppiumDriverManager: Created AppiumDriver with capabilities: ");
-        Capabilities capabilities = driver.getCapabilities();
-        capabilities.getCapabilityNames().forEach(key -> LOGGER.info("\t" + key
-                + ":: " + capabilities.getCapability(key)));
+        String allCapabilities = driver.getCapabilities().getCapabilityNames().stream()
+                .map(key -> String.format("%n\t%s:: %s", key,
+                        driver.getCapabilities().getCapability(key)))
+                .collect(Collectors.joining(""));
+        LOGGER.info(String.format("AppiumDriverManager: Created AppiumDriver with capabilities: %s",
+                allCapabilities));
         appiumDriver.set(driver);
     }
 
     private AppiumDriver initialiseDriver(DesiredCapabilities desiredCapabilities) {
-        LOGGER.info("Initialise Driver with Capabilities: ");
-        desiredCapabilities.getCapabilityNames().forEach(key -> LOGGER.info("\t" + key
-                + ":: " + desiredCapabilities.getCapability(key)));
+        String allCapabilities = desiredCapabilities.getCapabilityNames().stream()
+                .map(key -> String.format("%n\t%s:: %s", key,
+                        desiredCapabilities.getCapability(key)))
+                .collect(Collectors.joining(""));
+
+        LOGGER.info(String.format("Initialise Driver with Capabilities: %s",
+                allCapabilities));
         AppiumServerManager appiumServerManager = new AppiumServerManager();
         String remoteWDHubIP = appiumServerManager.getRemoteWDHubIP();
         return createAppiumDriver(desiredCapabilities, remoteWDHubIP);

diff --git a/src/main/java/com/cucumber/listener/CucumberScenarioListener.java b/src/main/java/com/cucumber/listener/CucumberScenarioListener.java
@@ -40,7 +40,7 @@ public class CucumberScenarioListener implements ConcurrentEventListener {
     private Map<String, Integer> scenarioRunCounts = new HashMap<String, Integer>();
 
     public CucumberScenarioListener() throws Exception {
-        LOGGER.info(String.format("ThreadID: %d: CucumberScenarioListener\n",
+        LOGGER.info(String.format("ThreadID: %d: CucumberScenarioListener%n",
                 Thread.currentThread().getId()));
         new ATDRunner();
         appiumServerManager = new AppiumServerManager();
@@ -71,7 +71,7 @@ public void setEventPublisher(EventPublisher eventPublisher) {
 
     private void runStartedHandler(TestRunStarted event) {
         LOGGER.info("runStartedHandler");
-        LOGGER.info(String.format("ThreadID: %d: beforeSuite: \n",
+        LOGGER.info(String.format("ThreadID: %d: beforeSuite: %n",
                 Thread.currentThread().getId()));
     }
 
@@ -98,7 +98,7 @@ private void caseStartedHandler(TestCaseStarted event) {
         Integer scenarioRunCount = getScenarioRunCount(scenarioName);
         String normalisedScenarioName = normaliseScenarioName(scenarioName);
         LOGGER.info(
-                String.format("ThreadID: %d: beforeScenario: for scenario: %s\n",
+                String.format("ThreadID: %d: beforeScenario: for scenario: %s%n",
                         Thread.currentThread().getId(), scenarioName));
         String scenarioReportDirectory = FileLocations.REPORTS_DIRECTORY
                                                  + normalisedScenarioName + File.separator;
@@ -189,7 +189,7 @@ private void caseFinishedHandler(TestCaseFinished event) {
         LOGGER.info("caseFinishedHandler Name: " + scenarioName);
         long threadId = Thread.currentThread().getId();
         LOGGER.info(
-                String.format("ThreadID: %d: afterScenario: for scenario: %s\n",
+                String.format("ThreadID: %d: afterScenario: for scenario: %s%n",
                         threadId, event.getTestCase().toString()));
 
         TestExecutionContext testExecutionContext =