diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-03-02 11:22:49 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-02 11:38:29 +0100 |
| commit | c5a9e69472aa9262f92029c9da7671563314792f (patch) | |
| tree | c767686cbfce4345c2259f8202d57c3bfcde9fe4 | |
| parent | tdf#116070: Use a valid PaM when confirming the dialog. (diff) | |
| download | core-c5a9e69472aa9262f92029c9da7671563314792f.tar.gz core-c5a9e69472aa9262f92029c9da7671563314792f.zip | |
Fix the desktop LOK tests.
Change-Id: Id90308cbd9beae3c09874545e0fb74d3d005cbdf
Reviewed-on: https://gerrit.libreoffice.org/50619
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 55f85ea5efea..7c5c0c18ab38 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -811,6 +811,8 @@ void DesktopLOKTest::testWriterComments() pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, com::sun::star::awt::Key::ESCAPE); Scheduler::ProcessEventsToIdle(); + xToolkit->reschedule(); + // Test that the typed characters ended up in the right window. auto xTextField = xTextPortion->getPropertyValue("TextField").get< uno::Reference<beans::XPropertySet> >(); // This was empty, typed characters ended up in the body text. @@ -1659,6 +1661,9 @@ void DesktopLOKTest::testRedlineWriter() pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 't', 0); Scheduler::ProcessEventsToIdle(); + uno::Reference<awt::XReschedule> xToolkit(com::sun::star::awt::Toolkit::create(comphelper::getProcessComponentContext()), uno::UNO_QUERY); + xToolkit->reschedule(); + // Get redline info. boost::property_tree::ptree aTree; char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, ".uno:AcceptTrackedChanges"); @@ -2217,10 +2222,11 @@ void DesktopLOKTest::testABI() CPPUNIT_ASSERT_EQUAL(documentClassOffset(38), offsetof(struct _LibreOfficeKitDocumentClass, postWindowMouseEvent)); CPPUNIT_ASSERT_EQUAL(documentClassOffset(39), offsetof(struct _LibreOfficeKitDocumentClass, setViewLanguage)); CPPUNIT_ASSERT_EQUAL(documentClassOffset(40), offsetof(struct _LibreOfficeKitDocumentClass, postExtTextInputEvent)); + CPPUNIT_ASSERT_EQUAL(documentClassOffset(41), offsetof(struct _LibreOfficeKitDocumentClass, getPartInfo)); // Extending is fine, update this, and add new assert for the offsetof the // new method - CPPUNIT_ASSERT_EQUAL(documentClassOffset(41), sizeof(struct _LibreOfficeKitDocumentClass)); + CPPUNIT_ASSERT_EQUAL(documentClassOffset(42), sizeof(struct _LibreOfficeKitDocumentClass)); } CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest); |