comphelper/qa/unit/test_traceevent.cxx | 12 ++++++------
include/comphelper/traceevent.hxx | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b20ebb0c057e7d05a74e827fc215839283bebb50
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Apr 28 12:01:06 2021 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Apr 29 10:39:25 2021 +0200
Fix syntax error in generated JSON
Change-Id: I035a86aa587302985416e65dc6063090f99b49b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114799
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/comphelper/qa/unit/test_traceevent.cxx
b/comphelper/qa/unit/test_traceevent.cxx
index e7e97b2032a5..11e1f0b3a2e8 100644
--- a/comphelper/qa/unit/test_traceevent.cxx
+++ b/comphelper/qa/unit/test_traceevent.cxx
@@ -104,16 +104,16 @@ void TestTraceEvent::test()
}
CPPUNIT_ASSERT(aEvents[0].startsWith("{\"name:\"instant
1\",\"ph\":\"i\","));
- CPPUNIT_ASSERT(aEvents[1].startsWith("{\"name\":\"async
2.5\",\"ph\":\"b\",\"id\":1\","));
+ CPPUNIT_ASSERT(aEvents[1].startsWith("{\"name\":\"async
2.5\",\"ph\":\"b\",\"id\":1,"));
CPPUNIT_ASSERT(aEvents[2].startsWith("{\"name\":\"block
2\",\"ph\":\"X\","));
- CPPUNIT_ASSERT(aEvents[3].startsWith("{\"name\":\"async
3\",\"ph\":\"b\",\"id\":2\","));
- CPPUNIT_ASSERT(aEvents[4].startsWith("{\"name\":\"async
4\",\"ph\":\"b\",\"id\":2\","));
+ CPPUNIT_ASSERT(aEvents[3].startsWith("{\"name\":\"async
3\",\"ph\":\"b\",\"id\":2,"));
+ CPPUNIT_ASSERT(aEvents[4].startsWith("{\"name\":\"async
4\",\"ph\":\"b\",\"id\":2,"));
CPPUNIT_ASSERT(aEvents[5].startsWith("{\"name\":\"block
3\",\"ph\":\"X\","));
- CPPUNIT_ASSERT(aEvents[6].startsWith("{\"name\":\"async
2.5\",\"ph\":\"e\",\"id\":1\","));
+ CPPUNIT_ASSERT(aEvents[6].startsWith("{\"name\":\"async
2.5\",\"ph\":\"e\",\"id\":1,"));
CPPUNIT_ASSERT(aEvents[7].startsWith("{\"name:\"instant
2\",\"ph\":\"i\","));
CPPUNIT_ASSERT(aEvents[8].startsWith("{\"name\":\"test().2\",\"ph\":\"X\""));
- CPPUNIT_ASSERT(aEvents[9].startsWith("{\"name\":\"async
4\",\"ph\":\"e\",\"id\":2\","));
- CPPUNIT_ASSERT(aEvents[10].startsWith("{\"name\":\"async
3\",\"ph\":\"e\",\"id\":2\","));
+ CPPUNIT_ASSERT(aEvents[9].startsWith("{\"name\":\"async
4\",\"ph\":\"e\",\"id\":2,"));
+ CPPUNIT_ASSERT(aEvents[10].startsWith("{\"name\":\"async
3\",\"ph\":\"e\",\"id\":2,"));
}
CPPUNIT_TEST_SUITE_REGISTRATION(TestTraceEvent);
diff --git a/include/comphelper/traceevent.hxx
b/include/comphelper/traceevent.hxx
index 3d3c748ec278..33eaf04c7047 100644
--- a/include/comphelper/traceevent.hxx
+++ b/include/comphelper/traceevent.hxx
@@ -104,7 +104,7 @@ class COMPHELPER_DLLPUBLIC AsyncEvent : public NamedEvent,
","
"\"id\":"
+ OUString::number(m_nId)
- + "\","
+ + ","
"\"ts\":"
+ OUString::number(nNow)
+ ","
@@ -139,7 +139,7 @@ public:
","
"\"id\":"
+ OUString::number(m_nId)
- + "\","
+ + ","
"\"ts\":"
+ OUString::number(nNow)
+ ","
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
