diff --git a/src/akonadi/akonadidatasourcequeries.cpp b/src/akonadi/akonadidatasourcequeries.cpp --- a/src/akonadi/akonadidatasourcequeries.cpp +++ b/src/akonadi/akonadidatasourcequeries.cpp @@ -87,7 +87,8 @@ auto predicate = [this] (const Akonadi::Collection &collection) { return collection.isValid() && m_serializer->isSelectedCollection(collection); }; - m_integrator->bind("DataSourceQueries::findAllSelected", m_findAllSelected, fetch, predicate); + m_integrator->bind("DataSourceQueries::findAllSelected", m_findAllSelected, fetch, predicate, + Akonadi::SerializerInterface::FullPath); return m_findAllSelected->result(); } diff --git a/tests/features/zanshin/features/contexts/context-add.feature b/tests/features/zanshin/features/contexts/context-add.feature --- a/tests/features/zanshin/features/contexts/context-add.feature +++ b/tests/features/zanshin/features/contexts/context-add.feature @@ -9,17 +9,17 @@ When I add a "context" named "Internet" And I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Prepare talk about TDD | view-pim-tasks | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Backlog | view-pim-tasks | - | Contexts | folder | - | Contexts / Errands | view-pim-notes | - | Contexts / Internet | view-pim-notes | - | Contexts / Online | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Prepare talk about TDD | view-pim-tasks | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Backlog | view-pim-tasks | + | Contexts | folder | + | Contexts / Errands | view-pim-notes | + | Contexts / Internet | view-pim-notes | + | Contexts / Online | view-pim-notes | diff --git a/tests/features/zanshin/features/contexts/context-drag-and-drop.feature b/tests/features/zanshin/features/contexts/context-drag-and-drop.feature --- a/tests/features/zanshin/features/contexts/context-drag-and-drop.feature +++ b/tests/features/zanshin/features/contexts/context-drag-and-drop.feature @@ -16,7 +16,7 @@ | Buy rutabagas | Scenario: Dropping a task on a context from the project central list - Given I display the "Projects / Calendar1 / Prepare talk about TDD" page + Given I display the "Projects / TestData»Calendar1 / Prepare talk about TDD" page And there is an item named "Create examples and exercices" in the central list When I drop the item on "Contexts / Online" in the page list And I display the "Contexts / Online" page diff --git a/tests/features/zanshin/features/contexts/context-edit.feature b/tests/features/zanshin/features/contexts/context-edit.feature --- a/tests/features/zanshin/features/contexts/context-edit.feature +++ b/tests/features/zanshin/features/contexts/context-edit.feature @@ -8,15 +8,15 @@ When I rename the page named "Errands" under "Contexts" to "Chores" And I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Prepare talk about TDD | view-pim-tasks | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Backlog | view-pim-tasks | - | Contexts | folder | - | Contexts / Chores | view-pim-notes | - | Contexts / Online | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Prepare talk about TDD | view-pim-tasks | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Backlog | view-pim-tasks | + | Contexts | folder | + | Contexts / Chores | view-pim-notes | + | Contexts / Online | view-pim-notes | diff --git a/tests/features/zanshin/features/contexts/context-remove.feature b/tests/features/zanshin/features/contexts/context-remove.feature --- a/tests/features/zanshin/features/contexts/context-remove.feature +++ b/tests/features/zanshin/features/contexts/context-remove.feature @@ -8,15 +8,15 @@ When I remove the page named "Online" under "Contexts" And I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Prepare talk about TDD | view-pim-tasks | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Backlog | view-pim-tasks | - | Contexts | folder | - | Contexts / Errands | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Prepare talk about TDD | view-pim-tasks | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Backlog | view-pim-tasks | + | Contexts | folder | + | Contexts / Errands | view-pim-notes | diff --git a/tests/features/zanshin/features/contexts/context-task-remove.feature b/tests/features/zanshin/features/contexts/context-task-remove.feature --- a/tests/features/zanshin/features/contexts/context-task-remove.feature +++ b/tests/features/zanshin/features/contexts/context-task-remove.feature @@ -4,15 +4,15 @@ In order to keep my context meaningful Scenario: Removing a task from a context keeps it in the project page it's linked to - Given I display the "Projects / Calendar1 / Prepare talk about TDD" page + Given I display the "Projects / TestData»Calendar1 / Prepare talk about TDD" page And there is an item named "Create examples and exercices" in the central list And I drop the item on "Contexts / Online" in the page list And I display the "Contexts / Online" page And there is an item named "Create examples and exercices" in the central list When I remove the item And I look at the central list Then the list does not contain "Create examples and exercices" - And I display the "Projects / Calendar1 / Prepare talk about TDD" page + And I display the "Projects / TestData»Calendar1 / Prepare talk about TDD" page Then there is an item named "Create examples and exercices" in the central list Scenario: Removing a task linked only to a context moves it back to the inbox diff --git a/tests/features/zanshin/features/datasource/datasource-selection.feature b/tests/features/zanshin/features/datasource/datasource-selection.feature --- a/tests/features/zanshin/features/datasource/datasource-selection.feature +++ b/tests/features/zanshin/features/datasource/datasource-selection.feature @@ -38,31 +38,31 @@ And I display the available pages And I list the items Then the list is: - | display | - | Inbox | - | Workday | - | Projects | - | Projects / Calendar2 | - | Projects / Calendar2 / Backlog | - | Contexts | - | Contexts / Errands | - | Contexts / Online | + | display | + | Inbox | + | Workday | + | Projects | + | Projects / TestData»Calendar1»Calendar2 | + | Projects / TestData»Calendar1»Calendar2 / Backlog | + | Contexts | + | Contexts / Errands | + | Contexts / Online | Scenario: Checking impacts project list Given there is an item named "TestData / Calendar1" in the available data sources When I check the item And I display the available pages And I list the items Then the list is: - | display | - | Inbox | - | Workday | - | Projects | - | Projects / Calendar1 | - | Projects / Calendar1 / Prepare talk about TDD | - | Projects / Calendar1 / Read List | - | Projects / Calendar2 | - | Projects / Calendar2 / Backlog | - | Contexts | - | Contexts / Errands | - | Contexts / Online | + | display | + | Inbox | + | Workday | + | Projects | + | Projects / TestData»Calendar1 | + | Projects / TestData»Calendar1 / Prepare talk about TDD | + | Projects / TestData»Calendar1 / Read List | + | Projects / TestData»Calendar1»Calendar2 | + | Projects / TestData»Calendar1»Calendar2 / Backlog | + | Contexts | + | Contexts / Errands | + | Contexts / Online | diff --git a/tests/features/zanshin/features/editing/adding-task.feature b/tests/features/zanshin/features/editing/adding-task.feature --- a/tests/features/zanshin/features/editing/adding-task.feature +++ b/tests/features/zanshin/features/editing/adding-task.feature @@ -11,9 +11,9 @@ Then the list contains "" Examples: - | page | title | - | Inbox | Buy a book | - | Projects / Calendar2 / Backlog | Setup a release party | + | page | title | + | Inbox | Buy a book | + | Projects / TestData»Calendar1»Calendar2 / Backlog | Setup a release party | Scenario Outline: Adding a task as a child of another task in a page Given I display the "<page>" page @@ -25,6 +25,6 @@ Then the list contains "<parent> / <title>" Examples: - | page | parent | title | - | Inbox | Buy a book | Make sure it is a good book | - | Projects / Calendar2 / Backlog | Setup a release party | Make sure there was a release | + | page | parent | title | + | Inbox | Buy a book | Make sure it is a good book | + | Projects / TestData»Calendar1»Calendar2 / Backlog | Setup a release party | Make sure there was a release | diff --git a/tests/features/zanshin/features/editing/removing-task.feature b/tests/features/zanshin/features/editing/removing-task.feature --- a/tests/features/zanshin/features/editing/removing-task.feature +++ b/tests/features/zanshin/features/editing/removing-task.feature @@ -11,7 +11,7 @@ Then the list does not contain "<title>" Examples: - | page | title | - | Inbox | Buy cheese | - | Projects / Calendar1 / Read List | "Domain Driven Design" by Eric Evans | + | page | title | + | Inbox | Buy cheese | + | Projects / TestData»Calendar1 / Read List | "Domain Driven Design" by Eric Evans | diff --git a/tests/features/zanshin/features/inbox/inbox-drag-and-drop.feature b/tests/features/zanshin/features/inbox/inbox-drag-and-drop.feature --- a/tests/features/zanshin/features/inbox/inbox-drag-and-drop.feature +++ b/tests/features/zanshin/features/inbox/inbox-drag-and-drop.feature @@ -81,7 +81,7 @@ | Buy rutabagas | Scenario: Dropping a task on the inbox removes it from it's associated project - Given I display the "Projects / Calendar1 / Prepare talk about TDD" page + Given I display the "Projects / TestData»Calendar1 / Prepare talk about TDD" page And there is an item named "Create Sozi SVG" in the central list When I drop the item on "Inbox" in the page list And I display the "Inbox" page diff --git a/tests/features/zanshin/features/pages/pages-display.feature b/tests/features/zanshin/features/pages/pages-display.feature --- a/tests/features/zanshin/features/pages/pages-display.feature +++ b/tests/features/zanshin/features/pages/pages-display.feature @@ -7,16 +7,16 @@ Given I display the available pages When I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Prepare talk about TDD | view-pim-tasks | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Backlog | view-pim-tasks | - | Contexts | folder | - | Contexts / Errands | view-pim-notes | - | Contexts / Online | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Prepare talk about TDD | view-pim-tasks | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Backlog | view-pim-tasks | + | Contexts | folder | + | Contexts / Errands | view-pim-notes | + | Contexts / Online | view-pim-notes | diff --git a/tests/features/zanshin/features/projects/project-add.feature b/tests/features/zanshin/features/projects/project-add.feature --- a/tests/features/zanshin/features/projects/project-add.feature +++ b/tests/features/zanshin/features/projects/project-add.feature @@ -8,16 +8,16 @@ When I add a project named "Birthday" in the source named "TestData / Calendar1" And I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Birthday | view-pim-tasks | - | Projects / Calendar1 / Prepare talk about TDD | view-pim-tasks | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Backlog | view-pim-tasks | - | Contexts | folder | - | Contexts / Errands | view-pim-notes | - | Contexts / Online | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Birthday | view-pim-tasks | + | Projects / TestData»Calendar1 / Prepare talk about TDD | view-pim-tasks | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Backlog | view-pim-tasks | + | Contexts | folder | + | Contexts / Errands | view-pim-notes | + | Contexts / Online | view-pim-notes | diff --git a/tests/features/zanshin/features/projects/project-display.feature b/tests/features/zanshin/features/projects/project-display.feature --- a/tests/features/zanshin/features/projects/project-display.feature +++ b/tests/features/zanshin/features/projects/project-display.feature @@ -4,7 +4,7 @@ In order to see the artifacts associated to it Scenario: Project tasks appear in the corresponding page - Given I display the "Projects / Calendar1 / Read List" page + Given I display the "Projects / TestData»Calendar1 / Read List" page And I look at the central list When I list the items Then the list is: diff --git a/tests/features/zanshin/features/projects/project-drag-and-drop.feature b/tests/features/zanshin/features/projects/project-drag-and-drop.feature --- a/tests/features/zanshin/features/projects/project-drag-and-drop.feature +++ b/tests/features/zanshin/features/projects/project-drag-and-drop.feature @@ -6,8 +6,8 @@ Scenario: Dropping a task on a project Given I display the "Inbox" page And there is an item named ""The Pragmatic Programmer" by Hunt and Thomas" in the central list - When I drop the item on "Projects / Calendar1 / Read List" in the page list - And I display the "Projects / Calendar1 / Read List" page + When I drop the item on "Projects / TestData»Calendar1 / Read List" in the page list + And I display the "Projects / TestData»Calendar1 / Read List" page And I look at the central list And I list the items Then the list is: @@ -19,8 +19,8 @@ Scenario: Dropping a task on a project from context central list Given I display the "Contexts / Errands" page And there is an item named "Buy kiwis" in the central list - When I drop the item on "Projects / Calendar2 / Backlog" in the page list - And I display the "Projects / Calendar2 / Backlog" page + When I drop the item on "Projects / TestData»Calendar1»Calendar2 / Backlog" in the page list + And I display the "Projects / TestData»Calendar1»Calendar2 / Backlog" page And I look at the central list And I list the items Then the list is: diff --git a/tests/features/zanshin/features/projects/project-edit.feature b/tests/features/zanshin/features/projects/project-edit.feature --- a/tests/features/zanshin/features/projects/project-edit.feature +++ b/tests/features/zanshin/features/projects/project-edit.feature @@ -5,18 +5,18 @@ Scenario: Renamed projects appear in the list Given I display the available pages - When I rename the page named "Backlog" under "Projects / Calendar2" to "Party" + When I rename the page named "Backlog" under "Projects / TestData»Calendar1»Calendar2" to "Party" And I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Prepare talk about TDD | view-pim-tasks | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Party | view-pim-tasks | - | Contexts | folder | - | Contexts / Errands | view-pim-notes | - | Contexts / Online | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Prepare talk about TDD | view-pim-tasks | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Party | view-pim-tasks | + | Contexts | folder | + | Contexts / Errands | view-pim-notes | + | Contexts / Online | view-pim-notes | diff --git a/tests/features/zanshin/features/projects/project-remove.feature b/tests/features/zanshin/features/projects/project-remove.feature --- a/tests/features/zanshin/features/projects/project-remove.feature +++ b/tests/features/zanshin/features/projects/project-remove.feature @@ -5,17 +5,17 @@ Scenario: Removing a simple project from the list Given I display the available pages - When I remove the page named "Prepare talk about TDD" under "Projects / Calendar1" + When I remove the page named "Prepare talk about TDD" under "Projects / TestData»Calendar1" And I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Backlog | view-pim-tasks | - | Contexts | folder | - | Contexts / Errands | view-pim-notes | - | Contexts / Online | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Backlog | view-pim-tasks | + | Contexts | folder | + | Contexts / Errands | view-pim-notes | + | Contexts / Online | view-pim-notes | diff --git a/tests/features/zanshin/features/projects/project-task-add.feature b/tests/features/zanshin/features/projects/project-task-add.feature --- a/tests/features/zanshin/features/projects/project-task-add.feature +++ b/tests/features/zanshin/features/projects/project-task-add.feature @@ -4,7 +4,7 @@ In order to organize my tasks Scenario: Task added from a project appear in its list - Given I display the "Projects / Calendar2 / Backlog" page + Given I display the "Projects / TestData»Calendar1»Calendar2 / Backlog" page When I add a "task" named "Buy a cake" And I add a "task" named "Buy a present" And I look at the central list diff --git a/tests/features/zanshin/features/projects/project-task-promote.feature b/tests/features/zanshin/features/projects/project-task-promote.feature --- a/tests/features/zanshin/features/projects/project-task-promote.feature +++ b/tests/features/zanshin/features/projects/project-task-promote.feature @@ -4,25 +4,25 @@ In order to organize my tasks Scenario: Task promoted into a project appears in the list - Given I display the "Projects / Calendar2 / Backlog" page + Given I display the "Projects / TestData»Calendar1»Calendar2 / Backlog" page And I add a "task" named "Design a present" And I look at the central list And there is an item named "Design a present" in the central list When I promote the item And I display the available pages And I list the items Then the list is: - | display | icon | - | Inbox | mail-folder-inbox | - | Workday | go-jump-today | - | Projects | folder | - | Projects / Calendar1 | folder | - | Projects / Calendar1 / Prepare talk about TDD | view-pim-tasks | - | Projects / Calendar1 / Read List | view-pim-tasks | - | Projects / Calendar2 | folder | - | Projects / Calendar2 / Backlog | view-pim-tasks | - | Projects / Calendar2 / Design a present | view-pim-tasks | - | Contexts | folder | - | Contexts / Errands | view-pim-notes | - | Contexts / Online | view-pim-notes | + | display | icon | + | Inbox | mail-folder-inbox | + | Workday | go-jump-today | + | Projects | folder | + | Projects / TestData»Calendar1 | folder | + | Projects / TestData»Calendar1 / Prepare talk about TDD | view-pim-tasks | + | Projects / TestData»Calendar1 / Read List | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 | folder | + | Projects / TestData»Calendar1»Calendar2 / Backlog | view-pim-tasks | + | Projects / TestData»Calendar1»Calendar2 / Design a present | view-pim-tasks | + | Contexts | folder | + | Contexts / Errands | view-pim-notes | + | Contexts / Online | view-pim-notes | diff --git a/tests/units/akonadi/akonadidatasourcequeriestest.cpp b/tests/units/akonadi/akonadidatasourcequeriestest.cpp --- a/tests/units/akonadi/akonadidatasourcequeriestest.cpp +++ b/tests/units/akonadi/akonadidatasourcequeriestest.cpp @@ -593,15 +593,15 @@ QTest::addColumn<QStringList>("expectedNames"); auto expectedNames = QStringList(); - expectedNames << QStringLiteral("43Task") << QStringLiteral("45Note"); + expectedNames << QStringLiteral("42Task»43Task") << QStringLiteral("44Note»45Note"); QTest::newRow("tasks and notes") << int(Akonadi::StorageInterface::Tasks | Akonadi::StorageInterface::Notes) << expectedNames; expectedNames.clear(); - expectedNames << QStringLiteral("43Task"); + expectedNames << QStringLiteral("42Task»43Task"); QTest::newRow("tasks") << int(Akonadi::StorageInterface::Tasks) << expectedNames; expectedNames.clear(); - expectedNames << QStringLiteral("45Note"); + expectedNames << QStringLiteral("44Note»45Note"); QTest::newRow("notes") << int(Akonadi::StorageInterface::Notes) << expectedNames; } @@ -665,8 +665,8 @@ // THEN QCOMPARE(result->data().size(), 2); - QCOMPARE(result->data().at(0)->name(), QStringLiteral("43Task")); - QCOMPARE(result->data().at(1)->name(), QStringLiteral("45Note")); + QCOMPARE(result->data().at(0)->name(), QStringLiteral("42Task»43Task")); + QCOMPARE(result->data().at(1)->name(), QStringLiteral("44Note»45Note")); } void shouldReactToCollectionRemovesForSelectedSources() @@ -729,8 +729,8 @@ // THEN QCOMPARE(result->data().size(), 2); - QCOMPARE(result->data().at(0)->name(), QStringLiteral("43TaskBis")); - QCOMPARE(result->data().at(1)->name(), QStringLiteral("45NoteBis")); + QCOMPARE(result->data().at(0)->name(), QStringLiteral("42Task»43TaskBis")); + QCOMPARE(result->data().at(1)->name(), QStringLiteral("44Note»45NoteBis")); QVERIFY(replaceHandlerCalled); }