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

[Stephan Bergmann]

 qadevOOo/runner/lib/MultiPropertyTest.java |   43 ++---------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

New commits:
commit ab489869e23d2e4fdf5aa11c304a3ac585bbb36f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 22 15:03:18 2015 +0200

    These places apparently want to unbox a value boxed as an Any
    
    ...same as 8fb3808f555ad5b5c66cb894f9402647ca9ba341
    
    Change-Id: If21d6bbf5f88b8ca5ed5387d98b2dd9c74f0e32c

diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index 53cbf09..c4521f3 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -358,21 +358,7 @@ public class MultiPropertyTest extends MultiMethodTest
                     if (!compare(resValue, oldValue))
                     {
                         log.println("Read only property '" + propName + "' has changed");
-                        try
-                        {
-                            if (!util.utils.isVoid(oldValue) && oldValue instanceof Any)
-                            {
-                                oldValue = AnyConverter.toObject(new Type(oldValue.getClass()), oldValue);
-                            }
-                            log.println("result = " + toString(resValue));
-                        }
-                        catch (com.sun.star.lang.IllegalArgumentException iae)
-                        {
-                            log.println("NOTIFY: this property needs further investigations.");
-                            log.println("\t The type seems to be an Any with value of NULL.");
-                            log.println("\t Maybe the property should get its own test method.");
-                        }
-
+                        log.println("result = " + toString(resValue));
                         tRes.tested(propName, false);
                     }
                     else
@@ -392,20 +378,7 @@ public class MultiPropertyTest extends MultiMethodTest
                     if (!compare(resValue, newValue))
                     {
                         log.println("Value for '" + propName + "' hasn't changed as expected");
-                        try
-                        {
-                            if (!util.utils.isVoid(oldValue) && oldValue instanceof Any)
-                            {
-                                oldValue = AnyConverter.toObject(new Type(oldValue.getClass()), oldValue);
-                            }
-                            log.println("result = " + toString(resValue));
-                        }
-                        catch (com.sun.star.lang.IllegalArgumentException iae)
-                        {
-                            log.println("NOTIFY: this property needs further investigations.");
-                            log.println("\t The type seems to be an Any with value of NULL.");
-                            log.println("\t Maybe the property should get its own test method.");
-                        }
+                        log.println("result = " + toString(resValue));
                         if (!compare(resValue, oldValue))
                         {
                             log.println("But it has changed.");
@@ -419,17 +392,7 @@ public class MultiPropertyTest extends MultiMethodTest
                     else
                     {
                         log.println("Property '" + propName + "' OK");
-                        try
-                        {
-                            if (!util.utils.isVoid(oldValue) && oldValue instanceof Any)
-                            {
-                                oldValue = AnyConverter.toObject(new Type(oldValue.getClass()), oldValue);
-                            }
-                            log.println("result = " + toString(resValue));
-                        }
-                        catch (com.sun.star.lang.IllegalArgumentException iae)
-                        {
-                        }
+                        log.println("result = " + toString(resValue));
                         tRes.tested(propName, true);
                     }
                 }