From 81fa4c3635a029b1c8f9cc3cd670f0b04f1c3f21 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 8 Jul 2016 11:22:40 +0200 Subject: Shorten the types to be more distinctive. The org.kde prefix is useless and possibly misleading. Simply prefixing with sink is more unique and shorter. --- tests/accountstest.cpp | 6 ++-- tests/dummyresourcebenchmark.cpp | 30 +++++++++--------- tests/dummyresourcetest.cpp | 36 +++++++++++----------- tests/dummyresourcewritebenchmark.cpp | 14 ++++----- tests/genericresourcebenchmark.cpp | 16 +++++----- tests/genericresourcetest.cpp | 6 ++-- tests/indextest.cpp | 6 ++-- tests/inspectiontest.cpp | 8 ++--- tests/maildirsyncbenchmark.cpp | 12 ++++---- tests/mailquerybenchmark.cpp | 2 +- tests/messagequeuetest.cpp | 22 ++++++------- tests/modelinteractivitytest.cpp | 10 +++--- tests/pipelinebenchmark.cpp | 2 +- tests/pipelinetest.cpp | 34 ++++++++++---------- tests/querytest.cpp | 58 +++++++++++++++++------------------ 15 files changed, 131 insertions(+), 131 deletions(-) (limited to 'tests') diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp index d12e7f4..8d0f2e6 100644 --- a/tests/accountstest.cpp +++ b/tests/accountstest.cpp @@ -51,7 +51,7 @@ private slots: QString smtpUsername("smtpUsername"); QString smtpPassword("smtpPassword"); auto resource = ApplicationDomainType::createEntity(); - resource.setProperty("type", "org.kde.mailtransport"); + resource.setProperty("type", "sink.mailtransport"); resource.setProperty("account", account.identifier()); resource.setProperty("server", smtpServer); resource.setProperty("username", smtpUsername); @@ -62,7 +62,7 @@ private slots: Store::fetchAll(Query()).then>([&](const QList &resources) { QCOMPARE(resources.size(), 1); auto resource = resources.first(); - QCOMPARE(resource->getProperty("type").toString(), QString("org.kde.mailtransport")); + QCOMPARE(resource->getProperty("type").toString(), QString("sink.mailtransport")); QCOMPARE(resource->getProperty("server").toString(), smtpServer); }) .exec().waitForFinished(); @@ -110,7 +110,7 @@ private slots: //Ensure the notifier only affects one type auto resource = ApplicationDomainType::createEntity(); - resource.setResourceType("org.kde.mailtransport"); + resource.setResourceType("sink.mailtransport"); Store::create(resource).exec().waitForFinished(); QTRY_COMPARE(model->rowCount(QModelIndex()), 2); } diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp index 7e334a6..72562c3 100644 --- a/tests/dummyresourcebenchmark.cpp +++ b/tests/dummyresourcebenchmark.cpp @@ -34,9 +34,9 @@ private slots: void initTestCase() { Sink::Log::setDebugOutputLevel(Sink::Log::Warning); - auto factory = Sink::ResourceFactory::load("org.kde.dummy"); + auto factory = Sink::ResourceFactory::load("sink.dummy"); QVERIFY(factory); - ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy"); + ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy"); num = 5000; } @@ -76,17 +76,17 @@ private slots: void testCommandResponsiveness() { // Test responsiveness including starting the process. - Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished(); + Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished(); QTime time; time.start(); - Sink::ApplicationDomain::Event event("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Event event("sink.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); - auto notifier = QSharedPointer::create("org.kde.dummy.instance1", "org.kde.dummy"); + auto notifier = QSharedPointer::create("sink.dummy.instance1", "sink.dummy"); bool gotNotification = false; int duration = 0; notifier->registerHandler([&gotNotification, &duration, &time](const Sink::Notification ¬ification) { @@ -102,19 +102,19 @@ private slots: QTRY_VERIFY(gotNotification); QVERIFY2(duration < 100, QString::fromLatin1("Processing a create command took more than 100ms: %1").arg(duration).toLatin1()); - Sink::ResourceControl::shutdown("org.kde.dummy.instance1").exec().waitForFinished(); + Sink::ResourceControl::shutdown("sink.dummy.instance1").exec().waitForFinished(); qDebug() << "Single command took [ms]: " << duration; } void testWriteToFacade() { - Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished(); + Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished(); QTime time; time.start(); QList> waitCondition; for (int i = 0; i < num; i++) { - Sink::ApplicationDomain::Event event("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Event event("sink.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); @@ -126,7 +126,7 @@ private slots: // Ensure everything is processed { Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); } auto allProcessedTime = time.elapsed(); @@ -140,7 +140,7 @@ private slots: dataset.insertRow(row); HAWD::Formatter::print(dataset); - auto diskUsage = DummyResource::diskUsage("org.kde.dummy.instance1"); + auto diskUsage = DummyResource::diskUsage("sink.dummy.instance1"); qDebug() << "Database size [kb]: " << diskUsage / 1024; // Print memory layout, RSS is what is in memory @@ -155,7 +155,7 @@ private slots: { time.start(); Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.propertyFilter.insert("uid", Sink::Query::Comparator("testuid")); auto model = Sink::Store::loadModel(query); @@ -173,12 +173,12 @@ private slots: void testWriteInProcess() { - Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished(); + Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished(); QTime time; time.start(); - auto pipeline = QSharedPointer::create("org.kde.dummy.instance1"); - DummyResource resource("org.kde.dummy.instance1", pipeline); + auto pipeline = QSharedPointer::create("sink.dummy.instance1"); + DummyResource resource("sink.dummy.instance1", pipeline); flatbuffers::FlatBufferBuilder eventFbb; eventFbb.Clear(); @@ -261,7 +261,7 @@ private slots: // This allows to run individual parts without doing a cleanup, but still cleaning up normally void testCleanupForCompleteTest() { - Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished(); + Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished(); } private: diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp index 0907b1d..687a33b 100644 --- a/tests/dummyresourcetest.cpp +++ b/tests/dummyresourcetest.cpp @@ -30,10 +30,10 @@ private slots: void initTestCase() { Sink::Test::initTest(); - auto factory = Sink::ResourceFactory::load("org.kde.dummy"); + auto factory = Sink::ResourceFactory::load("sink.dummy"); QVERIFY(factory); - DummyResource::removeFromDisk("org.kde.dummy.instance1"); - ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy"); + DummyResource::removeFromDisk("sink.dummy.instance1"); + ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy"); } void init() @@ -47,7 +47,7 @@ private slots: void cleanup() { qDebug() << "Test took " << time.elapsed(); - Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished(); + Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished(); } void testProperty() @@ -59,13 +59,13 @@ private slots: void testWriteToFacadeAndQueryByUid() { - Sink::ApplicationDomain::Event event("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Event event("sink.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); Sink::Store::create(event).exec().waitForFinished(); - const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ; + const auto query = Query::ResourceFilter("sink.dummy.instance1") ; // Ensure all local data is processed Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); @@ -78,7 +78,7 @@ private slots: void testWriteToFacadeAndQueryByUid2() { - Sink::ApplicationDomain::Event event("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Event event("sink.dummy.instance1"); event.setProperty("summary", "summaryValue"); event.setProperty("uid", "testuid"); @@ -87,7 +87,7 @@ private slots: event.setProperty("uid", "testuid2"); Sink::Store::create(event).exec().waitForFinished(); - const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ; + const auto query = Query::ResourceFilter("sink.dummy.instance1") ; // Ensure all local data is processed Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); @@ -102,7 +102,7 @@ private slots: void testWriteToFacadeAndQueryBySummary() { - Sink::ApplicationDomain::Event event("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Event event("sink.dummy.instance1"); event.setProperty("uid", "testuid"); event.setProperty("summary", "summaryValue1"); @@ -112,7 +112,7 @@ private slots: event.setProperty("summary", "summaryValue2"); Sink::Store::create(event).exec().waitForFinished(); - const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ; + const auto query = Query::ResourceFilter("sink.dummy.instance1") ; // Ensure all local data is processed Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); @@ -127,8 +127,8 @@ private slots: void testResourceSync() { - auto pipeline = QSharedPointer::create("org.kde.dummy.instance1"); - DummyResource resource("org.kde.dummy.instance1", pipeline); + auto pipeline = QSharedPointer::create("sink.dummy.instance1"); + DummyResource resource("sink.dummy.instance1", pipeline); auto job = resource.synchronizeWithSource(); // TODO pass in optional timeout? auto future = job.exec(); @@ -142,7 +142,7 @@ private slots: void testSyncAndFacade() { - const auto query = Query::ResourceFilter("org.kde.dummy.instance1"); + const auto query = Query::ResourceFilter("sink.dummy.instance1"); // Ensure all local data is processed Sink::Store::synchronize(query).exec().waitForFinished(); @@ -158,7 +158,7 @@ private slots: void testSyncAndFacadeMail() { - const auto query = Query::ResourceFilter("org.kde.dummy.instance1"); + const auto query = Query::ResourceFilter("sink.dummy.instance1"); // Ensure all local data is processed Sink::Store::synchronize(query).exec().waitForFinished(); @@ -174,13 +174,13 @@ private slots: void testWriteModifyDelete() { - Sink::ApplicationDomain::Event event("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Event event("sink.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); Sink::Store::create(event).exec().waitForFinished(); - const auto query = Query::ResourceFilter("org.kde.dummy.instance1") + Query::PropertyFilter("uid", "testuid"); + const auto query = Query::ResourceFilter("sink.dummy.instance1") + Query::PropertyFilter("uid", "testuid"); // Ensure all local data is processed Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); @@ -229,14 +229,14 @@ private slots: void testWriteModifyDeleteLive() { - auto query = Query::ResourceFilter("org.kde.dummy.instance1"); + auto query = Query::ResourceFilter("sink.dummy.instance1"); query.liveQuery = true; query += Query::PropertyFilter("uid", "testuid"); auto model = Sink::Store::loadModel(query); QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool()); - Sink::ApplicationDomain::Event event("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Event event("sink.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); diff --git a/tests/dummyresourcewritebenchmark.cpp b/tests/dummyresourcewritebenchmark.cpp index b4ab438..5cd7007 100644 --- a/tests/dummyresourcewritebenchmark.cpp +++ b/tests/dummyresourcewritebenchmark.cpp @@ -103,14 +103,14 @@ class DummyResourceWriteBenchmark : public QObject void writeInProcess(int num) { - DummyResource::removeFromDisk("org.kde.dummy.instance1"); + DummyResource::removeFromDisk("sink.dummy.instance1"); QTime time; time.start(); - auto pipeline = QSharedPointer::create("org.kde.dummy.instance1"); - DummyResource resource("org.kde.dummy.instance1", pipeline); + auto pipeline = QSharedPointer::create("sink.dummy.instance1"); + DummyResource resource("sink.dummy.instance1", pipeline); int bufferSize = 0; auto command = createEntityBuffer(bufferSize); @@ -131,7 +131,7 @@ class DummyResourceWriteBenchmark : public QObject const auto finalRss = getCurrentRSS(); const auto rssGrowth = finalRss - startingRss; // Since the database is memory mapped it is attributted to the resident set size. - const auto rssWithoutDb = finalRss - DummyResource::diskUsage("org.kde.dummy.instance1"); + const auto rssWithoutDb = finalRss - DummyResource::diskUsage("sink.dummy.instance1"); const auto peakRss = getPeakRSS(); // How much peak deviates from final rss in percent const auto percentageRssError = static_cast(peakRss - finalRss) * 100.0 / static_cast(finalRss); @@ -143,7 +143,7 @@ class DummyResourceWriteBenchmark : public QObject std::cout << "Rss without db [kb]: " << rssWithoutDb / 1024 << std::endl; std::cout << "Percentage peak rss error: " << percentageRssError << std::endl; - auto onDisk = DummyResource::diskUsage("org.kde.dummy.instance1"); + auto onDisk = DummyResource::diskUsage("sink.dummy.instance1"); auto writeAmplification = static_cast(onDisk) / static_cast(bufferSizeTotal); std::cout << "On disk [kb]: " << onDisk / 1024 << std::endl; std::cout << "Buffer size total [kb]: " << bufferSizeTotal / 1024 << std::endl; @@ -216,13 +216,13 @@ private slots: void getFreePages() { - std::system(QString("mdb_stat %1/%2 -ff").arg(Sink::storageLocation()).arg("org.kde.dummy.instance1").toLatin1().constData()); + std::system(QString("mdb_stat %1/%2 -ff").arg(Sink::storageLocation()).arg("sink.dummy.instance1").toLatin1().constData()); } // This allows to run individual parts without doing a cleanup, but still cleaning up normally void testCleanupForCompleteTest() { - DummyResource::removeFromDisk("org.kde.dummy.instance1"); + DummyResource::removeFromDisk("sink.dummy.instance1"); } private: diff --git a/tests/genericresourcebenchmark.cpp b/tests/genericresourcebenchmark.cpp index a0a368c..2315d0b 100644 --- a/tests/genericresourcebenchmark.cpp +++ b/tests/genericresourcebenchmark.cpp @@ -96,9 +96,9 @@ private slots: void initTestCase() { - removeFromDisk("org.kde.test.instance1"); - removeFromDisk("org.kde.test.instance1.userqueue"); - removeFromDisk("org.kde.test.instance1.synchronizerqueue"); + removeFromDisk("sink.test.instance1"); + removeFromDisk("sink.test.instance1.userqueue"); + removeFromDisk("sink.test.instance1.synchronizerqueue"); } @@ -106,8 +106,8 @@ private slots: { int num = 10000; - auto pipeline = QSharedPointer::create("org.kde.test.instance1"); - TestResource resource("org.kde.test.instance1", pipeline); + auto pipeline = QSharedPointer::create("sink.test.instance1"); + TestResource resource("sink.test.instance1", pipeline); auto command = createEntityBuffer(); @@ -141,16 +141,16 @@ private slots: { int num = 50000; - auto pipeline = QSharedPointer::create("org.kde.test.instance1"); + auto pipeline = QSharedPointer::create("sink.test.instance1"); auto eventFactory = QSharedPointer::create(); - const QByteArray resourceIdentifier = "org.kde.test.instance1"; + const QByteArray resourceIdentifier = "sink.test.instance1"; auto indexer = QSharedPointer::create(); pipeline->setPreprocessors("event", QVector() << indexer.data()); pipeline->setAdaptorFactory("event", eventFactory); - TestResource resource("org.kde.test.instance1", pipeline); + TestResource resource("sink.test.instance1", pipeline); auto command = createEntityBuffer(); diff --git a/tests/genericresourcetest.cpp b/tests/genericresourcetest.cpp index fe2c146..77a901d 100644 --- a/tests/genericresourcetest.cpp +++ b/tests/genericresourcetest.cpp @@ -26,7 +26,7 @@ private slots: void init() { - Sink::GenericResource::removeFromDisk("org.kde.test.instance1"); + Sink::GenericResource::removeFromDisk("sink.test.instance1"); } /// Ensure the resource can process messages @@ -70,10 +70,10 @@ private slots: } // Actual test - auto pipeline = QSharedPointer::create("org.kde.test.instance1"); + auto pipeline = QSharedPointer::create("sink.test.instance1"); QSignalSpy revisionSpy(pipeline.data(), SIGNAL(revisionUpdated(qint64))); QVERIFY(revisionSpy.isValid()); - TestResource resource("org.kde.test.instance1", pipeline); + TestResource resource("sink.test.instance1", pipeline); resource.processCommand(Sink::Commands::CreateEntityCommand, command); resource.processCommand(Sink::Commands::CreateEntityCommand, command); resource.processAllMessages().exec().waitForFinished(); diff --git a/tests/indextest.cpp b/tests/indextest.cpp index fa3ace4..8566803 100644 --- a/tests/indextest.cpp +++ b/tests/indextest.cpp @@ -16,19 +16,19 @@ class IndexTest : public QObject private slots: void initTestCase() { - Sink::Storage store("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite); + Sink::Storage store("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite); store.removeFromDisk(); } void cleanup() { - Sink::Storage store("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite); + Sink::Storage store("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite); store.removeFromDisk(); } void testIndex() { - Index index("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite); + Index index("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite); // The first key is specifically a substring of the second key index.add("key", "value1"); index.add("keyFoo", "value2"); diff --git a/tests/inspectiontest.cpp b/tests/inspectiontest.cpp index 8f2c50f..3e8a103 100644 --- a/tests/inspectiontest.cpp +++ b/tests/inspectiontest.cpp @@ -19,10 +19,10 @@ class InspectionTest : public QObject private slots: void initTestCase() { - auto factory = Sink::ResourceFactory::load("org.kde.dummy"); + auto factory = Sink::ResourceFactory::load("sink.dummy"); QVERIFY(factory); - ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy"); - Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished(); + ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy"); + Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished(); } void testInspection_data() @@ -38,7 +38,7 @@ private slots: using namespace Sink; using namespace Sink::ApplicationDomain; - Mail mail(QByteArray("org.kde.dummy.instance1"), QByteArray("identifier"), 0, QSharedPointer::create()); + Mail mail(QByteArray("sink.dummy.instance1"), QByteArray("identifier"), 0, QSharedPointer::create()); // testInspection is a magic property that the dummyresource supports auto inspectionCommand = ResourceControl::Inspection::PropertyInspection(mail, "testInspection", success); diff --git a/tests/maildirsyncbenchmark.cpp b/tests/maildirsyncbenchmark.cpp index 8b1a9d7..d84c758 100644 --- a/tests/maildirsyncbenchmark.cpp +++ b/tests/maildirsyncbenchmark.cpp @@ -61,17 +61,17 @@ private slots: { targetPath = tempDir.path() + "/maildir1"; - MaildirResource::removeFromDisk("org.kde.maildir.test1"); + MaildirResource::removeFromDisk("sink.maildir.test1"); Sink::ApplicationDomain::SinkResource resource; - resource.setProperty("identifier", "org.kde.maildir.test1"); - resource.setProperty("type", "org.kde.maildir"); + resource.setProperty("identifier", "sink.maildir.test1"); + resource.setProperty("type", "sink.maildir"); resource.setProperty("path", targetPath); Sink::Store::create(resource).exec().waitForFinished(); } void cleanup() { - MaildirResource::removeFromDisk("org.kde.maildir.test1"); + MaildirResource::removeFromDisk("sink.maildir.test1"); QDir dir(targetPath); dir.removeRecursively(); } @@ -83,8 +83,8 @@ private slots: void testbench() { - auto pipeline = QSharedPointer::create("org.kde.maildir.test1"); - MaildirResource resource("org.kde.maildir.test1", pipeline); + auto pipeline = QSharedPointer::create("sink.maildir.test1"); + MaildirResource resource("sink.maildir.test1", pipeline); QTime time; time.start(); resource.Sink::GenericResource::synchronizeWithSource().exec().waitForFinished(); diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp index 4e58899..450955f 100644 --- a/tests/mailquerybenchmark.cpp +++ b/tests/mailquerybenchmark.cpp @@ -148,7 +148,7 @@ private slots: void init() { - resourceIdentifier = "org.kde.test.instance1"; + resourceIdentifier = "sink.test.instance1"; Sink::AdaptorFactoryRegistry::instance().registerFactory("test"); } diff --git a/tests/messagequeuetest.cpp b/tests/messagequeuetest.cpp index 27dd12b..e79bba2 100644 --- a/tests/messagequeuetest.cpp +++ b/tests/messagequeuetest.cpp @@ -21,7 +21,7 @@ private slots: void initTestCase() { Sink::Test::initTest(); - Sink::Storage store(Sink::Store::storageLocation(), "org.kde.dummy.testqueue", Sink::Storage::ReadWrite); + Sink::Storage store(Sink::Store::storageLocation(), "sink.dummy.testqueue", Sink::Storage::ReadWrite); store.removeFromDisk(); } @@ -31,13 +31,13 @@ private slots: void cleanup() { - Sink::Storage store(Sink::Store::storageLocation(), "org.kde.dummy.testqueue", Sink::Storage::ReadWrite); + Sink::Storage store(Sink::Store::storageLocation(), "sink.dummy.testqueue", Sink::Storage::ReadWrite); store.removeFromDisk(); } void testEmpty() { - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); QVERIFY(queue.isEmpty()); queue.enqueue("value"); QVERIFY(!queue.isEmpty()); @@ -45,7 +45,7 @@ private slots: void testDequeueEmpty() { - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); bool gotValue = false; bool gotError = false; queue.dequeue([&](void *ptr, int size, std::function callback) { gotValue = true; }, [&](const MessageQueue::Error &error) { gotError = true; }); @@ -55,7 +55,7 @@ private slots: void testEnqueue() { - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); QSignalSpy spy(&queue, SIGNAL(messageReady())); queue.enqueue("value1"); QCOMPARE(spy.size(), 1); @@ -63,7 +63,7 @@ private slots: void testDrained() { - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); QSignalSpy spy(&queue, SIGNAL(drained())); queue.enqueue("value1"); @@ -77,7 +77,7 @@ private slots: values << "value1"; values << "value2"; - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); for (const QByteArray &value : values) { queue.enqueue(value); } @@ -107,7 +107,7 @@ private slots: values << "value1"; values << "value2"; - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); for (const QByteArray &value : values) { queue.enqueue(value); } @@ -145,7 +145,7 @@ private slots: */ void testNestedEnqueue() { - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); queue.enqueue("value1"); bool gotError = false; @@ -160,7 +160,7 @@ private slots: void testBatchDequeue() { - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); queue.enqueue("value1"); queue.enqueue("value2"); queue.enqueue("value3"); @@ -181,7 +181,7 @@ private slots: void testBatchEnqueue() { - MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue"); + MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue"); QSignalSpy spy(&queue, SIGNAL(messageReady())); queue.startTransaction(); queue.enqueue("value1"); diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp index d13cdf7..4819ccc 100644 --- a/tests/modelinteractivitytest.cpp +++ b/tests/modelinteractivitytest.cpp @@ -51,13 +51,13 @@ private slots: void initTestCase() { Sink::Test::initTest(); - ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy"); - Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished(); + ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy"); + Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished(); } void cleanup() { - Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished(); + Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished(); } void init() @@ -68,14 +68,14 @@ private slots: { // Setup { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); for (int i = 0; i < 1000; i++) { Sink::Store::create(mail).exec().waitForFinished(); } } Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.liveQuery = true; Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); diff --git a/tests/pipelinebenchmark.cpp b/tests/pipelinebenchmark.cpp index 51481fd..0c0b9e6 100644 --- a/tests/pipelinebenchmark.cpp +++ b/tests/pipelinebenchmark.cpp @@ -131,7 +131,7 @@ private slots: { Sink::Log::setDebugOutputLevel(Sink::Log::Warning); Sink::AdaptorFactoryRegistry::instance().registerFactory("test"); - resourceIdentifier = "org.kde.test.instance1"; + resourceIdentifier = "sink.test.instance1"; } void testWithoutIndex() diff --git a/tests/pipelinetest.cpp b/tests/pipelinetest.cpp index 65d4b49..7216f62 100644 --- a/tests/pipelinetest.cpp +++ b/tests/pipelinetest.cpp @@ -195,7 +195,7 @@ private slots: void init() { - removeFromDisk("org.kde.pipelinetest.instance1"); + removeFromDisk("sink.pipelinetest.instance1"); } void testCreate() @@ -203,14 +203,14 @@ private slots: flatbuffers::FlatBufferBuilder entityFbb; auto command = createEntityCommand(createEvent(entityFbb)); - Sink::Pipeline pipeline("org.kde.pipelinetest.instance1"); + Sink::Pipeline pipeline("sink.pipelinetest.instance1"); pipeline.setResourceType("test"); pipeline.startTransaction(); pipeline.newEntity(command.constData(), command.size()); pipeline.commit(); - auto result = getKeys("org.kde.pipelinetest.instance1", "event.main"); + auto result = getKeys("sink.pipelinetest.instance1", "event.main"); qDebug() << result; QCOMPARE(result.size(), 1); } @@ -220,7 +220,7 @@ private slots: flatbuffers::FlatBufferBuilder entityFbb; auto command = createEntityCommand(createEvent(entityFbb, "summary", "description")); - Sink::Pipeline pipeline("org.kde.pipelinetest.instance1"); + Sink::Pipeline pipeline("sink.pipelinetest.instance1"); pipeline.setResourceType("test"); auto adaptorFactory = QSharedPointer::create(); @@ -231,7 +231,7 @@ private slots: pipeline.commit(); // Get uid of written entity - auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main"); + auto keys = getKeys("sink.pipelinetest.instance1", "event.main"); QCOMPARE(keys.size(), 1); const auto key = keys.first(); const auto uid = Sink::Storage::uidFromKey(key); @@ -244,7 +244,7 @@ private slots: pipeline.commit(); // Ensure we've got the new revision with the modification - auto buffer = getEntity("org.kde.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 2)); + auto buffer = getEntity("sink.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 2)); QVERIFY(!buffer.isEmpty()); Sink::EntityBuffer entityBuffer(buffer.data(), buffer.size()); auto adaptor = adaptorFactory->createAdaptor(entityBuffer.entity()); @@ -253,7 +253,7 @@ private slots: QVERIFY2(adaptor->getProperty("description").toString() == QString("description"), "The modification has sideeffects."); // Both revisions are in the store at this point - QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 2); + QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 2); // Cleanup old revisions pipeline.startTransaction(); @@ -261,7 +261,7 @@ private slots: pipeline.commit(); // And now only the latest revision is left - QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 1); + QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 1); } void testModifyWithUnrelatedOperationInbetween() @@ -269,7 +269,7 @@ private slots: flatbuffers::FlatBufferBuilder entityFbb; auto command = createEntityCommand(createEvent(entityFbb)); - Sink::Pipeline pipeline("org.kde.pipelinetest.instance1"); + Sink::Pipeline pipeline("sink.pipelinetest.instance1"); pipeline.setResourceType("test"); auto adaptorFactory = QSharedPointer::create(); @@ -280,7 +280,7 @@ private slots: pipeline.commit(); // Get uid of written entity - auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main"); + auto keys = getKeys("sink.pipelinetest.instance1", "event.main"); QCOMPARE(keys.size(), 1); const auto uid = Sink::Storage::uidFromKey(keys.first()); @@ -302,7 +302,7 @@ private slots: pipeline.commit(); // Ensure we've got the new revision with the modification - auto buffer = getEntity("org.kde.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 3)); + auto buffer = getEntity("sink.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 3)); QVERIFY(!buffer.isEmpty()); Sink::EntityBuffer entityBuffer(buffer.data(), buffer.size()); auto adaptor = adaptorFactory->createAdaptor(entityBuffer.entity()); @@ -313,7 +313,7 @@ private slots: { flatbuffers::FlatBufferBuilder entityFbb; auto command = createEntityCommand(createEvent(entityFbb)); - Sink::Pipeline pipeline("org.kde.pipelinetest.instance1"); + Sink::Pipeline pipeline("sink.pipelinetest.instance1"); pipeline.setResourceType("test"); // Create the initial revision @@ -321,7 +321,7 @@ private slots: pipeline.newEntity(command.constData(), command.size()); pipeline.commit(); - auto result = getKeys("org.kde.pipelinetest.instance1", "event.main"); + auto result = getKeys("sink.pipelinetest.instance1", "event.main"); QCOMPARE(result.size(), 1); const auto uid = Sink::Storage::uidFromKey(result.first()); @@ -333,7 +333,7 @@ private slots: pipeline.commit(); // We have a new revision that indicates the deletion - QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 2); + QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 2); // Cleanup old revisions pipeline.startTransaction(); @@ -341,7 +341,7 @@ private slots: pipeline.commit(); // And all revisions are gone - QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 0); + QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 0); } void testPreprocessor() @@ -350,7 +350,7 @@ private slots: auto testProcessor = new TestProcessor; - Sink::Pipeline pipeline("org.kde.pipelinetest.instance1"); + Sink::Pipeline pipeline("sink.pipelinetest.instance1"); pipeline.setResourceType("test"); pipeline.setPreprocessors("event", QVector() << testProcessor); pipeline.startTransaction(); @@ -368,7 +368,7 @@ private slots: pipeline.commit(); entityFbb.Clear(); pipeline.startTransaction(); - auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main"); + auto keys = getKeys("sink.pipelinetest.instance1", "event.main"); QCOMPARE(keys.size(), 1); const auto uid = Sink::Storage::uidFromKey(keys.first()); { diff --git a/tests/querytest.cpp b/tests/querytest.cpp index 95c22b3..d3a97f6 100644 --- a/tests/querytest.cpp +++ b/tests/querytest.cpp @@ -23,15 +23,15 @@ private slots: void initTestCase() { Sink::Test::initTest(); - auto factory = Sink::ResourceFactory::load("org.kde.dummy"); + auto factory = Sink::ResourceFactory::load("sink.dummy"); QVERIFY(factory); - ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy"); - Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished(); + ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy"); + Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished(); } void cleanup() { - Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished(); + Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished(); } void init() @@ -59,13 +59,13 @@ private slots: { // Setup { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); Sink::Store::create(mail).exec().waitForFinished(); } // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.liveQuery = true; // We fetch before the data is available and rely on the live query mechanism to deliver the actual data @@ -77,13 +77,13 @@ private slots: { // Setup { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); Sink::Store::create(mail).exec().waitForFinished(); } // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.liveQuery = false; // Ensure all local data is processed @@ -101,12 +101,12 @@ private slots: QByteArray id; // Setup { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); Sink::Store::create(mail).exec().waitForFinished(); Sink::Store::create(mail).exec().waitForFinished(); Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; // Ensure all local data is processed Sink::Store::synchronize(query).exec().waitForFinished(); @@ -120,7 +120,7 @@ private slots: // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.ids << id; auto model = Sink::Store::loadModel(query); QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool()); @@ -131,13 +131,13 @@ private slots: { // Setup { - Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Folder folder("sink.dummy.instance1"); Sink::Store::create(folder).exec().waitForFinished(); } // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.liveQuery = true; // We fetch before the data is available and rely on the live query mechanism to deliver the actual data @@ -151,11 +151,11 @@ private slots: { // Setup { - Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Folder folder("sink.dummy.instance1"); Sink::Store::create(folder).exec().waitForFinished(); Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; // Ensure all local data is processed Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); @@ -167,14 +167,14 @@ private slots: auto folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value(); QVERIFY(!folderEntity->identifier().isEmpty()); - Sink::ApplicationDomain::Folder subfolder("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Folder subfolder("sink.dummy.instance1"); subfolder.setProperty("parent", folderEntity->identifier()); Sink::Store::create(subfolder).exec().waitForFinished(); } // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.parentProperty = "parent"; // Ensure all local data is processed @@ -193,7 +193,7 @@ private slots: { // Setup { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); mail.setProperty("uid", "test1"); mail.setProperty("sender", "doe@example.org"); Sink::Store::create(mail).exec().waitForFinished(); @@ -201,7 +201,7 @@ private slots: // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query.liveQuery = false; query += Sink::Query::PropertyFilter("uid", "test1"); @@ -219,11 +219,11 @@ private slots: // Setup Sink::ApplicationDomain::Folder::Ptr folderEntity; { - Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Folder folder("sink.dummy.instance1"); Sink::Store::create(folder).exec().waitForFinished(); Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; // Ensure all local data is processed Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); @@ -235,7 +235,7 @@ private slots: folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value(); QVERIFY(!folderEntity->identifier().isEmpty()); - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); mail.setProperty("uid", "test1"); mail.setProperty("folder", folderEntity->identifier()); Sink::Store::create(mail).exec().waitForFinished(); @@ -243,7 +243,7 @@ private slots: // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query += Sink::Query::PropertyFilter("folder", *folderEntity); // Ensure all local data is processed @@ -260,11 +260,11 @@ private slots: // Setup Sink::ApplicationDomain::Folder::Ptr folderEntity; { - Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Folder folder("sink.dummy.instance1"); Sink::Store::create(folder).exec().waitForFinished(); Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; // Ensure all local data is processed Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished(); @@ -278,21 +278,21 @@ private slots: const auto date = QDateTime(QDate(2015, 7, 7), QTime(12, 0)); { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); mail.setProperty("uid", "testSecond"); mail.setProperty("folder", folderEntity->identifier()); mail.setProperty("date", date.addDays(-1)); Sink::Store::create(mail).exec().waitForFinished(); } { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); mail.setProperty("uid", "testLatest"); mail.setProperty("folder", folderEntity->identifier()); mail.setProperty("date", date); Sink::Store::create(mail).exec().waitForFinished(); } { - Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1"); + Sink::ApplicationDomain::Mail mail("sink.dummy.instance1"); mail.setProperty("uid", "testLast"); mail.setProperty("folder", folderEntity->identifier()); mail.setProperty("date", date.addDays(-2)); @@ -302,7 +302,7 @@ private slots: // Test Sink::Query query; - query.resources << "org.kde.dummy.instance1"; + query.resources << "sink.dummy.instance1"; query += Sink::Query::PropertyFilter("folder", *folderEntity); query.sortProperty = "date"; query.limit = 1; -- cgit v1.2.3