Enabled Travis-CI build to use dockerized Selenium Grid

This allows for testing the newest supported Firefox and Chrome in CI, depending on our Selenium Version.

Author: slu-it

.travis.yml

@@ -1,20 +1,37 @@
 language: java
 jdk:
   - oraclejdk8
+sudo: required
 
+services:
+  - docker
+
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install --assume-yes --option Dpkg::Options::="--force-confnew" docker-engine
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/1.8.1/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo cp docker-compose /usr/local/bin && rm docker-compose
 install: true
 
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
+  - docker --version
+  - docker-compose --version
+  - docker-compose up -d
 script:
-  - mvn clean
-  - mvn verify -P code-quality,documentation,release
+  - >
+    mvn clean verify
+    -P code-quality,documentation,release
+    -DtestProfile=remote
+    -Dremote.browser.name=firefox
+    -Dremote.firefox.marionette=false
+    -DtestPageServerHost=172.17.0.1
+  - >
+    mvn clean verify
+    -P code-quality,documentation,release
+    -DtestProfile=remote
+    -Dremote.browser.name=chrome
+    -DtestPageServerHost=172.17.0.1
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-  
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer

docker-compose.yml

@@ -0,0 +1,12 @@
+hub:
+  image: selenium/hub:3.0.1-aluminum
+  ports:
+    - "4444:4444"
+firefox:
+  image: selenium/node-firefox:2.53.1-beryllium
+  links:
+    - hub
+chrome:
+  image: selenium/node-chrome:3.0.1-aluminum
+  links:
+    - hub

webtester-core/src/test/java/integration/BaseIntegrationTest.java

@@ -25,13 +25,10 @@
 public class BaseIntegrationTest {
 
     private static final String TEST_PAGE_SERVER_HOST = System.getProperty("testPageServerHost", "localhost");
-
     private static final int TEST_PAGE_SERVER_PORT = Integer.parseInt(System.getProperty("testPageServerPort", "8080"));
-
     private static final String TEST_PAGE_SERVER_BASE_ADDRESS = String.format("http://%s:%d/", TEST_PAGE_SERVER_HOST, TEST_PAGE_SERVER_PORT);
 
     private static Server server;
-
     private static Browser browser;
 
     @BeforeClass

webtester-core/src/test/java/utils/TestBrowserFactory.java

@@ -1,27 +1,48 @@
 package utils;
 
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import info.novatec.testit.webtester.browser.Browser;
-import info.novatec.testit.webtester.browser.WebDriverBrowser;
+import info.novatec.testit.webtester.browser.BrowserFactory;
 import info.novatec.testit.webtester.browser.factories.FirefoxFactory;
-import info.novatec.testit.webtester.config.Configuration;
-import info.novatec.testit.webtester.config.adapters.DefaultFileConfigurationAdapter;
-import info.novatec.testit.webtester.config.adapters.LocalFileConfigurationAdapter;
-import info.novatec.testit.webtester.config.builders.BaseConfigurationBuilder;
+import info.novatec.testit.webtester.browser.factories.RemoteFactory;
+import info.novatec.testit.webtester.browser.proxy.ProxyConfiguration;
 
 
-public class TestBrowserFactory extends FirefoxFactory {
+public class TestBrowserFactory implements BrowserFactory {
 
     @Override
-    public Browser createBrowser(WebDriver webDriver) {
-        Configuration config = new BaseConfigurationBuilder()
-            .withAdapter(new DefaultFileConfigurationAdapter())
-            .withAdapter(new LocalFileConfigurationAdapter())
-            .build();
-        Browser browser = WebDriverBrowser.forWebDriver(webDriver).withConfiguration(config).build();
+    public Browser createBrowser() {
+        Browser browser = createBrowserFromProfile();
         Runtime.getRuntime().addShutdownHook(new Thread(browser::close));
         return browser;
     }
 
+    private Browser createBrowserFromProfile() {
+        switch (System.getProperty("testProfile", "local")){
+            case "local":
+                return new FirefoxFactory().createBrowser();
+            case "remote":
+                return new RemoteFactory().createBrowser();
+            default:
+                throw new IllegalArgumentException("unknown test profile: " + System.getProperty("testProfile", "local"));
+        }
+    }
+
+    @Override
+    public Browser createBrowser(DesiredCapabilities capabilities) {
+        throw new UnsupportedOperationException("createBrowser(DesiredCapabilities capabilities) not supported in test browser!");
+    }
+
+    @Override
+    public Browser createBrowser(WebDriver webDriver) {
+        throw new UnsupportedOperationException("createBrowser(WebDriver webDriver) not supported in test browser!");
+    }
+
+    @Override
+    public BrowserFactory withProxyConfiguration(ProxyConfiguration configuration) {
+        throw new UnsupportedOperationException("proxy not supported in test browser!");
+    }
+
 }

webtester-support-junit5/src/test/resources/logback.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5le ${PID:- } [%t] --- %lo : %m%n%ex"/>
+
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+	    <encoder>
+	      <pattern>${LOG_PATTERN}</pattern>
+	    </encoder>
+  	</appender>
+
+	<root level="ERROR">
+		<appender-ref ref="CONSOLE" />
+	</root>
+
+</configuration>