Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2014-11-24 11:24:06 -0500
committerMarkus Tiede2014-11-24 11:25:19 -0500
commit998d53fa48e5f803de15c67b233353c68ea19097 (patch)
tree1c2a2e999dc528e373f240b9699f9988ff204056
parent96d1dbe8e9650ab6d4d07c0405a6da81434a51d1 (diff)
downloadorg.eclipse.jubula.core-998d53fa48e5f803de15c67b233353c68ea19097.tar.gz
org.eclipse.jubula.core-998d53fa48e5f803de15c67b233353c68ea19097.tar.xz
org.eclipse.jubula.core-998d53fa48e5f803de15c67b233353c68ea19097.zip
Sprint task - add basic <toolkit>AUTConfigurations for swing, javafx, HTML, iOS, win, winapps - part 2: HTML
-rw-r--r--org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IAUTConfigPO.java12
-rw-r--r--org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/HtmlAutConfigComponent.java2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java2
-rw-r--r--org.eclipse.jubula.feature.api/feature.xml7
-rw-r--r--org.eclipse.jubula.feature/feature.xml7
-rw-r--r--org.eclipse.jubula.releng.client/pom.xml1
-rw-r--r--org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java20
-rw-r--r--org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSAUTConfiguration.java51
-rw-r--r--org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java28
-rw-r--r--org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF7
-rw-r--r--org.eclipse.jubula.toolkit.html.api/src/org/eclipse/jubula/toolkit/html/config/HTMLAUTConfiguration.java167
-rw-r--r--org.eclipse.jubula.toolkit.html/.checkstyle10
-rw-r--r--org.eclipse.jubula.toolkit.html/.classpath12
-rw-r--r--org.eclipse.jubula.toolkit.html/.gitignore3
-rw-r--r--org.eclipse.jubula.toolkit.html/.project52
-rw-r--r--org.eclipse.jubula.toolkit.html/.settings/org.eclipse.wst.validation.prefs6
-rw-r--r--org.eclipse.jubula.toolkit.html/META-INF/MANIFEST.MF10
-rw-r--r--org.eclipse.jubula.toolkit.html/about.html28
-rw-r--r--org.eclipse.jubula.toolkit.html/build.properties18
-rw-r--r--org.eclipse.jubula.toolkit.html/plugin.properties7
-rw-r--r--org.eclipse.jubula.toolkit.html/pom.xml14
-rw-r--r--org.eclipse.jubula.toolkit.html/src/org/eclipse/jubula/toolkit/html/Browser.java23
-rw-r--r--org.eclipse.jubula.toolkit.javafx.api/src/org/eclipse/jubula/toolkit/javafx/config/JavaFXAUTConfiguration.java4
-rw-r--r--org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java11
-rw-r--r--org.eclipse.jubula.toolkit.swing.api/src/org/eclipse/jubula/toolkit/swing/config/SwingAUTConfiguration.java4
-rw-r--r--org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java8
28 files changed, 460 insertions, 63 deletions
diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java
index 5fe82df0d..39e55031d 100644
--- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java
+++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java
@@ -15,6 +15,7 @@ import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -176,8 +177,9 @@ public class AUTAgentImpl implements AUTAgent {
throws CommunicationException {
Validate.notNull(configuration, "The configuration must not be null."); //$NON-NLS-1$
checkConnected(this);
-
- Map<String, String> autConfigMap = configuration.getLaunchInformation();
+
+ Map<String, String> autConfigMap = new HashMap<String, String>(
+ configuration.getLaunchInformation());
// add relevant information for the AUT-Agent
final Communicator communicator = m_agent.getCommunicator();
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IAUTConfigPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IAUTConfigPO.java
index 3bbc6f4dc..a594224f2 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IAUTConfigPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IAUTConfigPO.java
@@ -81,18 +81,6 @@ public interface IAUTConfigPO extends IPersistentObject, Comparable {
}
}
- /** Browser for Html-Test */
- public static enum Browser {
- /** InternetExplorer */
- InternetExplorer,
- /** Firefox */
- Firefox,
- /** Safari */
- Safari,
- /** Chrome */
- Chrome
- }
-
/**
* Gets a value of this AutConfig.
* Keys are defined in {@link IAutConfigKeys}.
diff --git a/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
index 65c43d269..761538f4b 100644
--- a/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
@@ -77,6 +77,7 @@ Require-Bundle: org.eclipse.jubula.tools;bundle-version="[3.0.0,3.1.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.2.100,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="1.3.0",
org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.toolkit.api;bundle-version="[3.0.0,3.1.0)"
+ org.eclipse.jubula.toolkit.api;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.jubula.toolkit.html;bundle-version="[3.0.0,3.1.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/HtmlAutConfigComponent.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/HtmlAutConfigComponent.java
index 50809cfcc..4bcb55d2e 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/HtmlAutConfigComponent.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/HtmlAutConfigComponent.java
@@ -16,13 +16,13 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jubula.client.core.model.IAUTConfigPO.ActivationMethod;
-import org.eclipse.jubula.client.core.model.IAUTConfigPO.Browser;
import org.eclipse.jubula.client.ui.rcp.Plugin;
import org.eclipse.jubula.client.ui.rcp.businessprocess.RemoteFileBrowserBP;
import org.eclipse.jubula.client.ui.rcp.provider.ControlDecorator;
import org.eclipse.jubula.client.ui.rcp.utils.DialogStatusParameter;
import org.eclipse.jubula.client.ui.widgets.I18nEnumCombo;
import org.eclipse.jubula.client.ui.widgets.UIComponentHelper;
+import org.eclipse.jubula.toolkit.html.Browser;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java
index ef8ee6589..2f25fc36f 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java
@@ -13,7 +13,7 @@ package org.eclipse.jubula.communication.internal.message;
import java.io.Serializable;
/**
- * This class is the parameter of the component action paramter tripel.
+ * This class is the parameter of the component action parameter triple.
*
* @author BREDEX GmbH
* @created 14.10.2004
diff --git a/org.eclipse.jubula.feature.api/feature.xml b/org.eclipse.jubula.feature.api/feature.xml
index f37835d50..7115bf20b 100644
--- a/org.eclipse.jubula.feature.api/feature.xml
+++ b/org.eclipse.jubula.feature.api/feature.xml
@@ -73,6 +73,13 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
+ id="org.eclipse.jubula.toolkit.html"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jubula.toolkit.html.api"
download-size="0"
install-size="0"
diff --git a/org.eclipse.jubula.feature/feature.xml b/org.eclipse.jubula.feature/feature.xml
index 7d694b45e..d826bb3e3 100644
--- a/org.eclipse.jubula.feature/feature.xml
+++ b/org.eclipse.jubula.feature/feature.xml
@@ -81,6 +81,13 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
+ id="org.eclipse.jubula.toolkit.html"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jubula.toolkit.html.provider"
download-size="0"
install-size="0"
diff --git a/org.eclipse.jubula.releng.client/pom.xml b/org.eclipse.jubula.releng.client/pom.xml
index 6a6a7a5b1..ec17bff5b 100644
--- a/org.eclipse.jubula.releng.client/pom.xml
+++ b/org.eclipse.jubula.releng.client/pom.xml
@@ -44,6 +44,7 @@
<module>../org.eclipse.jubula.toolkit.concrete.provider</module>
<module>../org.eclipse.jubula.toolkit.gef.api</module>
<module>../org.eclipse.jubula.toolkit.gef.provider</module>
+ <module>../org.eclipse.jubula.toolkit.html</module>
<module>../org.eclipse.jubula.toolkit.html.api</module>
<module>../org.eclipse.jubula.toolkit.html.provider</module>
<module>../org.eclipse.jubula.toolkit.ios.api</module>
diff --git a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java
index 8b9c54dc1..891abc117 100644
--- a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java
+++ b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.toolkit.base.config;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -50,11 +51,24 @@ public abstract class AbstractAUTConfiguration implements AUTConfiguration {
Validate.notEmpty(autID, "The AUT-Identifier must not be empty"); //$NON-NLS-1$
m_autID = new AutIdentifier(autID);
- getLaunchInformation().put(AutConfigConstants.AUT_ID,
- getAutID().getID());
+ add(AutConfigConstants.AUT_ID, getAutID().getID());
}
/**
+ * @param option
+ * the option to add
+ * @param value
+ * the value to set
+ */
+ protected void add(String option, String value) {
+ if (m_launchInformation.containsKey(option)) {
+ throw new IllegalStateException(
+ "Option has already been configured: " + option); //$NON-NLS-1$
+ }
+ m_launchInformation.put(option, value);
+ }
+
+ /**
* @return the name
*/
@Nullable public String getName() {
@@ -72,6 +86,6 @@ public abstract class AbstractAUTConfiguration implements AUTConfiguration {
* @return the launchInformation
*/
@NonNull public Map<String, String> getLaunchInformation() {
- return m_launchInformation;
+ return Collections.unmodifiableMap(m_launchInformation);
}
} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSAUTConfiguration.java b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSAUTConfiguration.java
new file mode 100644
index 000000000..0f160b4b1
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSAUTConfiguration.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.base.config;
+
+import org.apache.commons.lang.Validate;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
+/**
+ * @author BREDEX GmbH
+ * @noextend This class is not intended to be extended by clients.
+ */
+public abstract class AbstractOSAUTConfiguration extends
+ AbstractAUTConfiguration {
+ /** the dir */
+ @NonNull private String m_workingDir;
+
+ /**
+ * Constructor
+ *
+ * @param name
+ * the name
+ * @param autID
+ * the AUT ID
+ * @param workingDir
+ * the working directory
+ */
+ public AbstractOSAUTConfiguration(@Nullable String name,
+ @NonNull String autID, @NonNull String workingDir) {
+ super(name, autID);
+
+ Validate.notEmpty(workingDir, "The working directory must not be empty"); //$NON-NLS-1$
+ m_workingDir = workingDir;
+ }
+
+ /**
+ * @return the workingDir
+ */
+ @NonNull
+ public String getWorkingDir() {
+ return m_workingDir;
+ }
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java
index b7be4fafa..6f53022f8 100644
--- a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java
+++ b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java
@@ -24,11 +24,9 @@ import org.eclipse.jubula.tools.internal.constants.StringConstants;
* @noextend This class is not intended to be extended by clients.
*/
public abstract class AbstractOSProcessAUTConfiguration extends
- AbstractAUTConfiguration {
+ AbstractOSAUTConfiguration {
/** the command */
@NonNull private String m_command;
- /** the dir */
- @NonNull private String m_workingDir;
/** the args */
@Nullable private String[] m_args;
/** the locale */
@@ -57,29 +55,22 @@ public abstract class AbstractOSProcessAUTConfiguration extends
@NonNull String workingDir,
@Nullable String[] args,
@NonNull Locale locale) {
- super(name, autID);
+ super(name, autID, workingDir);
Validate.notEmpty(command, "The given command must not be empty"); //$NON-NLS-1$
m_command = command;
- Validate.notEmpty(workingDir, "The working directory must not be empty"); //$NON-NLS-1$
- m_workingDir = workingDir;
-
m_args = args;
Validate.notNull(locale, "The locale must not be null"); //$NON-NLS-1$
m_locale = locale;
- getLaunchInformation().put(AutConfigConstants.EXECUTABLE,
- getCommand());
- getLaunchInformation().put(AutConfigConstants.WORKING_DIR,
- getWorkingDir());
- getLaunchInformation().put(
- AutConfigConstants.AUT_ARGUMENTS,
+ add(AutConfigConstants.EXECUTABLE, getCommand());
+ add(AutConfigConstants.WORKING_DIR, getWorkingDir());
+ add(AutConfigConstants.AUT_ARGUMENTS,
StringUtils.defaultString(StringUtils.join(getArgs(),
StringConstants.SPACE)));
- getLaunchInformation().put(AutConfigConstants.AUT_LOCALE,
- getLocale().toString());
+ add(AutConfigConstants.AUT_LOCALE, getLocale().toString());
}
/**
@@ -90,13 +81,6 @@ public abstract class AbstractOSProcessAUTConfiguration extends
}
/**
- * @return the workingDir
- */
- @NonNull public String getWorkingDir() {
- return m_workingDir;
- }
-
- /**
* @return the args
*/
@Nullable public String[] getArgs() {
diff --git a/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
index b5f2a7509..f93070a5f 100644
--- a/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
@@ -10,8 +10,11 @@ Bundle-ClassPath: .
Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jubula.toolkit.api;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.jubula.client.api;bundle-version="[3.0.0,3.1.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.jubula.toolkit.concrete.api;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.jubula.toolkit.html;bundle-version="[3.0.0,3.1.0)",
org.eclipse.jubula.tools;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.jubula.toolkit.concrete.api;bundle-version="[3.0.0,3.1.0)",
org.eclipse.jubula.communication;bundle-version="[3.0.0,3.1.0)"
+Export-Package: org.eclipse.jubula.toolkit.html.config
diff --git a/org.eclipse.jubula.toolkit.html.api/src/org/eclipse/jubula/toolkit/html/config/HTMLAUTConfiguration.java b/org.eclipse.jubula.toolkit.html.api/src/org/eclipse/jubula/toolkit/html/config/HTMLAUTConfiguration.java
new file mode 100644
index 000000000..8a34fccce
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html.api/src/org/eclipse/jubula/toolkit/html/config/HTMLAUTConfiguration.java
@@ -0,0 +1,167 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.html.config;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.commons.lang.Validate;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.jubula.toolkit.base.config.AbstractOSAUTConfiguration;
+import org.eclipse.jubula.toolkit.html.Browser;
+import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.internal.constants.CommandConstants;
+import org.eclipse.jubula.tools.internal.constants.ToolkitConstants;
+
+/**
+ * @author BREDEX GmbH
+ * @noextend This class is not intended to be extended by clients.
+ */
+public class HTMLAUTConfiguration extends AbstractOSAUTConfiguration {
+ /** the URL to open */
+ private URL m_url;
+ /** the browser to use */
+ private Browser m_browser;
+ /** the browser path to use */
+ private String m_browserPath;
+ /** the AUT window mode */
+ private boolean m_singleWindow = true;
+ /** the name of the attribute used to retrieve a unique identifier */
+ private String m_idAttributeName;
+
+ /**
+ * Constructor
+ *
+ * @param name
+ * the name
+ * @param autID
+ * the AUT ID
+ * @param workingDir
+ * the working directory
+ * @param sURL
+ * the URL to open
+ * @param browser
+ * the browser type to use
+ * @param browserPath
+ * the path to the browser executable
+ * @param singleWindow
+ * whether the AUT should be opened in single window mode
+ * @param idAttributeName
+ * the name of the attribute used to retrieve a unique identifier
+ * @throws MalformedURLException
+ * If the URL string specifies an unknown protocol.
+ */
+ public HTMLAUTConfiguration(
+ @Nullable String name,
+ @NonNull String autID,
+ @NonNull String workingDir,
+ @NonNull String sURL,
+ @NonNull Browser browser,
+ @Nullable String browserPath,
+ boolean singleWindow,
+ @Nullable String idAttributeName) throws MalformedURLException {
+ super(name, autID, workingDir);
+
+ Validate.notNull(sURL, "The URL must not be null"); //$NON-NLS-1$
+ setUrl(new URL(sURL));
+
+ Validate.notNull(browser, "The Browser must not be null"); //$NON-NLS-1$
+ setBrowser(browser);
+
+ if (browserPath != null && Browser.InternetExplorer.equals(browser)) {
+ throw new IllegalArgumentException("Setting of browser path is not supported for " + browser); //$NON-NLS-1$
+ }
+
+ setBrowserPath(browserPath);
+ setSingleWindow(singleWindow);
+ setIdAttributeName(idAttributeName);
+
+ // Toolkit specific information
+ add(AutConfigConstants.AUT_URL, sURL);
+ add(AutConfigConstants.BROWSER, browser.toString());
+ add(AutConfigConstants.BROWSER_PATH, browserPath);
+ add(AutConfigConstants.SINGLE_WINDOW_MODE,
+ String.valueOf(singleWindow));
+ add(AutConfigConstants.WEB_ID_TAG, idAttributeName);
+ add(ToolkitConstants.ATTR_TOOLKITID, CommandConstants.HTML_TOOLKIT);
+ }
+
+ /**
+ * @return the URL
+ */
+ public URL getUrl() {
+ return m_url;
+ }
+
+ /**
+ * @param url the URL to set
+ */
+ private void setUrl(URL url) {
+ m_url = url;
+ }
+
+ /**
+ * @return the browser
+ */
+ public Browser getBrowser() {
+ return m_browser;
+ }
+
+ /**
+ * @param browser the browser to set
+ */
+ private void setBrowser(Browser browser) {
+ m_browser = browser;
+ }
+
+ /**
+ * @return the browserPath
+ */
+ public String getBrowserPath() {
+ return m_browserPath;
+ }
+
+ /**
+ * @param browserPath the browserPath to set
+ */
+ private void setBrowserPath(String browserPath) {
+ m_browserPath = browserPath;
+ }
+
+ /**
+ * @return the singleWindow
+ */
+ public boolean isSingleWindow() {
+ return m_singleWindow;
+ }
+
+ /**
+ * @param singleWindow the singleWindow to set
+ */
+ private void setSingleWindow(boolean singleWindow) {
+ m_singleWindow = singleWindow;
+ }
+
+ /**
+ * @return the idAttributeName
+ */
+ public String getIdAttributeName() {
+ return m_idAttributeName;
+ }
+
+ /**
+ * @param idAttributeName the idAttributeName to set
+ */
+ private void setIdAttributeName(String idAttributeName) {
+ m_idAttributeName = idAttributeName;
+ }
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.html/.checkstyle b/org.eclipse.jubula.toolkit.html/.checkstyle
new file mode 100644
index 000000000..7e922b196
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <fileset name="all" enabled="true" check-config-name="Jubula" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="FilesFromPackage" enabled="true">
+ <filter-data value="src-gen"/>
+ </filter>
+</fileset-config>
diff --git a/org.eclipse.jubula.toolkit.html/.classpath b/org.eclipse.jubula.toolkit.html/.classpath
new file mode 100644
index 000000000..e29f56c12
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen">
+ <attributes>
+ <attribute name="ignore_optional_problems" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.jubula.toolkit.html/.gitignore b/org.eclipse.jubula.toolkit.html/.gitignore
new file mode 100644
index 000000000..9d12075e6
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/.gitignore
@@ -0,0 +1,3 @@
+/bin
+/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.html/.project b/org.eclipse.jubula.toolkit.html/.project
new file mode 100644
index 000000000..838bb9859
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/.project
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.jubula.toolkit.html</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>.settings</name>
+ <type>2</type>
+ <locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.6</locationURI>
+ </link>
+ </linkedResources>
+ <filteredResources>
+ <filter>
+ <id>1409218333740</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/org.eclipse.jubula.toolkit.html/.settings/org.eclipse.wst.validation.prefs b/org.eclipse.jubula.toolkit.html/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 000000000..3c2585fb6
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,6 @@
+#Tue Apr 24 10:43:37 CEST 2007
+DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.j2ee.internal.ejb.workbench.validation.UIEjbValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.j2ee.internal.ejb.workbench.validation.UIEjbValidator;
+USER_PREFERENCE=overrideGlobalPreferencesfalse
+eclipse.preferences.version=1
diff --git a/org.eclipse.jubula.toolkit.html/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.html/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..cf1680e27
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jubula Toolkit - HTML
+Bundle-SymbolicName: org.eclipse.jubula.toolkit.html
+Bundle-Version: 3.0.0.qualifier
+Bundle-Vendor: Eclipse Jubula
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Export-Package: org.eclipse.jubula.toolkit.html
diff --git a/org.eclipse.jubula.toolkit.html/about.html b/org.eclipse.jubula.toolkit.html/about.html
new file mode 100644
index 000000000..f1be81099
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 22, 2011</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/org.eclipse.jubula.toolkit.html/build.properties b/org.eclipse.jubula.toolkit.html/build.properties
new file mode 100644
index 000000000..24e18439c
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2014 BREDEX GmbH.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+source.. = src/,\
+ src-gen/
+output.. = bin/
+jars.compile.order = .
+bin.includes = about.html,\
+ META-INF/,\
+ .
+javacSource = 1.6
+javacTarget = 1.6
+javacErrors.. = -assertIdentifier
+jre.compilation.profile = JavaSE-1.6
diff --git a/org.eclipse.jubula.toolkit.html/plugin.properties b/org.eclipse.jubula.toolkit.html/plugin.properties
new file mode 100644
index 000000000..3707665df
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/plugin.properties
@@ -0,0 +1,7 @@
+###############################################################################
+# Copyright (c) 2014 BREDEX GmbH.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
diff --git a/org.eclipse.jubula.toolkit.html/pom.xml b/org.eclipse.jubula.toolkit.html/pom.xml
new file mode 100644
index 000000000..defd3b9ef
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.jubula.releng.client</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.jubula.releng.client</relativePath>
+ </parent>
+ <artifactId>org.eclipse.jubula.toolkit.html</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/org.eclipse.jubula.toolkit.html/src/org/eclipse/jubula/toolkit/html/Browser.java b/org.eclipse.jubula.toolkit.html/src/org/eclipse/jubula/toolkit/html/Browser.java
new file mode 100644
index 000000000..29937f78a
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.html/src/org/eclipse/jubula/toolkit/html/Browser.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.html;
+
+/** @author BREDEX GmbH */
+public enum Browser {
+ /** InternetExplorer */
+ InternetExplorer,
+ /** Firefox */
+ Firefox,
+ /** Safari */
+ Safari,
+ /** Chrome */
+ Chrome
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.javafx.api/src/org/eclipse/jubula/toolkit/javafx/config/JavaFXAUTConfiguration.java b/org.eclipse.jubula.toolkit.javafx.api/src/org/eclipse/jubula/toolkit/javafx/config/JavaFXAUTConfiguration.java
index 85e54df0b..9285cf998 100644
--- a/org.eclipse.jubula.toolkit.javafx.api/src/org/eclipse/jubula/toolkit/javafx/config/JavaFXAUTConfiguration.java
+++ b/org.eclipse.jubula.toolkit.javafx.api/src/org/eclipse/jubula/toolkit/javafx/config/JavaFXAUTConfiguration.java
@@ -49,8 +49,6 @@ public class JavaFXAUTConfiguration extends AbstractOSProcessAUTConfiguration {
super(name, autID, command, workingDir, args, locale);
// Toolkit specific information
- getLaunchInformation().put(
- ToolkitConstants.ATTR_TOOLKITID,
- CommandConstants.JAVAFX_TOOLKIT);
+ add(ToolkitConstants.ATTR_TOOLKITID, CommandConstants.JAVAFX_TOOLKIT);
}
} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java b/org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java
index fcf2e76a4..7d66c5e4f 100644
--- a/org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java
+++ b/org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java
@@ -53,12 +53,9 @@ public class RCPAUTConfiguration extends SWTAUTConfiguration {
super(name, autID, command, workingDir, args, locale, keyboardLayout);
// Toolkit specific information
- getLaunchInformation().put(
- ToolkitConstants.ATTR_TOOLKITID,
- CommandConstants.RCP_TOOLKIT);
-
- getLaunchInformation().put(
- AutConfigConstants.NAME_TECHNICAL_COMPONENTS,
- Boolean.TRUE.toString());
+ add(ToolkitConstants.ATTR_TOOLKITID, CommandConstants.RCP_TOOLKIT);
+
+ add(AutConfigConstants.NAME_TECHNICAL_COMPONENTS,
+ Boolean.TRUE.toString());
}
} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.swing.api/src/org/eclipse/jubula/toolkit/swing/config/SwingAUTConfiguration.java b/org.eclipse.jubula.toolkit.swing.api/src/org/eclipse/jubula/toolkit/swing/config/SwingAUTConfiguration.java
index 0d7d93069..e038928a7 100644
--- a/org.eclipse.jubula.toolkit.swing.api/src/org/eclipse/jubula/toolkit/swing/config/SwingAUTConfiguration.java
+++ b/org.eclipse.jubula.toolkit.swing.api/src/org/eclipse/jubula/toolkit/swing/config/SwingAUTConfiguration.java
@@ -49,8 +49,6 @@ public class SwingAUTConfiguration extends AbstractOSProcessAUTConfiguration {
super(name, autID, command, workingDir, args, locale);
// Toolkit specific information
- getLaunchInformation().put(
- ToolkitConstants.ATTR_TOOLKITID,
- CommandConstants.SWING_TOOLKIT);
+ add(ToolkitConstants.ATTR_TOOLKITID, CommandConstants.SWING_TOOLKIT);
}
} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java b/org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java
index 47d51857e..463ccc92b 100644
--- a/org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java
+++ b/org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java
@@ -59,14 +59,10 @@ public abstract class SWTAUTConfiguration extends
Validate.notNull(keyboardLayout, "The keyboard layout must not be null"); //$NON-NLS-1$
m_keyboardLayout = keyboardLayout;
-
- getLaunchInformation().put(AutConfigConstants.KEYBOARD_LAYOUT,
- getKeyboardLayout().toString());
+ add(AutConfigConstants.KEYBOARD_LAYOUT, getKeyboardLayout().toString());
// Toolkit specific information
- getLaunchInformation().put(
- ToolkitConstants.ATTR_TOOLKITID,
- CommandConstants.SWT_TOOLKIT);
+ add(ToolkitConstants.ATTR_TOOLKITID, CommandConstants.SWT_TOOLKIT);
}
/**

Back to the top