diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-22 15:03:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-22 15:04:01 +0200 |
| commit | ab489869e23d2e4fdf5aa11c304a3ac585bbb36f (patch) | |
| tree | 3f819b10063ac90c48ed0d4feebf2c4021bd72c7 /qadevOOo | |
| parent | Use same order in this switch, too, as above (diff) | |
| download | core-ab489869e23d2e4fdf5aa11c304a3ac585bbb36f.tar.gz core-ab489869e23d2e4fdf5aa11c304a3ac585bbb36f.zip | |
These places apparently want to unbox a value boxed as an Any
...same as 8fb3808f555ad5b5c66cb894f9402647ca9ba341
Change-Id: If21d6bbf5f88b8ca5ed5387d98b2dd9c74f0e32c
Diffstat (limited to 'qadevOOo')
| -rw-r--r-- | qadevOOo/runner/lib/MultiPropertyTest.java | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index 53cbf0976e6f..c4521f38dfb4 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); } } |