diff options
author | Jan Holesovsky <kendy@collabora.com> | 2017-01-27 19:19:43 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2017-01-31 17:45:29 +0100 |
commit | be71e2b860e8ec5debc60bdcbda3e3fa5f8cd528 (patch) | |
tree | 2dc4716c1cb6be6dcba464b507f3fefa9af0ece7 /desktop/qa | |
parent | fedbbc5e3f22baab26adf3e5f921f8cebe7a4bf9 (diff) |
Revert "Lok: support for batch API calls"
This was for the moment removed from the online.git, so let's disable the API
bits too before it shows this is really necessary. Reverts also:
Revert "Lok: unittest batch API"
Change-Id: I7bf3fe62d1e73b6f233992d51f587868a78f4bec
Diffstat (limited to 'desktop/qa')
-rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index a1a769b31da6..4312089e0eb8 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -96,7 +96,6 @@ public: void testContextMenuImpress(); void testNotificationCompression(); void testTileInvalidationCompression(); - void testBatching(); void testPartInInvalidation(); void testRedlineWriter(); void testTrackChanges(); @@ -133,7 +132,6 @@ public: CPPUNIT_TEST(testContextMenuImpress); CPPUNIT_TEST(testNotificationCompression); CPPUNIT_TEST(testTileInvalidationCompression); - CPPUNIT_TEST(testBatching); CPPUNIT_TEST(testPartInInvalidation); CPPUNIT_TEST(testRedlineWriter); CPPUNIT_TEST(testTrackChanges); @@ -1588,49 +1586,6 @@ void DesktopLOKTest::testPartInInvalidation() } } -void DesktopLOKTest::testBatching() -{ - LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); - - comphelper::LibreOfficeKit::setPartInInvalidation(true); - comphelper::ScopeGuard aGuard([]() - { - comphelper::LibreOfficeKit::setPartInInvalidation(false); - }); - - std::vector<std::tuple<int, std::string>> notifs; - std::unique_ptr<CallbackFlushHandler> handler(new CallbackFlushHandler(pDocument, callbackCompressionTest, ¬ifs)); - - // Enable Batch mode. - handler->setEventLatch(true); - - handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "0, 0, 239, 239, 0"); - handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "EMPTY, 0"); - - Scheduler::ProcessEventsToIdle(); - - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), notifs.size()); - - handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "0, 0, 239, 240, 0"); - handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "-121, -121, 300, 300, 0"); - handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "0, 0, -32767, -32767, 0"); - - Scheduler::ProcessEventsToIdle(); - - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), notifs.size()); - - // Disable Batch mode. - handler->setEventLatch(false); - - Scheduler::ProcessEventsToIdle(); - - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), notifs.size()); - - size_t i = 0; - CPPUNIT_ASSERT_EQUAL((int)LOK_CALLBACK_INVALIDATE_TILES, (int)std::get<0>(notifs[i])); - CPPUNIT_ASSERT_EQUAL(std::string("0, 0, 1000000000, 1000000000, 0"), std::get<1>(notifs[i++])); -} - void DesktopLOKTest::testRedlineWriter() { // Load a Writer document, enable change recording and press a key. |