diff options
Diffstat (limited to 'qadevOOo/tests/java/ifc/drawing')
13 files changed, 25 insertions, 0 deletions
diff --git a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java index ca8b166c5bbe..1bee620985f3 100644 --- a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _AreaShapeDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); @@ -29,6 +30,7 @@ public class _AreaShapeDescriptor extends MultiPropertyTest { } protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) @@ -38,6 +40,7 @@ public class _AreaShapeDescriptor extends MultiPropertyTest { } ; protected PropertyTester StringTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(str1)) diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java index 750c307e09b3..d338126d7f79 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java @@ -35,6 +35,7 @@ import com.sun.star.drawing.XShape; public class _ConnectorShape extends MultiPropertyTest { public XShape[] conShapes = null; + @Override protected void before() { conShapes = (XShape[]) tEnv.getObjRelation("XConnectorShape.Shapes"); } diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java index bbb0f69949a9..99f974b494a6 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _ConnectorShapeDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java index 86d546cdcf0e..d9f7f3c31361 100644 --- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java +++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java @@ -45,6 +45,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { XDrawPage drawPage = null; static String test_name = "For DrawingDocumentDrawView"; + @Override protected void before() { drawPage = (XDrawPage)tEnv.getObjRelation("DrawPage"); XNamed xNamed = UnoRuntime.queryInterface(XNamed.class, drawPage); @@ -56,10 +57,12 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { * and compares draw pages. */ protected PropertyTester CurPageTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return drawPage; } + @Override protected boolean compare(Object obj1, Object obj2) { XNamed named1 = UnoRuntime.queryInterface(XNamed.class, obj1); XNamed named2 = UnoRuntime.queryInterface(XNamed.class, obj2); @@ -76,6 +79,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { return res; } + @Override protected String toString(Object obj) { XNamed named = UnoRuntime.queryInterface(XNamed.class, obj); String res = (named == null) ? "null" : named.getName(); diff --git a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java index 93d2e9bf5e88..50f7a76406f5 100644 --- a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java @@ -63,6 +63,7 @@ public class _FillProperties extends MultiPropertyTest { */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) { @@ -77,6 +78,7 @@ public class _FillProperties extends MultiPropertyTest { */ protected PropertyTester StringTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(str1)) { @@ -91,6 +93,7 @@ public class _FillProperties extends MultiPropertyTest { */ protected PropertyTester BitmapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (util.ValueComparer.equalValue(oldValue, the_bitmap)) { diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java index 124a534fa172..3d49bcb05f11 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java @@ -59,6 +59,7 @@ public class _GraphicObjectShape extends MultiPropertyTest { * Property tester which changes URL. */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) return util.utils.getFullTestURL("crazy-blue.jpg"); else @@ -71,6 +72,7 @@ public class _GraphicObjectShape extends MultiPropertyTest { * It also uses two object relations with bitmaps. */ protected PropertyTester BitmapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue){ XBitmap aBitmap1=(XBitmap) tEnv.getObjRelation("Bitmap1"); XBitmap aBitmap2=(XBitmap) tEnv.getObjRelation("Bitmap2"); @@ -85,6 +87,7 @@ public class _GraphicObjectShape extends MultiPropertyTest { * Property tester which returns new <code>XIndexAccess</code> object. */ protected PropertyTester ImapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return set; } diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java index f604a801ef6a..830a065d4eec 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java @@ -24,6 +24,7 @@ import com.sun.star.awt.XBitmap; public class _GraphicObjectShapeDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); @@ -31,6 +32,7 @@ public class _GraphicObjectShapeDescriptor extends MultiPropertyTest { } protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) @@ -40,6 +42,7 @@ public class _GraphicObjectShapeDescriptor extends MultiPropertyTest { } ; protected PropertyTester BitmapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { XBitmap aBitmap1=(XBitmap) tEnv.getObjRelation("Bitmap1"); diff --git a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java index 6944b103b0d5..d37d6506ddcd 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java @@ -49,6 +49,7 @@ public class _LineProperties extends MultiPropertyTest { * only predefined String values. */ protected PropertyTester LineTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals("Arrow")) diff --git a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java index 791b0b4670fd..863f4246ae20 100644 --- a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java @@ -37,6 +37,7 @@ public class _RotationDescriptor extends MultiPropertyTest { * Custom tester which increases value by 200 */ protected PropertyTester drawMeasureTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { int val = ((Integer)oldValue).intValue() ; return new Integer(val + 200) ; diff --git a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java index c973977a42ab..ec95fea71632 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _ShadowDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); diff --git a/qadevOOo/tests/java/ifc/drawing/_Shape.java b/qadevOOo/tests/java/ifc/drawing/_Shape.java index ca8380976028..8150098386aa 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Shape.java +++ b/qadevOOo/tests/java/ifc/drawing/_Shape.java @@ -54,6 +54,7 @@ public class _Shape extends MultiPropertyTest { * Custom tester which switches between two styles. */ protected PropertyTester StyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (util.ValueComparer.equalValue(oldValue,style1)) @@ -67,6 +68,7 @@ public class _Shape extends MultiPropertyTest { * Strings ('layout' and 'controls'). */ protected PropertyTester StringTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (util.ValueComparer.equalValue(oldValue,"layout")) diff --git a/qadevOOo/tests/java/ifc/drawing/_Text.java b/qadevOOo/tests/java/ifc/drawing/_Text.java index 104643619e72..9ffffab6ee3f 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Text.java +++ b/qadevOOo/tests/java/ifc/drawing/_Text.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _Text extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); diff --git a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java index 814a3be49f71..ef9395f33c89 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java @@ -60,6 +60,7 @@ public class _XConnectorShape extends MultiMethodTest { * @throw StatusException If the relation is not found or shapes don't * support <code>XConnectableShape</code> interface. */ + @Override public void before() { log.println("No shapes implementing XConnectableShape still found."); XShape[] shapes = (XShape[]) |