[Libreoffice-commits] core.git: qadevOOo/runner

[Caolán McNamara]

 qadevOOo/runner/lib/MultiPropertyTest.java |   29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

New commits:
commit f12e8d66189651540ba60664328828ab2e8756c6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 6 20:50:06 2016 +0000

    coverity#1326576 Useless call
    
    Change-Id: I1d51b96042f229de42ed26d90ecc2a070eb5b3a6

diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index 8f34585..673fdb3 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -69,33 +69,6 @@ public class MultiPropertyTest extends MultiMethodTest
      * in MultiMethodTest code.
      */
     public XPropertySet oObj;
-    protected boolean optionalService = false;
-
-    /**
-     * Overrides super.before() to check the service is supported by the object.
-     */
-    @Override
-    protected void before()
-    {
-        XServiceInfo xInfo = UnoRuntime.queryInterface(
-                XServiceInfo.class, oObj);
-
-        optionalService = entry.isOptional;
-
-        String theService = getTestedClassName();
-        if (xInfo != null && !xInfo.supportsService(theService))
-        {
-            log.println("Service " + theService + " not available");
-            if (optionalService)
-            {
-                log.println("This is OK since it is optional");
-            }
-            else
-            {
-                Status.failed(theService + " is not supported");
-            }
-        }
-    }
 
     /**
      * Overrides MultiMethodTest.invokeTestMethod(). If the test for the
@@ -154,7 +127,7 @@ public class MultiPropertyTest extends MultiMethodTest
                 final boolean bHasProperty = info.hasPropertyByName(propName);
                 if (!bHasProperty)
                 {
-                    if (isOptional(propName) || optionalService)
+                    if (isOptional(propName) || entry.isOptional)
                     {
                         // skipping optional property test
                         log.println("Property '" + propName + "' is optional and not supported");