From b807121d84eead8b247441899430d66269c9f148 Mon Sep 17 00:00:00 2001 From: plutasnyy Date: Thu, 16 Aug 2018 15:40:32 +0200 Subject: [PATCH] changed web driver helper --- .../aet/worker/drivers/WebDriverHelper.java | 12 ++++++++++++ .../configuration/ChromeWebDriverFactoryConf.java | 12 +++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/core/worker/src/main/java/com/cognifide/aet/worker/drivers/WebDriverHelper.java b/core/worker/src/main/java/com/cognifide/aet/worker/drivers/WebDriverHelper.java index 460dd0362..bf6a4ad6f 100644 --- a/core/worker/src/main/java/com/cognifide/aet/worker/drivers/WebDriverHelper.java +++ b/core/worker/src/main/java/com/cognifide/aet/worker/drivers/WebDriverHelper.java @@ -25,10 +25,22 @@ */ public final class WebDriverHelper { + public static final String NAME = "name"; + public static final String NAME_LABEL = "Name"; public static final String NAME_DESC = "Driver name that will be used by other services like Screenshot Collectors"; + public static final String PATH = "path"; + + public static final String PATH_LABEL = "Path"; + + public static final String PATH_DESC = "Custom path to driver binary"; + + public static final String SELENIUM_GRID_URL_LABEL = "Selenium grid URL"; + + public static final String DEFAULT_SELENIUM_GRID_URL = "http://localhost:4444/wd/hub"; + private WebDriverHelper() { // restrict instantiation } diff --git a/core/worker/src/main/java/com/cognifide/aet/worker/drivers/chrome/configuration/ChromeWebDriverFactoryConf.java b/core/worker/src/main/java/com/cognifide/aet/worker/drivers/chrome/configuration/ChromeWebDriverFactoryConf.java index 0c1688afc..6548587ee 100644 --- a/core/worker/src/main/java/com/cognifide/aet/worker/drivers/chrome/configuration/ChromeWebDriverFactoryConf.java +++ b/core/worker/src/main/java/com/cognifide/aet/worker/drivers/chrome/configuration/ChromeWebDriverFactoryConf.java @@ -18,18 +18,16 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; +import static com.cognifide.aet.worker.drivers.WebDriverHelper.DEFAULT_SELENIUM_GRID_URL; import static com.cognifide.aet.worker.drivers.WebDriverHelper.NAME_LABEL; import static com.cognifide.aet.worker.drivers.WebDriverHelper.NAME_DESC; +import static com.cognifide.aet.worker.drivers.WebDriverHelper.SELENIUM_GRID_URL_LABEL; @ObjectClassDefinition(name = "AET Chrome WebDriver Factory", description = "AET Chrome WebDriver Factory") public @interface ChromeWebDriverFactoryConf { String DEFAULT_BROWSER_NAME = "chrome"; - String SELENIUM_GRID_URL_LABEL = "Selenium grid URL"; - String SELENIUM_GRID_URL_DESC = "Url to selenium grid hub. When null local Chrome driver will be used. Local Chrome driver does not work on Linux"; - String DEFAULT_SELENIUM_GRID_URL = "http://localhost:4444/wd/hub"; - @AttributeDefinition( name = NAME_LABEL, description = NAME_DESC, @@ -37,8 +35,8 @@ String name(); @AttributeDefinition( - name = ChromeWebDriverFactoryConf.SELENIUM_GRID_URL_LABEL, - description = ChromeWebDriverFactoryConf.SELENIUM_GRID_URL_DESC, - defaultValue = ChromeWebDriverFactoryConf.DEFAULT_SELENIUM_GRID_URL) + name = SELENIUM_GRID_URL_LABEL, + description = SELENIUM_GRID_URL_LABEL, + defaultValue = DEFAULT_SELENIUM_GRID_URL) String seleniumGridUrl(); }