Merge branch 'master' into angular_rework_development

Author: pnatashap

jdi-eyes-demo/src/test/java/com/jdi/testng/TestNGListener.java

@@ -21,7 +21,7 @@
 import static java.lang.System.currentTimeMillis;
 
 public class TestNGListener implements IInvokedMethodListener {
-    private Long start = currentTimeMillis();
+    private long start = currentTimeMillis();
 
     @Override
     public void beforeInvocation(IInvokedMethod m, ITestResult tr) {

jdi-light-angular-tests-with-mocks/src/test/java/io/github/epam/testng/TestNGListener.java

@@ -16,7 +16,7 @@
 
 public class TestNGListener implements IInvokedMethodListener {
 
-    private Long start = currentTimeMillis();
+    private long start = currentTimeMillis();
 
     @Override
     public void beforeInvocation(IInvokedMethod m, ITestResult tr) {

jdi-light-angular-tests/src/test/java/io/github/epam/testng/TestNGListener.java

@@ -16,7 +16,7 @@
 import static java.lang.System.currentTimeMillis;
 
 public class TestNGListener implements IInvokedMethodListener {
-    private Long start = currentTimeMillis();
+    private long start = currentTimeMillis();
 
     @Override
     public void beforeInvocation(IInvokedMethod m, ITestResult tr) {

jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/TestNGListener.java

@@ -19,7 +19,7 @@
 import static java.lang.System.currentTimeMillis;
 
 public class TestNGListener implements IInvokedMethodListener {
-    private Long start = currentTimeMillis();
+    private long start = currentTimeMillis();
     @Override
     public void beforeInvocation(IInvokedMethod m, ITestResult tr) {
         if (m.isTestMethod()) {

jdi-light-core/pom.xml

@@ -66,7 +66,7 @@
         <dependency>
             <groupId>io.github.bonigarcia</groupId>
             <artifactId>webdrivermanager</artifactId>
-            <version>5.6.2</version>
+            <version>5.6.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.github.docker-java</groupId>

jdi-light-core/src/main/java/com/epam/jdi/light/actions/ActionHelper.java

@@ -747,12 +747,12 @@ public static ActionObject newInfo(ProceedingJoinPoint jp, String name) {
     }
     private static long previousThread = -1;
     public static JAction CHECK_MULTI_THREAD = () -> {
-        if (previousThread == -1)
+        if (previousThread == -1) {
             previousThread = currentThread().getId();
-        else {
+        } else {
             if (previousThread != currentThread().getId()) {
                 MULTI_THREAD = true;
-                logger.trace("switch to getMultiThreadDriver");
+                logger.trace("Switch to getMultiThreadDriver");
                 DRIVER.getFunc = WebDriverFactory::getMultiThreadDriver;
                 CHECK_MULTI_THREAD = () -> {};
                 if (GETTING_DRIVER) {

jdi-light-core/src/main/java/com/epam/jdi/light/driver/get/DriverInfo.java

@@ -92,13 +92,14 @@ private WebDriver setupLocal() {
                 Sleeper.SYSTEM_SLEEPER.sleep(Duration.ofMillis(1000));
                 return this.setupLocal();
             }
-            isLoading = isBlank(DRIVER.path);
+            isLoading = isBlank(getProperty(properties));
             String driverPath = isLoading
                 ? DOWNLOAD_DRIVER_FUNC.execute(downloadType, getDriverPlatform(), DRIVER.version)
-                : path.execute();
+                : getProperty(properties);
             logger.info("Use driver path: " + driverPath);
             logger.trace("setProperty(properties:%s, driverPath:%s)", properties, driverPath);
             setProperty(properties, driverPath);
+            DRIVER.path = driverPath;
             Capabilities caps = getCapabilities();
             logger.trace("getDriver.execute(getCapabilities())", caps);
             isLoading = false;
@@ -119,7 +120,8 @@ private WebDriver setupLocal() {
 
     private WebDriver tryToDownloadDriver() {
         try {
-            DOWNLOAD_DRIVER_FUNC.execute(downloadType, getDriverPlatform(), getBelowVersion());
+            String dPath = DOWNLOAD_DRIVER_FUNC.execute(downloadType, getDriverPlatform(), getBelowVersion());
+            setProperty(properties, dPath);
             return getDriver.execute(getCapabilities());
         } catch (Throwable ex) {
             throw exception(ex, "Failed to download driver");

jdi-light-core/src/main/java/com/epam/jdi/light/elements/common/Cookies.java

@@ -73,7 +73,9 @@ public static void setCookies(Collection<Cookie> cookies) {
      */
     @JDIAction("Delete all cookies")
     public static void clearAllCookies() {
-        manage().deleteAllCookies();
+        try {
+            manage().deleteAllCookies();
+        } catch (Exception ignore) { }
     }
     /**
      * Clear browsers cache

jdi-light-core/src/main/java/com/epam/jdi/light/elements/composite/WebPage.java

@@ -110,15 +110,25 @@ public static void checkUrl(String url) {
         init();
         new WebPage(url).checkOpened();
     }
-    @JDIAction
+    @JDIAction(value = "Verify that url contains {0}")
     public static boolean verifyUrl(String url) {
-        init();
-        return getUrl().contains(url);
+        try {
+            init();
+            return getUrl().contains(url);
+        } catch (Throwable ex) {
+            logger.error("Failed during verify url", ex);
+        }
+        return false;
     }
-    @JDIAction
+    @JDIAction(value = "Verify that title contains {0}")
     public static boolean verifyTitle(String title) {
-        init();
-        return getTitle().contains(title);
+        try {
+            init();
+            return getTitle().contains(title);
+        } catch (Throwable ex) {
+            logger.error("Failed during verify url", ex);
+        }
+        return false;
     }
     public static void checkTitle(String title) {
         init();

jdi-light-core/src/main/java/com/epam/jdi/light/elements/interfaces/base/HasPlaceholder.java

@@ -5,5 +5,7 @@
  * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev
  */
 public interface HasPlaceholder extends ICoreElement {
-    default String placeholder() { return core().placeholder(); }
+    default String placeholder() {
+        return core().placeholder();
+    }
 }