eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

Merge branch 'master' into tracapi

Browse Source
This commit is contained in:
Axel Uhl committed 2014-04-11 15:02:14 +02:00
2 parents 9fdfd5578c 6c13b789c5
commit 9e2fa8b58e
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java
+2 -2
View File
@@ -256,9 +256,9 @@ public class SeleniumRunner extends ParentRunner<SeleniumJUnit4ClassRunner> {
TestClass test = getTestClass();
URL screenshotsStorage = (configuration.screenshotsEnabled() ? new URL(resolveScreenshotFolder(screenshotsFolder)) : null);
for (DriverDefinition defenition : configuration.getDriverDefinitions()) {
for (DriverDefinition definition : configuration.getDriverDefinitions()) {
SeleniumJUnit4ClassRunner child = new SeleniumJUnit4ClassRunner(test.getJavaClass(), contextRoot,
screenshotsStorage, defenition);
screenshotsStorage, definition);
this.children.add(child);
}
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/TestEnvironmentConfiguration.java
+4 -4
View File
@@ -140,9 +140,9 @@ public class TestEnvironmentConfiguration {
String contextRoot = XMLHelper.getContentTextNS(testEnvironmentNode, CONTEXT_ROOT, NAMESPACE_URI);
String screenshotsFolder = XMLHelper.getContentTextNS(testEnvironmentNode, SCREENSHOTS_FOLDER, NAMESPACE_URI);
Map<String, String> systemProperties = createSystemProperties(testEnvironmentNode);
List<DriverDefinition> driverDefenitions = createDriverDefinitions(testEnvironmentNode);
List<DriverDefinition> driverDefinitions = createDriverDefinitions(testEnvironmentNode);
return new TestEnvironmentConfiguration(contextRoot, screenshotsFolder, systemProperties, driverDefenitions);
return new TestEnvironmentConfiguration(contextRoot, screenshotsFolder, systemProperties, driverDefinitions);
}
private static synchronized Document readTestConfiguration() throws ParserConfigurationException,
@@ -229,11 +229,11 @@ public class TestEnvironmentConfiguration {
private List<DriverDefinition> definitions;
private TestEnvironmentConfiguration(String root, String screenshots, Map<String, String> properties,
List<DriverDefinition> defenitions) {
List<DriverDefinition> definitions) {
this.root = root;
this.screenshotsFolder = screenshots;
this.properties = properties;
this.definitions = defenitions;
this.definitions = definitions;
}
/**