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

Stephan Bergmann sbergman at redhat.com
Thu Oct 26 16:26:36 UTC 2017


 postprocess/qa/services.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 25313923b08018bd837cfe3fc99a5e141602cafc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 26 18:21:47 2017 +0200

    Fix CppunitTest_services for constructor-based implementations...
    
    (i.e., using constructor="..." in the .component file) that implement multiple
    services, but are not implemented as single-instance objects (i.e., always
    return different objects from that constructor function).  In that case, the
    "factory" would be the object itself, and would thus be different for different
    instantiations of that implementation.  erAck ran into such a case with new code
    he's writing.
    
    Change-Id: Ib134a4c6d1400b43a7df3cf6a115f8206fb80c93

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 0ab677339d9d..78dee9ed3ad1 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -209,13 +209,6 @@ void Test::test() {
                     k = impls.insert(
                             std::make_pair(name, Implementation(j, servs)))
                         .first;
-                } else {
-                    CPPUNIT_ASSERT_MESSAGE(
-                        (OString(
-                            "multiple implementations named \"" + msg(name)
-                            + "\"")
-                         .getStr()),
-                        bool(j == k->second.factory));
                 }
                 CPPUNIT_ASSERT_MESSAGE(
                     (OString(


More information about the Libreoffice-commits mailing list