diff options
Diffstat (limited to 'qadevOOo/tests/java/ifc/frame')
8 files changed, 21 insertions, 23 deletions
diff --git a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java index fdcb31fd0940..afda3657a1a8 100644 --- a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java @@ -45,7 +45,7 @@ public class _XComponentLoader extends MultiMethodTest { * and no exceptions were thrown. <p> * @see XComponent */ - public void _loadComponentFromURL() { + public void _loadComponentFromURL() throws Exception { boolean result = true; log.println("testing loadComponentFromURL() ... "); @@ -65,7 +65,7 @@ public class _XComponentLoader extends MultiMethodTest { oDoc = oObj.loadComponentFromURL( url, frameName, 0, szArgs); - util.utils.shortWait(); + waitForEventIdle(); oDoc.dispose(); @@ -74,7 +74,7 @@ public class _XComponentLoader extends MultiMethodTest { oDoc = oObj.loadComponentFromURL( url, frameName, 0, szArgs); - util.utils.shortWait(); + waitForEventIdle(); oDoc.dispose(); diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java index 59dfe64c3101..2fd127036f7b 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java @@ -130,7 +130,7 @@ public class _XDispatch extends MultiMethodTest { notificationListener = new TestNotificationListener(log) ; xND.dispatchWithNotification(url, arguments, notificationListener); - util.utils.pause(200); + waitForEventIdle(); log.println(" Listener called: "+ notificationListener.finishedDispatch); @@ -171,7 +171,7 @@ public class _XDispatch extends MultiMethodTest { oObj.dispatch(url, new PropertyValue[0]) ; - util.utils.pause(200); + waitForEventIdle(); log.println("Listener called: "+ listener.statusChangedCalled); @@ -213,7 +213,7 @@ public class _XDispatch extends MultiMethodTest { oObj.dispatch(url, new PropertyValue[0]) ; - util.utils.pause(200); + waitForEventIdle(); System.out.println("Listener called: "+ listener.statusChangedCalled); diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java index f9b9bbe65ae2..8a684edd901d 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java @@ -67,7 +67,7 @@ public class _XDispatchRecorder extends MultiMethodTest { tRes.tested("startRecording()", true); } - public void _getRecordedMacro() { + public void _getRecordedMacro() throws Exception { clearBuffer(); @@ -86,7 +86,7 @@ public class _XDispatchRecorder extends MultiMethodTest { XDispatch xDisp = xDispProv.queryDispatch(dispURL, "", 0); xDisp.dispatch(dispURL, dispArgs); - util.utils.shortWait(); + waitForEventIdle(); log.println("Getting macro ... :"); String macro = oObj.getRecordedMacro(); diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java index 938c298296e5..fd6858c8dd78 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java @@ -157,7 +157,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { * * Has <b>OK</b> status if all cases are OK. */ - public void _dispatchAndRecord() { + public void _dispatchAndRecord() throws Exception { requiredMethod("getDispatchRecorder()"); boolean res = true; @@ -173,7 +173,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { } } - util.utils.shortWait(); + waitForEventIdle(); XModel model = UnoRuntime.queryInterface(XModel.class, xTextDoc); XFrame fr = model.getCurrentController().getFrame(); diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java b/qadevOOo/tests/java/ifc/frame/_XFrame.java index c24c4fa2145e..6d462eb983bf 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrame.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java @@ -172,10 +172,10 @@ public class _XFrame extends MultiMethodTest { /** * Test calls the method. Then frame status (activated/deactivated) is * changed, and the listener is checked.<p> - * Has <b> OK </b> status if isDesktop() method returnes true, or if the + * Has <b> OK </b> status if isDesktop() method returns true, or if the * listener was called and frame was activated. */ - public void _addFrameActionListener() { + public void _addFrameActionListener() throws Exception { boolean result = true ; oObj.addFrameActionListener(listener) ; @@ -189,8 +189,7 @@ public class _XFrame extends MultiMethodTest { return; } - util.utils.shortWait(); - + waitForEventIdle(); if (!listenerCalled[0]) { log.println("listener was not called.") ; @@ -399,7 +398,7 @@ public class _XFrame extends MultiMethodTest { /** * At first new listener is added, then test calls the method and result * is checked. <p> - * Has <b> OK </b> status if isDesktop() method returnes true or if the + * Has <b> OK </b> status if isDesktop() method returns true or if the * listener was called and proper event past to listener. */ public void _contextChanged() { diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java index 0fb7b9acd225..ec7a366412bb 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java @@ -126,7 +126,7 @@ public class _XFrameLoader extends MultiMethodTest { /** * First <code>cancel</code> method test is called. - * If in that test loaing process was interrupted by + * If in that test loading process was interrupted by * <code>cancel</code> call then <code>load</code> test * executes. It loads a component, waits some moment to * listener have a chance to be called and then checks @@ -140,13 +140,13 @@ public class _XFrameLoader extends MultiMethodTest { * <li> <code> cancel() </code> </li> * </ul> */ - public void _load() { + public void _load() throws Exception { executeMethod("cancel()") ; if (!loaded) { oObj.load(frame, url, args, listener) ; - util.utils.shortWait(); + waitForEventIdle(); loaded = listener.finished ; } @@ -160,13 +160,13 @@ public class _XFrameLoader extends MultiMethodTest { * Has <b>OK</b> status if the process was cancelled or * finished (appropriate listener methods were called). */ - public void _cancel() { + public void _cancel() throws Exception { boolean result = true ; oObj.load(frame, url, args, listener) ; oObj.cancel() ; - util.utils.shortWait(); + waitForEventIdle(); if (listener.cancelled) { log.println("Loading was canceled.") ; diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java index eaf3b554dd55..c5e84d53c0e7 100644 --- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java @@ -106,7 +106,7 @@ public class _XNotifyingDispatch extends MultiMethodTest { oObj.dispatchWithNotification(url, arguments, notificationListener); - util.utils.pause(200); + waitForEventIdle(); log.println("Listener called: "+ notificationListener.finishedDispatch); diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java index 6b3ed19d0265..a2776ce3aaaa 100644 --- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java @@ -151,8 +151,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { oObj.cancel() ; - util.utils.pause(1000); - + waitForEventIdle(); tRes.tested("cancel()", !result[0]) ; } |