diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-09-23 17:36:45 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-10-10 10:36:40 +0000 |
commit | fced5de4b44f949f7a203a68a3df1d6f3293b183 (patch) | |
tree | 96d9e7bc6426deeb6f13c019dc62d580b911459e /qadevOOo/runner | |
parent | 6d9f07d53e9f89b5286637113198e61149a5c771 (diff) |
Remove no longer relevant qadevOOo/qa
Change-Id: Ic1cee9e61d31a6ee8f248c7e976c5eca8e0d86bd
Reviewed-on: https://gerrit.libreoffice.org/29233
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r-- | qadevOOo/runner/lib/MultiMethodTest.java | 95 |
1 files changed, 45 insertions, 50 deletions
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index fd27c42dc00a..75c2a163c8a9 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -138,66 +138,61 @@ public class MultiMethodTest this.tRes = new TestResult(); Class<?> testedClass; - // Some fake code for a self test. - // For normal test we must not be a "ifc.qadevooo._SelfTest" - if (! ("ifc.qadevooo._SelfTest").equals(entry.entryName)) - { - getInterfaceName(); - System.out.print("checking: [" + entry.longName + "]"); - - // defining a name of the class corresponding to the tested interface - // or service - String testedClassName; - - testedClassName = getTestedClassName(); + getInterfaceName(); + System.out.print("checking: [" + entry.longName + "]"); - if (entry.EntryType.equals("service")) - { - testedClassName = "com.sun.star.beans.XPropertySet"; - } + // defining a name of the class corresponding to the tested interface + // or service + String testedClassName; - try - { - testedClass = Class.forName(testedClassName); - } - catch (ClassNotFoundException cnfE) - { - System.out.println(); - cnfE.printStackTrace(log); - log.println("could not find a class : " + getTestedClassName()); - return null; - } - System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]"); + testedClassName = getTestedClassName(); - Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject()); + if (entry.EntryType.equals("service")) + { + testedClassName = "com.sun.star.beans.XPropertySet"; + } - if (oObj == null) - { - if (entry.isOptional) - { - Summarizer.summarizeDown(entry, "Not supported but optional.OK"); - } - else - { - Summarizer.summarizeDown(entry, "queryInterface returned null.FAILED"); - entry.ErrorMsg = "queryInterface returned null"; - entry.hasErrorMsg = true; - } + try + { + testedClass = Class.forName(testedClassName); + } + catch (ClassNotFoundException cnfE) + { + System.out.println(); + cnfE.printStackTrace(log); + log.println("could not find a class : " + getTestedClassName()); + return null; + } + System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]"); - return null; - } + Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject()); - //setting the field oObj - try + if (oObj == null) + { + if (entry.isOptional) { - setField("oObj", oObj); + Summarizer.summarizeDown(entry, "Not supported but optional.OK"); } - catch (Exception e) + else { - e.printStackTrace(); - setSubStates(e.toString()); - return tRes; + Summarizer.summarizeDown(entry, "queryInterface returned null.FAILED"); + entry.ErrorMsg = "queryInterface returned null"; + entry.hasErrorMsg = true; } + + return null; + } + + //setting the field oObj + try + { + setField("oObj", oObj); + } + catch (Exception e) + { + e.printStackTrace(); + setSubStates(e.toString()); + return tRes; } // to perform some stuff before all method tests |