Merge pull request #282 from Cognifide/243-dependencies-cleanup

243 dependencies cleanup

bb-aem-classic/pom.xml

@@ -74,6 +74,7 @@ limitations under the License.
         <dependency>
             <groupId>com.googlecode.zohhak</groupId>
             <artifactId>zohhak</artifactId>
+            <version>1.1.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

bb-aem-touch-ui/src/main/java/com/cognifide/qa/bb/aem/touch/package-info.java

@@ -0,0 +1,24 @@
+/*-
+ * #%L
+ * Bobcat
+ * %%
+ * Copyright (C) 2018 Cognifide Ltd.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+/**
+ * This module will be removed in 2.0.0 and replaced by a new AEM API
+ */
+@Deprecated
+package com.cognifide.qa.bb.aem.touch;

bb-core/src/main/java/com/cognifide/qa/bb/provider/selenium/webdriver/WebDriverType.java

@@ -25,7 +25,6 @@
 import java.util.Date;
 import java.util.Properties;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Cookie;
@@ -42,8 +41,6 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.safari.SafariDriver;
 import org.openqa.selenium.safari.SafariOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.cognifide.qa.bb.constants.ConfigKeys;
 
@@ -83,12 +80,20 @@ public WebDriver create(Capabilities capabilities, Properties properties) {
           new SafariDriver(new SafariOptions(capabilities)));
     }
   },
+  /**
+   * @deprecated Please use an actual browser implementation
+   */
+  @Deprecated
   HTML {
     @Override
     public WebDriver create(Capabilities capabilities, Properties properties) {
       return getWebDriverWithProxyCookieSupport(properties, new HtmlUnitDriver(capabilities));
     }
   },
+  /**
+   * @deprecated PhantomJS is no longer maintained, please use headless mode in actual browsers
+   */
+  @Deprecated
   GHOST {
     @Override
     public WebDriver create(Capabilities capabilities, Properties properties) {
@@ -156,8 +161,6 @@ public WebDriver create(Capabilities capabilities, Properties properties) {
     }
   };
 
-  private static final Logger LOG = LoggerFactory.getLogger(WebDriverType.class);
-
   private static WebDriver getWebDriverWithProxyCookieSupport(Properties properties,
       WebDriver driver) {
     if (Boolean.valueOf(properties.getProperty(ConfigKeys.WEBDRIVER_PROXY_COOKIE))) {
@@ -179,15 +182,7 @@ private static WebDriver getWebDriverWithProxyCookieSupport(Properties propertie
    * @return WebDriverType
    */
   public static WebDriverType get(String typeName) {
-    WebDriverType webDriverType = WebDriverType.HTML;
-    if (StringUtils.isNotBlank(typeName)) {
-      try {
-        webDriverType = WebDriverType.valueOf(typeName.toUpperCase());
-      } catch (IllegalArgumentException e) {
-        LOG.error("Illegal type: " + typeName, e);
-      }
-    }
-    return webDriverType;
+    return WebDriverType.valueOf(typeName.toUpperCase());
   }
 
   public abstract WebDriver create(Capabilities capabilities, Properties properties);

bb-core/src/main/java/com/cognifide/qa/bb/provider/selenium/webdriver/WebDriverWrapper.java

@@ -26,8 +26,6 @@
 import java.util.Set;
 import java.util.UUID;
 
-import io.appium.java_client.android.AndroidDriver;
-import io.appium.java_client.android.Connection;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ContextAware;
 import org.openqa.selenium.DeviceRotation;
@@ -51,39 +49,44 @@
 
 import com.cognifide.qa.bb.frame.FrameSwitcher;
 
-import io.appium.java_client.DeviceActionShortcuts;
+import io.appium.java_client.ExecutesMethod;
 import io.appium.java_client.FindsByAccessibilityId;
 import io.appium.java_client.FindsByAndroidUIAutomator;
+import io.appium.java_client.FindsByFluentSelector;
 import io.appium.java_client.FindsByIosUIAutomation;
 import io.appium.java_client.HasAppStrings;
+import io.appium.java_client.HasDeviceTime;
+import io.appium.java_client.HasSessionDetails;
+import io.appium.java_client.HidesKeyboard;
+import io.appium.java_client.HidesKeyboardWithKeyName;
 import io.appium.java_client.InteractsWithApps;
 import io.appium.java_client.InteractsWithFiles;
 import io.appium.java_client.MobileDriver;
 import io.appium.java_client.MultiTouchAction;
 import io.appium.java_client.PerformsTouchActions;
 import io.appium.java_client.TouchAction;
-import io.appium.java_client.TouchShortcuts;
-import io.appium.java_client.android.AndroidDeviceActionShortcuts;
-import io.appium.java_client.android.HasNetworkConnection;
+import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.android.PushesFiles;
 import io.appium.java_client.android.StartsActivity;
-import io.appium.java_client.ios.IOSDeviceActionShortcuts;
+import io.appium.java_client.android.connection.HasNetworkConnection;
+import io.appium.java_client.ios.ShakesDevice;
+import io.appium.java_client.windows.PressesKeyCode;
 
 /**
  * This class is a "simple" extension of Selenium's EventFiringWebDriver that additionally
  * implements several useful interfaces.
  */
 public class WebDriverWrapper extends EventFiringWebDriver implements
-    HasCapabilities, MobileDriver, AndroidDeviceActionShortcuts,
-    HasNetworkConnection, PushesFiles, StartsActivity, FindsByAndroidUIAutomator,
-    IOSDeviceActionShortcuts, FindsByIosUIAutomation, HasIdentity {
+    HasCapabilities, MobileDriver, HasNetworkConnection, PushesFiles, StartsActivity,
+    FindsByAndroidUIAutomator, FindsByIosUIAutomation, HasIdentity, HasDeviceTime, HidesKeyboard,
+    HidesKeyboardWithKeyName, PressesKeyCode, ShakesDevice, HasSessionDetails {
 
   private final FrameSwitcher frameSwitcher;
 
   /**
    * Constructs WebDriverWrapper.
    *
-   * @param driver instance of WebDriver.
+   * @param driver        instance of WebDriver.
    * @param frameSwitcher instance of FrameSwitcher.
    */
   public WebDriverWrapper(WebDriver driver, FrameSwitcher frameSwitcher) {
@@ -260,13 +263,8 @@ public void resetApp() {
   }
 
   @Override
-  public void runAppInBackground(int seconds) {
-    ((InteractsWithApps) super.getWrappedDriver()).runAppInBackground(seconds);
-  }
-
-  @Override
-  public void removeApp(String bundleId) {
-    ((InteractsWithApps) super.getWrappedDriver()).removeApp(bundleId);
+  public boolean removeApp(String bundleId) {
+    return ((InteractsWithApps) super.getWrappedDriver()).removeApp(bundleId);
   }
 
   @Override
@@ -284,49 +282,14 @@ public byte[] pullFolder(String remotePath) {
     return ((InteractsWithFiles) super.getWrappedDriver()).pullFolder(remotePath);
   }
 
-  @Override
-  public void zoom(int x, int y) {
-    ((TouchShortcuts) super.getWrappedDriver()).zoom(x, y);
-  }
-
-  @Override
-  public void zoom(WebElement el) {
-    ((TouchShortcuts) super.getWrappedDriver()).zoom(el);
-  }
-
-  @Override
-  public void tap(int fingers, int x, int y, int duration) {
-    ((TouchShortcuts) super.getWrappedDriver()).tap(fingers, x, y, duration);
-  }
-
-  @Override
-  public void tap(int fingers, WebElement element, int duration) {
-    ((TouchShortcuts) super.getWrappedDriver()).tap(fingers, element, duration);
-  }
-
-  @Override
-  public void swipe(int startx, int starty, int endx, int endy, int duration) {
-    ((TouchShortcuts) super.getWrappedDriver()).swipe(startx, starty, endx, endy, duration);
-  }
-
-  @Override
-  public void pinch(int x, int y) {
-    ((TouchShortcuts) super.getWrappedDriver()).pinch(x, y);
-  }
-
-  @Override
-  public void pinch(WebElement el) {
-    ((TouchShortcuts) super.getWrappedDriver()).pinch(el);
-  }
-
   @Override
   public void hideKeyboard() {
-    ((DeviceActionShortcuts) super.getWrappedDriver()).hideKeyboard();
+    ((HidesKeyboard) super.getWrappedDriver()).hideKeyboard();
   }
 
   @Override
   public String getDeviceTime() {
-    return ((DeviceActionShortcuts) super.getWrappedDriver()).getDeviceTime();
+    return ((HasDeviceTime) super.getWrappedDriver()).getDeviceTime();
   }
 
   @Override
@@ -401,17 +364,17 @@ public List<WebElement> findElementsByIosUIAutomation(String using) {
 
   @Override
   public void hideKeyboard(String keyName) {
-    ((IOSDeviceActionShortcuts) super.getWrappedDriver()).hideKeyboard(keyName);
+    ((HidesKeyboardWithKeyName) super.getWrappedDriver()).hideKeyboard(keyName);
   }
 
   @Override
   public void hideKeyboard(String strategy, String keyName) {
-    ((IOSDeviceActionShortcuts) super.getWrappedDriver()).hideKeyboard(strategy, keyName);
+    ((HidesKeyboardWithKeyName) super.getWrappedDriver()).hideKeyboard(strategy, keyName);
   }
 
   @Override
   public void shake() {
-    ((IOSDeviceActionShortcuts) super.getWrappedDriver()).shake();
+    ((ShakesDevice) super.getWrappedDriver()).shake();
   }
 
   @Override
@@ -426,44 +389,6 @@ public List<WebElement> findElementsByAndroidUIAutomator(String using) {
         .findElementsByAndroidUIAutomator(using);
   }
 
-  @Override
-  public void startActivity(String appPackage, String appActivity, String appWaitPackage,
-      String appWaitActivity, boolean stopApp) {
-    ((StartsActivity) super.getWrappedDriver()).startActivity(appPackage, appActivity,
-        appWaitPackage, appWaitActivity, stopApp);
-  }
-
-  @Override
-  public void startActivity(String appPackage, String appActivity, String appWaitPackage,
-      String appWaitActivity) {
-    ((StartsActivity) super.getWrappedDriver())
-        .startActivity(appPackage, appActivity, appWaitPackage, appWaitActivity);
-  }
-
-  @Override
-  public void startActivity(String appPackage, String appActivity) {
-    ((StartsActivity) super.getWrappedDriver()).startActivity(appPackage, appActivity);
-  }
-
-  @Override
-  public void startActivity(String appPackage, String appActivity, String appWaitPackage,
-      String appWaitActivity, String intentAction, String intentCategory, String intentFlags,
-      String intentOptionalArgs) {
-    ((StartsActivity) super.getWrappedDriver()).startActivity(appPackage, appActivity,
-        appWaitPackage, appWaitActivity, intentAction, intentCategory, intentFlags,
-        intentOptionalArgs);
-
-  }
-
-  @Override
-  public void startActivity(String appPackage, String appActivity, String appWaitPackage,
-      String appWaitActivity, String intentAction, String intentCategory, String intentFlags,
-      String intentOptionalArgs, boolean stopApp) {
-    ((StartsActivity) super.getWrappedDriver()).startActivity(appPackage, appActivity,
-        appWaitPackage, appWaitActivity, intentAction, intentCategory, intentFlags,
-        intentOptionalArgs, stopApp);
-  }
-
   @Override
   public void pushFile(String remotePath, byte[] base64Data) {
     ((PushesFiles) super.getWrappedDriver()).pushFile(remotePath, base64Data);
@@ -515,18 +440,22 @@ public void longPressKeyCode(int key, Integer metastate) {
   }
 
   @Override
-  public void setConnection(Connection connection) {
-    ((HasNetworkConnection) super.getWrappedDriver()).setConnection(connection);
+  public String getId() {
+    return UUID.randomUUID().toString();
   }
 
   @Override
-  public Connection getConnection() {
-    return ((HasNetworkConnection) super.getWrappedDriver()).getConnection();
+  public Response execute(String driverCommand) {
+    return ((ExecutesMethod) super.getWrappedDriver()).execute(driverCommand);
   }
 
   @Override
-  public String getId() {
-    return UUID.randomUUID().toString();
+  public WebElement findElement(String by, String using) {
+    return ((FindsByFluentSelector) super.getWrappedDriver()).findElement(by, using);
   }
 
+  @Override
+  public List findElements(String by, String using) {
+    return ((FindsByFluentSelector) super.getWrappedDriver()).findElements(by, using);
+  }
 }

bb-reports/pom.xml

@@ -45,6 +45,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
+            <version>2.3.20</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

bb-reports/src/main/java/com/cognifide/qa/bb/logging/package-info.java

@@ -0,0 +1,24 @@
+/*-
+ * #%L
+ * Bobcat
+ * %%
+ * Copyright (C) 2018 Cognifide Ltd.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+/**
+ * Deprecated, this module will be removed after 2.0.0. Use Junit5 and Allure going onwards.
+ */
+@Deprecated
+package com.cognifide.qa.bb.logging;

bb-traffic/pom.xml

@@ -44,7 +44,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
     </dependencies>