diff options
Diffstat (limited to 'qadevOOo/tests/java/ifc')
3 files changed, 14 insertions, 21 deletions
diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java index 8b5bb5c0b4c8..3f08e3e6a9a8 100644 --- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java @@ -237,9 +237,8 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { try { PropertyState state = pState.getPropertyState(pName); - if (state.equals(PropertyState.DIRECT_VALUE)) { - if (isUsable(pName)) direct.add(pName); - } + if (state.equals(PropertyState.DIRECT_VALUE) && isUsable(pName)) + direct.add(pName); } catch (com.sun.star.beans.UnknownPropertyException e) { log.println("Property '" + pName + "'"); } diff --git a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java index afc10f138b85..ebd7226c0415 100644 --- a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java @@ -326,12 +326,10 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { log.println("nextElement()-object and expected object 'selections["+i+"]' are equal: "+compRes); - if (!compRes) { - if ((selections[i]) instanceof Object[]){ - if (((Object[])selections[i])[0] instanceof Integer) { - log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue()); - log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue()); - } + if (!compRes && (selections[i]) instanceof Object[]) { + if (((Object[])selections[i])[0] instanceof Integer) { + log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue()); + log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue()); } } bOK &= compRes; @@ -399,12 +397,10 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { log.println("nextElement()-object and expected object 'selections["+i+"]' are equal: "+compRes); - if (!compRes) { - if ((selections[i]) instanceof Object[]){ - if (((Object[])selections[i])[0] instanceof Integer) { - log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue()); - log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue()); - } + if (!compRes && (selections[i]) instanceof Object[]){ + if (((Object[])selections[i])[0] instanceof Integer) { + log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue()); + log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue()); } } bOK &= compRes; diff --git a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java index d601f1f2251b..c0059c718758 100644 --- a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java @@ -128,12 +128,10 @@ public class _XSelectionSupplier extends MultiMethodTest { compRes = util.ValueComparer.equalValue(selections[i], curSelection); } log.println("selected object and current selection are equal: "+compRes); - if (!compRes) { - if ((selections[i]) instanceof Object[]){ - if (((Object[])selections[i])[0] instanceof Integer) { - log.println("Getting: "+((Integer) ((Object[])curSelection)[0]).intValue()); - log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue()); - } + if (!compRes && (selections[i]) instanceof Object[]){ + if (((Object[])selections[i])[0] instanceof Integer) { + log.println("Getting: "+((Integer) ((Object[])curSelection)[0]).intValue()); + log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue()); } } res &= compRes; |