Merge branches 'master' and 'nam-integrating' of https://github.com/C…

…oSMoSoftware/KITE-Extras into master-real
CoSMoSoftware · Jun 11, 2019 · 9fe6da7 · 9fe6da7
2 parents 5363e1e + 202ea61
commit 9fe6da7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/io/cosmosoftware/kite/report/ParamList.java b/src/main/java/io/cosmosoftware/kite/report/ParamList.java
@@ -16,7 +16,7 @@ public JsonArray toJson() {
     for (String key : this.keySet()) {
       builder.add(Json.createObjectBuilder()
         .add("name", key)
-        .add("value", this.get(key)).build());
+        .add("value", this.get(key) != null ? this.get(key) : "NC").build());
     }
     return builder.build();
   }

diff --git a/src/main/java/io/cosmosoftware/kite/util/WebDriverUtils.java b/src/main/java/io/cosmosoftware/kite/util/WebDriverUtils.java
@@ -115,19 +115,24 @@ public static void clickElement(WebDriver webDriver, WebElement element, boolean
    * @param webDriverList the web driver list
    */
   public static void closeDrivers(List<WebDriver> webDriverList) {
-    logger.info("closeDrivers: closing down " + webDriverList.size() + " webDrivers");
-    for (WebDriver webDriver : webDriverList)
-      try {
-        // Open about:config in case of fennec (Firefox for Android) and close.
-        if (((RemoteWebDriver) webDriver).getCapabilities().getBrowserName()
-          .equalsIgnoreCase("fennec")) {
-          webDriver.get("about:config");
-          webDriver.close();
+    if (!webDriverList.isEmpty()) {
+      logger.info("closeDrivers: closing down " + webDriverList.size() + " webDrivers");
+      for (WebDriver webDriver : webDriverList) {
+        try {
+          // Open about:config in case of fennec (Firefox for Android) and close.
+          if (((RemoteWebDriver) webDriver).getCapabilities().getBrowserName()
+            .equalsIgnoreCase("fennec")) {
+            webDriver.get("about:config");
+            webDriver.close();
+          }
+          webDriver.quit();
+        } catch (Exception e) {
+          logger.error("Exception while closing/quitting the WebDriver", e);
         }
-        webDriver.quit();
-      } catch (Exception e) {
-        logger.error("Exception while closing/quitting the WebDriver", e);
       }
+      // prevent this get called more than once
+      webDriverList.clear();
+    }
   }
 
   /**