author | Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com> |
Thu, 16 Sep 2010 12:11:40 +0100 | |
changeset 117 | c63ee96dbe5f |
permissions | -rw-r--r-- |
117
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1 |
/* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2 |
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
3 |
* All rights reserved. |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
4 |
* This component and the accompanying materials are made available |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
5 |
* under the terms of "Eclipse Public License v1.0" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
6 |
* which accompanies this distribution, and is available |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
7 |
* at the URL "http://www.eclipse.org/legal/epl-v10.html". |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
8 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
9 |
* Initial Contributors: |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
10 |
* Nokia Corporation - initial contribution. |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
11 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
12 |
* Contributors: |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
13 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
14 |
* Description: Main test class for hspluginmodel library. |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
15 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
16 |
*/ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
17 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
18 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
19 |
#include "t_caclient.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
20 |
#include "caservice.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
21 |
#include "caquery.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
22 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
23 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
24 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
25 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
26 |
void TestCaClient::TestRemoveItem() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
27 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
28 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
29 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
30 |
item.setText("testName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
31 |
item.setAttribute("attrName1", "attrVal1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
32 |
item.setEntryTypeName("test"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
33 |
item.setFlags(RemovableEntryFlag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
34 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
35 |
QSharedPointer<CaService> service = CaService::instance(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
36 |
QSharedPointer<CaEntry> resultItem1 = service->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
37 |
QVERIFY(!resultItem1.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
38 |
QVERIFY(!service->removeEntry(9999)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
39 |
QVERIFY(service->removeEntry(resultItem1->id())); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
40 |
QCOMPARE(service->lastError() , NoErrorCode); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
41 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
42 |
QSharedPointer<CaEntry> storageItem1 = service->getEntry(resultItem1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
43 |
QVERIFY(storageItem1.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
44 |
QVERIFY(!service->removeEntry(resultItem1->id())); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
45 |
QVERIFY(service->lastError() != NoErrorCode); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
46 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
47 |
QSharedPointer<CaEntry> resultItem2 = service->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
48 |
QVERIFY(!resultItem2.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
49 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
50 |
QVERIFY(service->removeEntry(*resultItem2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
51 |
QSharedPointer<CaEntry> storageItem2 = service->getEntry(resultItem2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
52 |
QVERIFY(storageItem2.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
53 |
QVERIFY(!service->removeEntry(*resultItem2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
54 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
55 |
//cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
56 |
service->removeEntry(*resultItem1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
57 |
service->removeEntry(*resultItem2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
58 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
59 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
60 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
61 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
62 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
63 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
64 |
void TestCaClient::TestRemoveGroup() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
65 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
66 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
67 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
68 |
group.setText("testName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
69 |
group.setAttribute("attrName1", "attrVal1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
70 |
group.setEntryTypeName("test"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
71 |
group.setFlags(RemovableEntryFlag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
72 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
73 |
QSharedPointer<CaService> service = CaService::instance(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
74 |
QSharedPointer<CaEntry> resultgroup1 = service->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
75 |
QVERIFY(!resultgroup1.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
76 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
77 |
QVERIFY(service->removeEntry(resultgroup1->id())); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
78 |
QSharedPointer<CaEntry> storagegroup1 = service->getEntry(resultgroup1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
79 |
QVERIFY(!storagegroup1); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
80 |
QVERIFY(!service->removeEntry(resultgroup1->id())); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
81 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
82 |
QSharedPointer<CaEntry> resultgroup2 = service->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
83 |
QVERIFY(!resultgroup2.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
84 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
85 |
QVERIFY(service->removeEntry(*resultgroup2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
86 |
QSharedPointer<CaEntry> storagegroup2 = service->getEntry(resultgroup2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
87 |
QVERIFY(!storagegroup2); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
88 |
QVERIFY(!service->removeEntry(*resultgroup2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
89 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
90 |
//cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
91 |
service->removeEntry(*resultgroup1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
92 |
service->removeEntry(*resultgroup2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
93 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
94 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
95 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
96 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
97 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
98 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
99 |
void TestCaClient::TestRemoveItems() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
100 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
101 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
102 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
103 |
item.setText("testName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
104 |
item.setAttribute("attrName1", "attrVal1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
105 |
item.setEntryTypeName("test"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
106 |
item.setFlags(RemovableEntryFlag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
107 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
108 |
QSharedPointer<CaService> service = CaService::instance(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
109 |
QSharedPointer<CaEntry> resultItem1 = service->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
110 |
QSharedPointer<CaEntry> resultItem2 = service->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
111 |
QVERIFY(!resultItem1.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
112 |
QVERIFY(!resultItem2.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
113 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
114 |
QList<int> ids; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
115 |
ids.append(resultItem1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
116 |
ids.append(resultItem2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
117 |
QVERIFY(service->removeEntries(ids)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
118 |
QSharedPointer<CaEntry> storageItem1 = service->getEntry(resultItem1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
119 |
QSharedPointer<CaEntry> storageItem2 = service->getEntry(resultItem2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
120 |
QVERIFY(storageItem1.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
121 |
QVERIFY(storageItem2.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
122 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
123 |
QSharedPointer<CaEntry> resultItem3 = service->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
124 |
QSharedPointer<CaEntry> resultItem4 = service->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
125 |
QVERIFY(!resultItem3.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
126 |
QVERIFY(!resultItem4.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
127 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
128 |
QList<QSharedPointer<CaEntry> > entries; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
129 |
entries.append(resultItem3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
130 |
entries.append(resultItem4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
131 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
132 |
QVERIFY(service->removeEntries(entries)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
133 |
QSharedPointer<CaEntry> storageItem3 = service->getEntry(resultItem3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
134 |
QSharedPointer<CaEntry> storageItem4 = service->getEntry(resultItem4->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
135 |
QVERIFY(storageItem3.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
136 |
QVERIFY(storageItem4.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
137 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
138 |
//cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
139 |
service->removeEntry(*resultItem1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
140 |
service->removeEntry(*resultItem2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
141 |
service->removeEntry(*resultItem3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
142 |
service->removeEntry(*resultItem4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
143 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
144 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
145 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
146 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
147 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
148 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
149 |
void TestCaClient::TestRemoveItemsFail() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
150 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
151 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
152 |
QSharedPointer<CaEntry> item (new CaEntry()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
153 |
item->setText("testName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
154 |
item->setAttribute("attrName1", "attrVal1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
155 |
item->setEntryTypeName("test"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
156 |
item->setFlags(RemovableEntryFlag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
157 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
158 |
QSharedPointer<CaService> service = CaService::instance(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
159 |
QSharedPointer<CaEntry> resultItem1 = service->createEntry(*item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
160 |
QVERIFY(!resultItem1.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
161 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
162 |
QList<int> ids; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
163 |
ids.append(resultItem1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
164 |
ids.append(9999);// not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
165 |
QVERIFY(!service->removeEntries(ids)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
166 |
QSharedPointer<CaEntry> storageItem1 = service->getEntry(resultItem1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
167 |
QVERIFY(!storageItem1.isNull()); // entry present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
168 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
169 |
QSharedPointer<CaEntry> resultItem2 = service->createEntry(*item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
170 |
QVERIFY(!resultItem2.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
171 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
172 |
QList<QSharedPointer<CaEntry> > entries; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
173 |
entries.append(resultItem2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
174 |
entries.append(item);//id not specified |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
175 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
176 |
QVERIFY(!service->removeEntries(entries)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
177 |
QSharedPointer<CaEntry> storageItem2 = service->getEntry(resultItem2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
178 |
QVERIFY(storageItem2); // entry present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
179 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
180 |
//cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
181 |
service->removeEntry(*resultItem1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
182 |
service->removeEntry(*resultItem2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
183 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
184 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
185 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
186 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
187 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
188 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
189 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
190 |
void TestCaClient::TestRemoveGroups() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
191 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
192 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
193 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
194 |
group.setText("testName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
195 |
group.setAttribute("attrName1", "attrVal1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
196 |
group.setEntryTypeName("test"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
197 |
group.setFlags(RemovableEntryFlag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
198 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
199 |
QSharedPointer<CaService> service = CaService::instance(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
200 |
QSharedPointer<CaEntry> resultGroup1 = service->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
201 |
QSharedPointer<CaEntry> resultGroup2 = service->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
202 |
QVERIFY(!resultGroup1.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
203 |
QVERIFY(!resultGroup2.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
204 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
205 |
QList<int> ids; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
206 |
ids.append(resultGroup1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
207 |
ids.append(resultGroup2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
208 |
QVERIFY(service->removeEntries(ids)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
209 |
QSharedPointer<CaEntry> storageGroup1 = service->getEntry(resultGroup1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
210 |
QSharedPointer<CaEntry> storageGroup2 = service->getEntry(resultGroup2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
211 |
QVERIFY(storageGroup1.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
212 |
QVERIFY(storageGroup2.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
213 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
214 |
QSharedPointer<CaEntry> resultGroup3 = service->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
215 |
QSharedPointer<CaEntry> resultGroup4 = service->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
216 |
QVERIFY(!resultGroup3.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
217 |
QVERIFY(!resultGroup4.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
218 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
219 |
QList<QSharedPointer<CaEntry> > entries; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
220 |
entries.append(resultGroup3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
221 |
entries.append(resultGroup4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
222 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
223 |
QVERIFY(service->removeEntries(entries)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
224 |
QSharedPointer<CaEntry> storageGroup3 = service->getEntry(resultGroup3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
225 |
QSharedPointer<CaEntry> storageGroup4 = service->getEntry(resultGroup4->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
226 |
QVERIFY(storageGroup3.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
227 |
QVERIFY(storageGroup4.isNull()); // entry not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
228 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
229 |
//cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
230 |
service->removeEntry(*resultGroup1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
231 |
service->removeEntry(*resultGroup2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
232 |
service->removeEntry(*resultGroup3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
233 |
service->removeEntry(*resultGroup4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
234 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
235 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
236 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
237 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
238 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
239 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
240 |
void TestCaClient::TestRemoveGroupsFail() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
241 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
242 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
243 |
QSharedPointer<CaEntry> group(new CaEntry(GroupEntryRole)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
244 |
group->setText("testName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
245 |
group->setAttribute("attrName1", "attrVal1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
246 |
group->setEntryTypeName("test"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
247 |
group->setFlags(RemovableEntryFlag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
248 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
249 |
QSharedPointer<CaService> service = CaService::instance(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
250 |
QSharedPointer<CaEntry> resultGroup1 = service->createEntry(*group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
251 |
QVERIFY(!resultGroup1.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
252 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
253 |
QList<int> ids; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
254 |
ids.append(resultGroup1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
255 |
ids.append(9999);// not present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
256 |
QVERIFY(!service->removeEntries(ids)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
257 |
QSharedPointer<CaEntry> storageGroup1 = service->getEntry(resultGroup1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
258 |
QVERIFY(!storageGroup1.isNull()); // entry present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
259 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
260 |
QSharedPointer<CaEntry> resultGroup2 = service->createEntry(*group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
261 |
QVERIFY(!resultGroup2.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
262 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
263 |
QList< QSharedPointer<CaEntry> > entries; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
264 |
entries.append(resultGroup2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
265 |
entries.append(group);//id not specified |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
266 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
267 |
QVERIFY(!service->removeEntries(entries)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
268 |
QSharedPointer<CaEntry> storageGroup2 = service->getEntry(resultGroup2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
269 |
QVERIFY(!storageGroup2.isNull()); // entry present in the storage |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
270 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
271 |
//cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
272 |
service->removeEntry(*resultGroup1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
273 |
service->removeEntry(*resultGroup2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
274 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
275 |
} |