diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-22 10:26:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-13 08:42:55 +0200 |
| commit | b82cc80e8405086856a795a17e655cdcf85020fc (patch) | |
| tree | aee51f4c42a7faec269be8b62c911463aba05430 /qadevOOo | |
| parent | 7e394e7746150699b42b464970d8ad71c462996d (diff) | |
java: NO_CWS_ATTACH parameter is unused
Change-Id: I3e465987ef3dd502faecaf3c5ce151013a5bf314
Diffstat (limited to 'qadevOOo')
| -rw-r--r-- | qadevOOo/runner/helper/ClParser.java | 1 | ||||
| -rw-r--r-- | qadevOOo/runner/util/PropertyName.java | 6 | ||||
| -rw-r--r-- | qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java | 23 |
3 files changed, 9 insertions, 21 deletions
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java index 22c3e9ca8dd3..263ed2abca97 100644 --- a/qadevOOo/runner/helper/ClParser.java +++ b/qadevOOo/runner/helper/ClParser.java @@ -161,7 +161,6 @@ public class ClParser COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-debug", "DebugIsActive"); COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-log", "LoggingIsActive"); COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-dbout", "DataBaseOut"); - COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-nca", "NoCwsAttach"); } private String getParameterFor(String name) diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index 7a37125eb7ce..27e29b12f651 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -144,12 +144,6 @@ public interface PropertyName { */ String CYGWIN = "Cygwin"; /** - * parameter name: "NoCwsAttach"<p> - * If this parameter is set to "true" , a status of CWS-UnoAPI-Tests was not attached to EIS<p> - * @see complex.unoapi.CheckModuleAPI - */ - String NO_CWS_ATTACH = "NoCwsAttach"; - /** * internal only, no parameter */ String WNTMSCI = "wntmsci"; diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 7465b012ec0d..40e75d4c7434 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -530,23 +530,18 @@ public class CheckModuleAPI extends ComplexTestCase private void setUnoApiCwsStatus(boolean status) { - - if (!param.getBool(PropertyName.NO_CWS_ATTACH)) + final String version = (String) param.get(PropertyName.VERSION); + if (version.startsWith("cws_")) { - - final String version = (String) param.get(PropertyName.VERSION); - if (version.startsWith("cws_")) + try { - try - { - final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log); - cde.setUnoApiCwsStatus(status); - } - catch (ParameterNotFoundException ex) - { - log.println("ERROR: could not wirte status to EIS database: " + ex.toString()); - } + final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log); + cde.setUnoApiCwsStatus(status); + } + catch (ParameterNotFoundException ex) + { + log.println("ERROR: could not wirte status to EIS database: " + ex.toString()); } } } |