[Libreoffice-commits] core.git: framework/qa

Caolán McNamara caolanm at redhat.com
Wed Apr 12 16:05:10 UTC 2017


 framework/qa/cppunit/dispatchtest.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2af27abaf0531cdd72a5d3b298b7eff5d8bffc5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 12 16:59:49 2017 +0100

    update test to pass now that .ui files are found
    
    with 506cab1a01b0481d0831a7a692a26dc5a5b55e91
    
    "take the .ui files from $BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR"
    
    in place .ui files are found and the count here changes,
    
    reverting the above makes it pass, but also reverting
    08cf2fd01064306eef7fdbb5b62320947c4d1089 (framework: last dispatchInterceptor
    gets asked first, 2016-05-20) that this test wants to test also passes
    
    Change-Id: I01f5b77065e9562619412824bf69494b7b672b68

diff --git a/framework/qa/cppunit/dispatchtest.cxx b/framework/qa/cppunit/dispatchtest.cxx
index 3dd995510d50..554581debe55 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -191,7 +191,7 @@ void DispatchTest::testInterception()
     CPPUNIT_ASSERT_EQUAL(1, pInterceptor->getExpected());
     CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getUnexpected());
     dispatchCommand(mxComponent, ".uno:Italic", {});
-    CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getExpected());
+    CPPUNIT_ASSERT_EQUAL(1, pInterceptor->getExpected());
     // This was 1: MyInterceptor::queryDispatch() was called for .uno:Italic.
     CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getUnexpected());
 }


More information about the Libreoffice-commits mailing list