diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-09-20 22:16:57 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-09-22 13:09:57 +0000 |
| commit | e702fc2ec3802f07dde37cba481d0cf5d0676d7e (patch) | |
| tree | a531d41a65f307d1b5c1153f5c7b5563e42e5799 | |
| parent | d2e2140abe7cae95ab4867d9dfb269bd63d015aa (diff) | |
| download | qtivi-e702fc2ec3802f07dde37cba481d0cf5d0676d7e.tar.gz | |
Make sure QIviServiceObject returns a unique id
Task-number: AUTOSUITE-54
Change-Id: I78d272b6fbeac91d16e34a1253dd53d2550d6a6c
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rw-r--r-- | src/ivicore/qiviserviceobject.cpp | 5 | ||||
| -rw-r--r-- | src/ivicore/qiviserviceobject.h | 1 | ||||
| -rw-r--r-- | tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/ivicore/qiviserviceobject.cpp b/src/ivicore/qiviserviceobject.cpp index 697c479..bc99600 100644 --- a/src/ivicore/qiviserviceobject.cpp +++ b/src/ivicore/qiviserviceobject.cpp @@ -67,8 +67,8 @@ QT_BEGIN_NAMESPACE */ QIviServiceObject::QIviServiceObject(QObject *parent) : QObject(parent) + , m_id(QUuid::createUuid().toString()) { - } /*! @@ -95,8 +95,7 @@ QIviServiceObject::~QIviServiceObject() */ QString QIviServiceObject::id() const { - static QUuid id = QUuid::createUuid(); - return id.toString(); + return m_id; } /*! diff --git a/src/ivicore/qiviserviceobject.h b/src/ivicore/qiviserviceobject.h index a1495ce..342b340 100644 --- a/src/ivicore/qiviserviceobject.h +++ b/src/ivicore/qiviserviceobject.h @@ -62,6 +62,7 @@ public: virtual QString id() const; private: + QString m_id; }; QT_END_NAMESPACE diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp index 3f2e23e..458755d 100644 --- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp +++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp @@ -261,7 +261,7 @@ void ServiceManagerTest::pluginLoaderTest() QList<QIviServiceObject *> services = manager->findServiceByInterface("simple_plugin"); QCOMPARE(services.count(), 1); //Because we unloaded the backend and created a new instance of it we expect to get a different id for the ServiceObject as in initTestCase() - QCOMPARE(m_simplePluginID, services.at(0)->id()); + QVERIFY(m_simplePluginID != services.at(0)->id()); QVERIFY(manager->hasInterface("wrong_plugin")); |