diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-02-13 07:10:18 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-02-13 07:10:18 +0000 |
commit | caa3bf5c34c08e5e93a03deb3064792139f030bb (patch) | |
tree | 310615f123bf2788f736d905ec3a6d6cceade76c /dbaccess/qa | |
parent | CWS-TOOLING: integrate CWS mav44 (diff) | |
download | core-caa3bf5c34c08e5e93a03deb3064792139f030bb.tar.gz core-caa3bf5c34c08e5e93a03deb3064792139f030bb.zip |
CWS-TOOLING: integrate CWS dba31g
2009-02-06 09:31:37 +0100 fs r267443 : line ends
2009-02-06 09:31:16 +0100 fs r267442 : line ends
2009-01-26 09:21:13 +0100 msc r266904 : #i10000# reactive tests
2009-01-21 12:38:53 +0100 msc r266657 : #i98316# add bugid
2009-01-20 14:49:04 +0100 msc r266584 : i97307
2009-01-20 13:43:22 +0100 oj r266572 : #i978i97860# merge changes from dba31h
2009-01-19 12:12:27 +0100 oj r266487 : #i97307# wrong shortcuts
2009-01-12 11:45:03 +0100 fs r266139 : #i97867# ImplPaint: don't paint if there are not items (yet)
2009-01-08 20:34:46 +0100 fs r266039 : ignore output paths
2009-01-08 20:25:45 +0100 fs r266038 : spelling: unxols4 -> unxsols4
2009-01-08 20:16:10 +0100 fs r266037 : BUILD_QADEVOOO
2009-01-08 20:15:35 +0100 fs r266036 : ignore output paths
2009-01-07 22:47:01 +0100 fs r265978 : close the document after the test
2009-01-07 22:40:22 +0100 fs r265977 : tweak the test, some behavior worked in a timing-dependent fashion only
2009-01-07 13:21:48 +0100 lla r265961 : #i96526# need FileAccess instead of File due to URL incompatibity
2009-01-07 12:27:19 +0100 lla r265959 : #i96526# need FileAccess instead of File due to URL incompatibity
2009-01-06 13:30:04 +0100 fs r265917 : #158964# GetFormControl: don't accept requests for model which do not belong to the page displayed in the given view
2009-01-06 13:30:04 +0100 fs r265916 : #158964# GetUnoControl: don't accept requests for a view where a foreign page is displayed
2009-01-06 13:26:37 +0100 fs r265915 : #158964# FmXPageViewWinRec::dispose: catch exceptions (fixes the symptom, the root cause is fixed elsewhere)
2009-01-06 09:52:38 +0100 oj r265897 : #i97307# shortcuts
2009-01-06 09:41:26 +0100 fs r265896 : #i10000#
2009-01-05 13:40:38 +0100 fs r265866 : CWS-TOOLING: rebase CWS dba31g to trunk@265758 (milestone: DEV300:m38)
2008-12-18 11:35:43 +0100 fs r265678 : document the new InputRequired property
2008-12-17 07:25:18 +0100 oj r265578 : #i97307# insert new Accelerators handling in configuration
2008-12-16 09:52:27 +0100 lla r265526 : #i96526# error message is a problem with no existance default.otr occur
2008-12-16 09:33:14 +0100 oj r265525 : #i96948# remove merge conflict with StreamName
2008-12-16 09:22:12 +0100 oj r265524 : #i96935# set reportcomponent for custom shape
2008-12-15 10:32:38 +0100 oj r265463 : #i96965# do not add connection for selfreferencing table
2008-12-12 14:00:56 +0100 fs r265416 : #i97044# EnableFocusSelectionHide=FALSE => don't hide selection when not focused (this is more of a side effect), and preserve the selection when gaining the focus (this is the desired effect)
2008-12-11 15:32:32 +0100 fs r265319 : prevent a deadlock during complex.dbaccess.DatabaseDocument test
2008-12-11 15:31:25 +0100 fs r265317 : prevent a deadlock during complex.dbaccess.DatabaseDocument test
2008-12-11 13:45:06 +0100 fs r265296 : #i97137#
2008-12-11 12:43:00 +0100 fs r265285 : #i97134#
2008-12-10 13:20:28 +0100 lla r265175 : #94067# add (APP|SYS)FONT to XUnitConversion interface implementation
2008-12-10 13:08:22 +0100 lla r265173 : #i94067# add (APP|SYS)FONT
2008-12-10 09:21:39 +0100 fs r265151 : #i95010# implement a non-hacky solution for #i94033#, by making Begin/Do/EndCompleteRedraw virtual
2008-12-09 17:29:32 +0100 fs r265120 : #i96636#
Diffstat (limited to 'dbaccess/qa')
-rw-r--r-- | dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index 0d12fd33b763..82e7c8dc8a80 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -702,11 +702,12 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. impl_startObservingEvents( "prepare for '" + context + "'" ); databaseDoc = (XModel)UnoRuntime.queryInterface( XModel.class, loader.loadComponentFromURL( newURL, "_blank", 0, impl_getDefaultLoadArgs() ) ); - impl_waitForEvent( m_globalEvents, "OnLoad", 5000 ); + int previousOnLoadEventPos = impl_waitForEvent( m_globalEvents, "OnLoad", 5000 ); // ... and another document ... String otherURL = impl_copyTempFile( databaseDoc.getURL() ); XModel otherDoc = (XModel)UnoRuntime.queryInterface( XModel.class, loader.loadComponentFromURL( otherURL, "_blank", 0, impl_getDefaultLoadArgs() ) ); + impl_waitForEvent( m_globalEvents, "OnLoad", 5000, previousOnLoadEventPos + 1 ); impl_raise( otherDoc ); // ... and switch between the two @@ -715,6 +716,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. impl_stopObservingEvents( m_globalEvents, new String[] { "OnUnfocus", "OnFocus" }, context ); // cleanup + impl_startObservingEvents( "cleanup after '" + context + "'" ); impl_closeDocument( databaseDoc ); impl_closeDocument( otherDoc ); } @@ -789,7 +791,13 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. } // -------------------------------------------------------------------------------------------------------- - void impl_waitForEvent( Vector _eventQueue, String _expectedEvent, int _maxMilliseconds ) + int impl_waitForEvent( Vector _eventQueue, String _expectedEvent, int _maxMilliseconds ) + { + return impl_waitForEvent( _eventQueue, _expectedEvent, _maxMilliseconds, 0 ); + } + + // -------------------------------------------------------------------------------------------------------- + int impl_waitForEvent( Vector _eventQueue, String _expectedEvent, int _maxMilliseconds, int _firstQueueElementToCheck ) { synchronized ( _eventQueue ) { @@ -797,11 +805,11 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. while ( waitedMilliseconds < _maxMilliseconds ) { - for ( int i=0; i<_eventQueue.size(); ++i ) + for ( int i=_firstQueueElementToCheck; i<_eventQueue.size(); ++i ) { if ( _expectedEvent.equals( _eventQueue.get(i) ) ) // found the event in the queue - return; + return i; } // wait a little, perhaps the event will still arrive @@ -815,6 +823,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. } failed( "expected event '" + _expectedEvent + "' did not arrive after " + _maxMilliseconds + " milliseconds" ); + return -1; } // -------------------------------------------------------------------------------------------------------- |