diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-22 14:45:07 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-13 08:42:55 +0200 |
commit | 04e26ca21cf05989030e457e1f938b7066f677d7 (patch) | |
tree | 28a3f1d17c9c61e500b3f19376201bd1be8f4299 /qadevOOo | |
parent | c55f945e4b092a7c972e6f64260ba98784c85a77 (diff) |
java: nothing is passing a "-ini" parameter into the RunnerService
Change-Id: Ic8dffc4ed757c74ce383b3dcf204d1c899a0c4f5
Diffstat (limited to 'qadevOOo')
-rw-r--r-- | qadevOOo/runner/helper/ClParser.java | 40 | ||||
-rw-r--r-- | qadevOOo/runner/org/openoffice/Runner.java | 20 | ||||
-rw-r--r-- | qadevOOo/runner/org/openoffice/RunnerService.java | 20 |
3 files changed, 0 insertions, 80 deletions
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java index 263ed2abca97..1dd70dbb9c1b 100644 --- a/qadevOOo/runner/helper/ClParser.java +++ b/qadevOOo/runner/helper/ClParser.java @@ -103,46 +103,6 @@ public class ClParser } } - /* - * This method returns the path to a Configuration file <br> - * if defined as command line parameter, an empty String elsewhere - */ - public String getIniPath(String[] args) - { - String iniFile = ""; - - for (int i = 0; i < args.length; i++) - { - if (args[i].equals("-ini")) - { - iniFile = args[i + 1]; - break; - } - } - - return iniFile; - } - - /* - * This method returns the path to a Configuration file <br> - * if defined as command line parameter, an empty String elsewhere - */ - public String getRunnerIniPath(String[] args) - { - String iniFile = ""; - - for (int i = 0; i < args.length; i++) - { - if (args[i].equals("-runnerini")) - { - iniFile = args[i + 1]; - break; - } - } - - return iniFile; - } - /** * Map command-line Parameters to TestParameters */ diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index 42b77674fb37..c7ee6dc3b154 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -17,7 +17,6 @@ */ package org.openoffice; -import helper.CfgParser; import helper.ClParser; import java.util.Enumeration; @@ -150,25 +149,6 @@ public class Runner ClParser cli = new ClParser(); - //parse the commandline arguments if an ini-parameter is given - String iniFile = cli.getIniPath(args); - - //initialize cfgParser with ini-path - CfgParser ini = new CfgParser(iniFile); - - //parse ConfigFile - ini.getIniParameters(param); - - - //parse the commandline arguments if an runnerprops-parameter is given - String runnerIniFile = cli.getRunnerIniPath(args); - - //initialize cfgParser with ini-path - CfgParser runnerIni = new CfgParser(runnerIniFile); - - //parse ConfigFile - runnerIni.getIniParameters(param); - //parse the commandline arguments // TODO: no right error message, if no parameter given! cli.getCommandLineParameter(param, args); diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index f04133ff446d..99f3b1592e7a 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -18,7 +18,6 @@ package org.openoffice; -import helper.CfgParser; import helper.ClParser; import java.util.ArrayList; @@ -76,25 +75,6 @@ public class RunnerService implements XJob, XServiceInfo, ClParser cli = new ClParser(); - //parse the arguments if an ini-parameter is given - String iniFile = cli.getIniPath(arguments); - - //initialize cfgParser with ini-path - CfgParser ini = new CfgParser(iniFile); - - //parse ConfigFile - ini.getIniParameters(param); - - - //parse the commandline arguments if an runnerprops-parameter is given - String runnerIniFile = cli.getRunnerIniPath(arguments); - - //initialize cfgParser with ini-path - CfgParser runnerIni = new CfgParser(runnerIniFile); - - //parse ConfigFile - runnerIni.getIniParameters(param); - //parse the commandline arguments cli.getCommandLineParameter(param,arguments); |