diff options
Diffstat (limited to 'qadevOOo/runner/base/java_fat_service.java')
-rw-r--r-- | qadevOOo/runner/base/java_fat_service.java | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java index 151a31dadeb0..0c8fd17e43ec 100644 --- a/qadevOOo/runner/base/java_fat_service.java +++ b/qadevOOo/runner/base/java_fat_service.java @@ -41,7 +41,6 @@ import com.sun.star.lang.XMultiServiceFactory; import share.DescEntry; import share.DescGetter; import helper.APIDescGetter; -import base.TestBase; import share.LogWriter; import stats.Summarizer; @@ -174,7 +173,11 @@ public class java_fat_service implements TestBase { entry.SubEntries[j].entryName); if ((tEnv != null) && (ifc != null)) { res = ifc.run(entry.SubEntries[j],tEnv,param); - } else res = null; + } + else + { + res = null; + } } if (res != null) { for (int k=0;k<entry.SubEntries[j].SubEntryCount;k++) { @@ -227,34 +230,38 @@ public class java_fat_service implements TestBase { TestCase tCase = null; - try { - tCase = (TestCase) - dcl.getInstance("mod._"+entry.entryName); - } catch (java.lang.IllegalArgumentException ie) { + try + { + tCase = (TestCase) dcl.getInstance("mod._"+entry.entryName); + } + catch (java.lang.IllegalArgumentException ie) + { entry.ErrorMsg=ie.getMessage(); entry.hasErrorMsg=true; } log.println("Creating: "+tCase.getObjectName()); - LogWriter log = (LogWriter)dcl.getInstance( - (String)param.get("LogWriter")); + // LogWriter log = (LogWriter)dcl.getInstance( (String)param.get("LogWriter")); log.initialize(entry,true); entry.UserDefinedParams = param; tCase.setLogWriter((PrintWriter) log); TestEnvironment tEnv = null; - try { + try + { tCase.initializeTestCase(param); tEnv = tCase.getTestEnvironment(param); - } catch (com.sun.star.lang.DisposedException de) { + } + catch (com.sun.star.lang.DisposedException de) + { log.println("Office disposed"); } return tEnv; } - protected void shortWait(int millis) { - try { - Thread.sleep(millis); - } catch (java.lang.InterruptedException ie) {} - } +// protected void shortWait(int millis) { +// try { +// Thread.sleep(millis); +// } catch (java.lang.InterruptedException ie) {} +// } } |