diff options
| -rw-r--r-- | qadevOOo/runner/graphical/EnhancedComplexTestCase.java | 2 | ||||
| -rw-r--r-- | qadevOOo/runner/helper/CwsDataExchangeImpl.java | 4 | ||||
| -rw-r--r-- | qadevOOo/runner/helper/ProcessHandler.java | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java index a39c3f287f99..de67ece367ec 100644 --- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java @@ -51,7 +51,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) { log.println("- next file is: ------------------------------"); log.println(_sEntry); - // TODO: prüfen, ob 'sEntry' ein gültiges Dokument ist? + // TODO: check if 'sEntry' is a guilty document. File aFile = new File(_aParam.getInputPath()); String sPath = _aParam.getInputPath(); // problem here, isFile() checks also if the file exists, but a not existing file is not really a directory diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java index 4341fa3f47d5..782d944e3009 100644 --- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java +++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java @@ -78,14 +78,14 @@ public class CwsDataExchangeImpl implements CwsDataExchange { final String[] outs = procHdl.getOutputText().split("\n"); - final ArrayList moduleNames = new ArrayList(); + final ArrayList<String> moduleNames = new ArrayList<String>(); boolean start = false; for (int i = 0; i < outs.length; i++) { final String line = outs[i]; if (line.startsWith("cwstouched ends here")) { start = false; } - if (start && !line.equals("")) { + if (start && line.length() > 1) { moduleNames.add(line); } if (line.startsWith("cwstouched starts here")) { diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 00da332acf5d..c1892094d093 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -338,20 +338,21 @@ public class ProcessHandler { ow = (OfficeWatcher) param.get(PropertyName.OFFICE_WATCHER); } - while (changedText && !this.isFinished()) { + while (!this.isFinished() && changedText) { count++; if (ow != null) { ow.ping(); } dbg("runCommand: waiting " + mTimeOut / 1000 + " seconds while command execution is ongoing... " + count); shortWait(mTimeOut); + //waitFor(mTimeOut); if (ow != null) { ow.ping(); } // check for changes in the output stream. If there are no changes, the process maybe hangs if (!this.isFinished()) { - if (this.getOutputText().equals(memText)) { + if (this.getOutputText().length() == memText.length()) { changedText = false; dbg("runCommand Could not detect changes in output stream!!!"); |