[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - comphelper/qa include/comphelper

[Tor Lillqvist (via logerrit)]

 comphelper/qa/unit/test_traceevent.cxx |    6 +++---
 include/comphelper/traceevent.hxx      |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c7729226839d85c42e3a11707949b41e51abbe96
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon May 24 14:37:46 2021 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 24 14:49:39 2021 +0200

    Fix syntax error in the "arguments" of a TraceEvent
    
    Change-Id: I68f94311d3e0527955b6ad8d5b49e4e564329e1e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116054
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/comphelper/qa/unit/test_traceevent.cxx b/comphelper/qa/unit/test_traceevent.cxx
index dc61b92cde77..8bd34595e397 100644
--- a/comphelper/qa/unit/test_traceevent.cxx
+++ b/comphelper/qa/unit/test_traceevent.cxx
@@ -151,12 +151,12 @@ void TestTraceEvent::test()
     CPPUNIT_ASSERT(aEvents[1].startsWith("{\"name\":\"async2.5\",\"ph\":\"b\",\"id\":1,"));
     CPPUNIT_ASSERT(aEvents[2].startsWith("{\"name\":\"block2\",\"ph\":\"X\","));
     CPPUNIT_ASSERT(aEvents[3].startsWith(
-        "{\"name\":\"async3\",\"ph\":\"b\",\"id\":2,\"args\":{\"foo\",\"bar\",\"tem\",\"42\"},"));
+        "{\"name\":\"async3\",\"ph\":\"b\",\"id\":2,\"args\":{\"foo\":\"bar\",\"tem\":\"42\"},"));
     CPPUNIT_ASSERT(aEvents[4].startsWith("{\"name\":\"async4in3\",\"ph\":\"b\",\"id\":2,"));
     CPPUNIT_ASSERT(aEvents[5].startsWith("{\"name\":\"block3\",\"ph\":\"X\","));
     CPPUNIT_ASSERT(aEvents[6].startsWith("{\"name\":\"async2.5\",\"ph\":\"e\",\"id\":1,"));
     CPPUNIT_ASSERT(aEvents[7].startsWith(
-        "{\"name:\"instant2\",\"ph\":\"i\",\"args\":{\"foo2\",\"bar2\",\"tem2\",\"42\"},"));
+        "{\"name:\"instant2\",\"ph\":\"i\",\"args\":{\"foo2\":\"bar2\",\"tem2\":\"42\"},"));
     CPPUNIT_ASSERT(aEvents[8].startsWith("{\"name\":\"async5in4\",\"ph\":\"b\",\"id\":2,"));
     CPPUNIT_ASSERT(aEvents[9].startsWith("{\"name\":\"async6in5\",\"ph\":\"b\",\"id\":2,"));
     CPPUNIT_ASSERT(aEvents[10].startsWith("{\"name\":\"async6in5\",\"ph\":\"e\",\"id\":2,"));
@@ -166,7 +166,7 @@ void TestTraceEvent::test()
     CPPUNIT_ASSERT(aEvents[14].startsWith("{\"name\":\"async4in3\",\"ph\":\"e\",\"id\":2,"));
     CPPUNIT_ASSERT(aEvents[15].startsWith("{\"name\":\"async7in3\",\"ph\":\"e\",\"id\":2,"));
     CPPUNIT_ASSERT(aEvents[16].startsWith(
-        "{\"name\":\"async3\",\"ph\":\"e\",\"id\":2,\"args\":{\"foo\",\"bar\",\"tem\",\"42\"},"));
+        "{\"name\":\"async3\",\"ph\":\"e\",\"id\":2,\"args\":{\"foo\":\"bar\",\"tem\":\"42\"},"));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestTraceEvent);
diff --git a/include/comphelper/traceevent.hxx b/include/comphelper/traceevent.hxx
index c8fd49624f83..339e924e637d 100644
--- a/include/comphelper/traceevent.hxx
+++ b/include/comphelper/traceevent.hxx
@@ -69,7 +69,7 @@ protected:
                 sResult.append(',');
             sResult.append('"');
             sResult.append(i.first);
-            sResult.append("\",\"");
+            sResult.append("\":\"");
             sResult.append(i.second);
             sResult.append('"');
             first = false;