aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-04-28 14:29:02 +0300
committerVaadin Code Review <review@vaadin.com>2015-04-29 07:57:32 +0000
commitacac097635d8b4242f647910e880c4aca99c39bd (patch)
treee049420f5bb126a168a79ea59ebfa5955c0ad54f
parenta8553904cfdfac28ca301f193e728a41af2ce42c (diff)
downloadvaadin-framework-acac097635d8b4242f647910e880c4aca99c39bd.tar.gz
vaadin-framework-acac097635d8b4242f647910e880c4aca99c39bd.zip
Fix PrivateTB3Configuartion to use correct BrowserFactory
This patch also removes an unused private function. Change-Id: I7734739b3ef895956ff8119c99eca27867263a5e
-rw-r--r--uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java19
1 files changed, 4 insertions, 15 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index dce725b7c0..61b7ef4dde 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -93,16 +93,15 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
}
private static DesiredCapabilities getRunLocallyCapabilities() {
- Browser localBrowser;
+ VaadinBrowserFactory factory = new VaadinBrowserFactory();
try {
- localBrowser = Browser.valueOf(properties.getProperty(
- RUN_LOCALLY_PROPERTY).toUpperCase());
+ return factory.create(Browser.valueOf(properties.getProperty(
+ RUN_LOCALLY_PROPERTY).toUpperCase()));
} catch (Exception e) {
System.err.println(e.getMessage());
System.err.println("Falling back to FireFox");
- localBrowser = Browser.FIREFOX;
}
- return localBrowser.getDesiredCapabilities();
+ return factory.create(Browser.FIREFOX);
}
protected static String getProperty(String name) {
@@ -114,16 +113,6 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
return property;
}
- private static String getSource(String propertyName) {
- if (properties.containsKey(propertyName)) {
- return propertiesFile.getAbsolutePath();
- } else if (System.getProperty(propertyName) != null) {
- return "System.getProperty()";
- } else {
- return null;
- }
- }
-
@Override
protected String getScreenshotDirectory() {
String screenshotDirectory = getProperty(SCREENSHOT_DIRECTORY);