diff --git a/src/akonadi/akonaditaskrepository.h b/src/akonadi/akonaditaskrepository.h --- a/src/akonadi/akonaditaskrepository.h +++ b/src/akonadi/akonaditaskrepository.h @@ -51,7 +51,6 @@ virtual KJob *create(Domain::Task::Ptr task) Q_DECL_OVERRIDE; virtual KJob *createInProject(Domain::Task::Ptr task, Domain::Project::Ptr project) Q_DECL_OVERRIDE; virtual KJob *createInContext(Domain::Task::Ptr task, Domain::Context::Ptr context) Q_DECL_OVERRIDE; - virtual KJob *createInTag(Domain::Task::Ptr task, Domain::Tag::Ptr tag) Q_DECL_OVERRIDE; virtual KJob *update(Domain::Task::Ptr task) Q_DECL_OVERRIDE; virtual KJob *remove(Domain::Task::Ptr task) Q_DECL_OVERRIDE; diff --git a/src/akonadi/akonaditaskrepository.cpp b/src/akonadi/akonaditaskrepository.cpp --- a/src/akonadi/akonaditaskrepository.cpp +++ b/src/akonadi/akonaditaskrepository.cpp @@ -119,18 +119,6 @@ return createItem(item); } -KJob *TaskRepository::createInTag(Domain::Task::Ptr task, Domain::Tag::Ptr tag) -{ - Item item = m_serializer->createItemFromTask(task); - Q_ASSERT(!item.isValid()); - - Tag akonadiTag = m_serializer->createAkonadiTagFromTag(tag); - Q_ASSERT(akonadiTag .isValid()); - item.setTag(akonadiTag); - - return createItem(item); -} - KJob *TaskRepository::update(Domain::Task::Ptr task) { auto item = m_serializer->createItemFromTask(task); diff --git a/src/domain/taskrepository.h b/src/domain/taskrepository.h --- a/src/domain/taskrepository.h +++ b/src/domain/taskrepository.h @@ -27,7 +27,6 @@ #include "context.h" #include "datasource.h" #include "project.h" -#include "tag.h" #include "task.h" class KJob; @@ -48,7 +47,6 @@ virtual KJob *create(Task::Ptr task) = 0; virtual KJob *createInProject(Task::Ptr task, Project::Ptr project) = 0; virtual KJob *createInContext(Task::Ptr task, Context::Ptr context) = 0; - virtual KJob *createInTag(Task::Ptr task, Tag::Ptr tag) = 0; virtual KJob *update(Task::Ptr task) = 0; virtual KJob *remove(Task::Ptr task) = 0; diff --git a/tests/units/akonadi/akonaditaskrepositorytest.cpp b/tests/units/akonadi/akonaditaskrepositorytest.cpp --- a/tests/units/akonadi/akonaditaskrepositorytest.cpp +++ b/tests/units/akonadi/akonaditaskrepositorytest.cpp @@ -316,55 +316,6 @@ QVERIFY(storageMock(&Akonadi::StorageInterface::createItem).when(taskItem, defaultCollection).exactly(1)); } - void shouldCreateNewItemsInTag() - { - // GIVEN - // a tag - Akonadi::Tag akonadiTag; - akonadiTag.setName("akonadiTag42"); - akonadiTag.setId(42); - - // the domain Tag related to the Akonadi Tag - auto tag = Domain::Tag::Ptr::create(); - - // a default collection - Akonadi::Collection defaultCollection(42); - - // A task and its corresponding item not existing in storage yet - Akonadi::Item taskItem; - auto task = Domain::Task::Ptr::create(); - - // A mock create job - auto itemCreateJob = new FakeJob(this); - - // serializer mock returning the item for the task - Utils::MockObject serializerMock; - - serializerMock(&Akonadi::SerializerInterface::createAkonadiTagFromTag).when(tag).thenReturn(akonadiTag); - serializerMock(&Akonadi::SerializerInterface::createItemFromTask).when(task).thenReturn(taskItem); - - // Storage mock returning the create job - Utils::MockObject storageMock; - - storageMock(&Akonadi::StorageInterface::defaultTaskCollection).when().thenReturn(defaultCollection); - storageMock(&Akonadi::StorageInterface::createItem).when(taskItem, defaultCollection).thenReturn(itemCreateJob); - - // WHEN - QScopedPointer repository(new Akonadi::TaskRepository(storageMock.getInstance(), - serializerMock.getInstance(), - Akonadi::MessagingInterface::Ptr())); - - repository->createInTag(task, tag)->exec(); - - // THEN - - QVERIFY(serializerMock(&Akonadi::SerializerInterface::createItemFromTask).when(task).exactly(1)); - QVERIFY(serializerMock(&Akonadi::SerializerInterface::createAkonadiTagFromTag).when(tag).exactly(1)); - - QVERIFY(storageMock(&Akonadi::StorageInterface::defaultTaskCollection).when().exactly(1)); - QVERIFY(storageMock(&Akonadi::StorageInterface::createItem).when(taskItem, defaultCollection).exactly(1)); - } - void shouldUpdateExistingItems() { // GIVEN