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: |
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 |
* castoragetestadd.cpp |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
19 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
20 |
* Created on: 2009-08-05 |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
21 |
* Author: michal.czerwiec |
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 |
#include "castoragetest.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
26 |
#include "castoragefactory.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
27 |
#include "castorage.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
28 |
#include "cainnerentry.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
29 |
#include "casqlquery.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
30 |
#include "casqlitestorage.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
31 |
#include "castoragetestsqlcommands.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
32 |
#include "caarraycleanup.inl" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
33 |
#include <QMap> |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
34 |
#include <QString> |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
35 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
36 |
// ============================ MEMBER FUNCTIONS =============================== |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
37 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
38 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
39 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
40 |
// --------------------------------------------------------------------------- |
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 |
void CCAStorageTest::testAdd() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
43 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
44 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
45 |
TInt entryId(0); |
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 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
48 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
49 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
50 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
51 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
52 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
53 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
54 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
55 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
56 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
57 |
); |
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 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
60 |
QVERIFY(entryId > 0); |
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 |
__UHEAP_MARKEND; |
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 |
} |
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 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
68 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
69 |
void CCAStorageTest::testAddEmptyIcon() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
70 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
71 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
72 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
73 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
74 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
75 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
76 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
77 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
78 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
79 |
innerEntry->SetIconDataL(KNullDesC, KNullDesC, KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
80 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
81 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
82 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
83 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
84 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
85 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
86 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
87 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
88 |
} |
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 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
91 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
92 |
void CCAStorageTest::testAddWithIcon() |
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 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
95 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
96 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
97 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
98 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
99 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
100 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
101 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
102 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
103 |
innerEntry->SetIconDataL(_L("qtg_large_applications_user"), KNullDesC, KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
104 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
105 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
106 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
107 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
108 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
109 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
110 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
111 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
112 |
QCOMPARE(err, KErrNone); |
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 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
115 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
116 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
117 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
118 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
119 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
120 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
121 |
// --------------------------------------------------------------------------- |
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 |
void CCAStorageTest::testAddWithExistingIcon() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
124 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
125 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
126 |
TInt entryId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
127 |
TInt iconId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
128 |
TInt entryId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
129 |
TInt iconId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
130 |
TInt countIconsAfterFirstAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
131 |
TInt countIconsAfterSecondAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
132 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
133 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
134 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
135 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
136 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
137 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
138 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
139 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
140 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
141 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
142 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
143 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
144 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
145 |
query->ExecuteL(countIconsAfterFirstAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
146 |
CleanupStack::PopAndDestroy(query); |
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 |
// Add second entry with the some icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
149 |
CCaInnerEntry *innerEntry2 = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
150 |
innerEntry2->SetTextL(KTestName2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
151 |
innerEntry2->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
152 |
innerEntry2->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
153 |
innerEntry2->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
154 |
innerEntry2->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
155 |
mStorage->AddL(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
156 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
157 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
158 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
159 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
160 |
query->ExecuteL(countIconsAfterSecondAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
161 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
162 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
163 |
entryId1 = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
164 |
iconId1 = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
165 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
166 |
entryId2 = innerEntry2->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
167 |
iconId2 = innerEntry2->GetIconId(); |
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 |
CleanupStack::PopAndDestroy(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
170 |
CleanupStack::PopAndDestroy(innerEntry); |
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 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
173 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
174 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
175 |
// No new icon created; Icon which is the same should be shared by newly added entries |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
176 |
QCOMPARE(countIconsAfterFirstAdd, countIconsAfterSecondAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
177 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
178 |
QVERIFY(entryId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
179 |
QVERIFY(iconId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
180 |
QVERIFY(entryId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
181 |
QVERIFY(iconId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
182 |
QVERIFY(!(entryId1 == entryId2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
183 |
QCOMPARE(iconId1, iconId2); |
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 |
__UHEAP_MARKEND; |
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 CCAStorageTest::testAddWithExistingIconOnlyFileName() |
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 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
193 |
TInt entryId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
194 |
TInt iconId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
195 |
TInt entryId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
196 |
TInt iconId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
197 |
TInt countIconsAfterFirstAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
198 |
TInt countIconsAfterSecondAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
199 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
200 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
201 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
202 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
203 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
204 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
205 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
206 |
innerEntry->SetIconDataL(_L("qtg_large_applications_user"), KNullDesC, KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
207 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
208 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
209 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
210 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
211 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
212 |
query->ExecuteL(countIconsAfterFirstAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
213 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
214 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
215 |
// Add second entry with the some icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
216 |
CCaInnerEntry *innerEntry2 = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
217 |
innerEntry2->SetTextL(KTestName2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
218 |
innerEntry2->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
219 |
innerEntry2->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
220 |
innerEntry2->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
221 |
innerEntry2->SetIconDataL(_L("qtg_large_applications_user"), KNullDesC, KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
222 |
mStorage->AddL(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
223 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
224 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
225 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
226 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
227 |
query->ExecuteL(countIconsAfterSecondAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
228 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
229 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
230 |
entryId1 = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
231 |
iconId1 = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
232 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
233 |
entryId2 = innerEntry2->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
234 |
iconId2 = innerEntry2->GetIconId(); |
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 |
CleanupStack::PopAndDestroy(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
237 |
CleanupStack::PopAndDestroy(innerEntry); |
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 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
241 |
QCOMPARE(err, KErrNone); |
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 |
// No new icon created; Icon which is the same should be shared by newly added entries |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
244 |
QCOMPARE(countIconsAfterFirstAdd, countIconsAfterSecondAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
245 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
246 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
247 |
QVERIFY(entryId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
248 |
QVERIFY(iconId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
249 |
QVERIFY(entryId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
250 |
QVERIFY(iconId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
251 |
QVERIFY(!(entryId1 == entryId2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
252 |
QCOMPARE(iconId1, iconId2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
253 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
254 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
255 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
256 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
257 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
258 |
// --------------------------------------------------------------------------- |
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 |
void CCAStorageTest::testAddWithPartlyMatchingIcon() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
261 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
262 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
263 |
TInt entryId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
264 |
TInt iconId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
265 |
TInt entryId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
266 |
TInt iconId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
267 |
TInt countIconsAfterFirstAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
268 |
TInt countIconsAfterSecondAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
269 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
270 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
271 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
272 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
273 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
274 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
275 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
276 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
277 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
278 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
279 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
280 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
281 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
282 |
query->ExecuteL(countIconsAfterFirstAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
283 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
284 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
285 |
// Add second entry with the some icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
286 |
CCaInnerEntry *innerEntry2 = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
287 |
innerEntry2->SetTextL(KTestName2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
288 |
innerEntry2->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
289 |
innerEntry2->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
290 |
innerEntry2->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
291 |
innerEntry2->SetIconDataL(_L("filename"), _L("skinId2"), _L("111111111")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
292 |
mStorage->AddL(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
293 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
294 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
295 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
296 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
297 |
query->ExecuteL(countIconsAfterSecondAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
298 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
299 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
300 |
entryId1 = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
301 |
iconId1 = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
302 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
303 |
entryId2 = innerEntry2->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
304 |
iconId2 = innerEntry2->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
305 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
306 |
CleanupStack::PopAndDestroy(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
307 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
308 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
309 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
310 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
311 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
312 |
// New icon should be added |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
313 |
QCOMPARE(countIconsAfterSecondAdd - countIconsAfterFirstAdd, 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
314 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
315 |
QVERIFY(entryId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
316 |
QVERIFY(iconId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
317 |
QVERIFY(entryId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
318 |
QVERIFY(iconId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
319 |
QVERIFY(!(entryId1 == entryId2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
320 |
QVERIFY(!(iconId1 == iconId2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
321 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
322 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
323 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
324 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
325 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
326 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
327 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
328 |
void CCAStorageTest::testAddWithPartlyMatchingIconNotAllParams() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
329 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
330 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
331 |
TInt entryId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
332 |
TInt iconId1(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
333 |
TInt entryId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
334 |
TInt iconId2(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
335 |
TInt countIconsAfterFirstAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
336 |
TInt countIconsAfterSecondAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
337 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
338 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
339 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
340 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
341 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
342 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
343 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
344 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
345 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
346 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
347 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
348 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
349 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
350 |
query->ExecuteL(countIconsAfterFirstAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
351 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
352 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
353 |
// Add second entry with the some icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
354 |
CCaInnerEntry *innerEntry2 = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
355 |
innerEntry2->SetTextL(KTestName2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
356 |
innerEntry2->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
357 |
innerEntry2->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
358 |
innerEntry2->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
359 |
innerEntry2->SetIconDataL(KNullDesC, _L("skinId"), KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
360 |
mStorage->AddL(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
361 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
362 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
363 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
364 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
365 |
query->ExecuteL(countIconsAfterSecondAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
366 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
367 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
368 |
entryId1 = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
369 |
iconId1 = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
370 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
371 |
entryId2 = innerEntry2->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
372 |
iconId2 = innerEntry2->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
373 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
374 |
CleanupStack::PopAndDestroy(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
375 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
376 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
377 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
378 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
379 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
380 |
// New icon should be added |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
381 |
QCOMPARE(countIconsAfterSecondAdd - countIconsAfterFirstAdd, 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
382 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
383 |
QVERIFY(entryId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
384 |
QVERIFY(iconId1 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
385 |
QVERIFY(entryId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
386 |
QVERIFY(iconId2 > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
387 |
QVERIFY(!(entryId1 == entryId2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
388 |
QVERIFY(!(iconId1 == iconId2)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
389 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
390 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
391 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
392 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
393 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
394 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
395 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
396 |
void CCAStorageTest::testAddWithNotCompleteIcon() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
397 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
398 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
399 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
400 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
401 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
402 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
403 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
404 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
405 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
406 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
407 |
innerEntry->SetIconDataL(_L("fake"), KNullDesC, KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
408 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
409 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
410 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
411 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
412 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
413 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
414 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
415 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
416 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
417 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
418 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
419 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
420 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
421 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
422 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
423 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
424 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
425 |
void CCAStorageTest::testAddUpdateIcon() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
426 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
427 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
428 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
429 |
TInt updatedEntryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
430 |
TInt updatedIconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
431 |
TInt countIconsAfterAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
432 |
TInt countIconsAfterUpdate (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
433 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
434 |
RBuf updatedIconFileName; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
435 |
RBuf updatedIconSkinId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
436 |
RBuf updatedIconAppId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
437 |
TInt updatedIconIdFormIcon(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
438 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
439 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
440 |
updatedIconFileName.CreateL( KMaxFileName ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
441 |
updatedIconSkinId.CreateL( KMaxFileName ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
442 |
updatedIconAppId.CreateL( KMaxUidName ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
443 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
444 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
445 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
446 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
447 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
448 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
449 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
450 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
451 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
452 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
453 |
// Check db after add with icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
454 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
455 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
456 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
457 |
query->ExecuteL(countIconsAfterAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
458 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
459 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
460 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
461 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
462 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
463 |
innerEntry->SetTextL(KTestNameUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
464 |
innerEntry->SetFlags(flagUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
465 |
innerEntry->SetIconDataL( _L("filename2"), _L("skinId2"), _L("537001519")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
466 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
467 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
468 |
// Check db after update with icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
469 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
470 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
471 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
472 |
query->ExecuteL(countIconsAfterUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
473 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
474 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
475 |
updatedEntryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
476 |
updatedIconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
477 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
478 |
updatedIconFileName = innerEntry->Icon()->FileName(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
479 |
updatedIconSkinId= innerEntry->Icon()->SkinId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
480 |
updatedIconAppId = innerEntry->Icon()->ApplicationId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
481 |
updatedIconIdFormIcon = innerEntry->Icon()->Id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
482 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
483 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
484 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
485 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
486 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
487 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
488 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
489 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
490 |
QCOMPARE(updatedEntryId, entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
491 |
QCOMPARE(updatedIconId, iconId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
492 |
QCOMPARE(updatedIconIdFormIcon, updatedIconId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
493 |
QVERIFY(!updatedIconFileName.Compare(_L("filename2"))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
494 |
QVERIFY(!updatedIconSkinId.Compare(_L("skinId2"))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
495 |
QVERIFY(!updatedIconAppId.Compare(_L("537001519"))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
496 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
497 |
// No new icon should be added to DB |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
498 |
QCOMPARE(countIconsAfterAdd, countIconsAfterUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
499 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
500 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
501 |
updatedIconFileName.Close(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
502 |
updatedIconSkinId.Close(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
503 |
updatedIconAppId.Close(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
504 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
505 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
506 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
507 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
508 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
509 |
void CCAStorageTest::testAddUpdateIconOnlyFewParams() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
510 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
511 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
512 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
513 |
TInt updatedEntryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
514 |
TInt updatedIconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
515 |
TInt countIconsAfterAdd (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
516 |
TInt countIconsAfterUpdate (0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
517 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
518 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
519 |
RBuf updatedIconFileName; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
520 |
RBuf updatedIconSkinId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
521 |
RBuf updatedIconAppId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
522 |
TInt updatedIconIdFormIcon(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
523 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
524 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
525 |
updatedIconFileName.CreateL( KMaxFileName ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
526 |
updatedIconSkinId.CreateL( KMaxFileName ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
527 |
updatedIconAppId.CreateL( KMaxUidName ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
528 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
529 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
530 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
531 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
532 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
533 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
534 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
535 |
innerEntry->SetIconDataL(_L("filename"), KNullDesC, _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
536 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
537 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
538 |
// Check db after add with icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
539 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
540 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
541 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
542 |
query->ExecuteL(countIconsAfterAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
543 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
544 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
545 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
546 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
547 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
548 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
549 |
innerEntry->SetTextL(KTestNameUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
550 |
innerEntry->SetFlags(flagUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
551 |
innerEntry->SetIconDataL( _L("filename2"), KNullDesC, _L("537001519")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
552 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
553 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
554 |
// Check db after update with icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
555 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
556 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
557 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
558 |
query->ExecuteL(countIconsAfterUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
559 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
560 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
561 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
562 |
updatedEntryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
563 |
updatedIconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
564 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
565 |
updatedIconFileName = innerEntry->Icon()->FileName(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
566 |
updatedIconSkinId= innerEntry->Icon()->SkinId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
567 |
updatedIconAppId = innerEntry->Icon()->ApplicationId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
568 |
updatedIconIdFormIcon = innerEntry->Icon()->Id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
569 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
570 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
571 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
572 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
573 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
574 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
575 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
576 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
577 |
QCOMPARE(updatedEntryId, entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
578 |
QCOMPARE(updatedIconId, iconId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
579 |
QCOMPARE(updatedIconIdFormIcon, updatedIconId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
580 |
QVERIFY(!updatedIconFileName.Compare(_L("filename2"))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
581 |
QVERIFY(!updatedIconSkinId.Compare(KNullDesC)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
582 |
QVERIFY(!updatedIconAppId.Compare(_L("537001519"))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
583 |
// No new icon should be added to DB |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
584 |
QCOMPARE(countIconsAfterAdd, countIconsAfterUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
585 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
586 |
updatedIconFileName.Close(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
587 |
updatedIconSkinId.Close(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
588 |
updatedIconAppId.Close(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
589 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
590 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
591 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
592 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
593 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
594 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
595 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
596 |
void CCAStorageTest::testAddUpdateWithEmptyIcon() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
597 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
598 |
TInt countIconsAfterAdd(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
599 |
TInt countIconsAfterUpdateWithEmptyIcon(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
600 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
601 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
602 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
603 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
604 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
605 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
606 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
607 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
608 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
609 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
610 |
// Add entry with icon - not null icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
611 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
612 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
613 |
// Check db after add with icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
614 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
615 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
616 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
617 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
618 |
query->ExecuteL(countIconsAfterAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
619 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
620 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
621 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
622 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
623 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
624 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
625 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
626 |
//CCaInnerEntry::TIconAttributes attr; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
627 |
innerEntry->SetTextL(KTestNameUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
628 |
innerEntry->SetFlags(flagUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
629 |
//innerEntry->SetIconId( 0 ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
630 |
innerEntry->SetIconDataL(KNullDesC, KNullDesC, KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
631 |
//attr = innerEntry->GetIcon(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
632 |
// Update entry with empty icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
633 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
634 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
635 |
// Check db after update with empty icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
636 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
637 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
638 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
639 |
query->ExecuteL(countIconsAfterUpdateWithEmptyIcon); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
640 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
641 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
642 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
643 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
644 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
645 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
646 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
647 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
648 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
649 |
// icon should be removed from db because we set params to NULL |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
650 |
QCOMPARE(countIconsAfterAdd - countIconsAfterUpdateWithEmptyIcon, 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
651 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
652 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
653 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
654 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
655 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
656 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
657 |
void CCAStorageTest::testAddUpdateWithEmptyIconAdvanced() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
658 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
659 |
TInt countIconsAfterAdd(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
660 |
TInt countIconsAfterUpdateWithEmptyIcon(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
661 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
662 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
663 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
664 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
665 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
666 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
667 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
668 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
669 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
670 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
671 |
// Add entry with icon - not null icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
672 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
673 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
674 |
CCaInnerEntry *innerEntry2 = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
675 |
innerEntry2->SetTextL(KTestName2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
676 |
innerEntry2->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
677 |
innerEntry2->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
678 |
innerEntry2->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
679 |
innerEntry2->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
680 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
681 |
// Add second entry with the some icon - not null icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
682 |
mStorage->AddL(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
683 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
684 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
685 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
686 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
687 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
688 |
query->ExecuteL(countIconsAfterAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
689 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
690 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
691 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
692 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
693 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
694 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
695 |
innerEntry->SetTextL(KTestNameUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
696 |
innerEntry->SetFlags(flagUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
697 |
//innerEntry->SetIconId( 0 ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
698 |
innerEntry->SetIconDataL(KNullDesC, KNullDesC, KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
699 |
// Update entry with empty icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
700 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
701 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
702 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
703 |
// Check db after update with empty icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
704 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
705 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
706 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
707 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
708 |
query->ExecuteL(countIconsAfterUpdateWithEmptyIcon); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
709 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
710 |
CleanupStack::PopAndDestroy(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
711 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
712 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
713 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
714 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
715 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
716 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
717 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
718 |
// icon shouldn't be removed from db because it is use by other entry |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
719 |
QCOMPARE(countIconsAfterUpdateWithEmptyIcon, countIconsAfterAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
720 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
721 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
722 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
723 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
724 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
725 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
726 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
727 |
void CCAStorageTest::testAddUpdateWithExistingIcon() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
728 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
729 |
TInt countIconsAfterAdd(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
730 |
TInt countIconsAfterUpdateWithEmptyIcon(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
731 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
732 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
733 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
734 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
735 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
736 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
737 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
738 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
739 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
740 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("158321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
741 |
// Add entry with icon - not null icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
742 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
743 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
744 |
CCaInnerEntry *innerEntry2 = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
745 |
innerEntry2->SetTextL(KTestName2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
746 |
innerEntry2->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
747 |
innerEntry2->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
748 |
innerEntry2->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
749 |
innerEntry2->SetIconDataL(_L("filename2"), _L("skinId2"), KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
750 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
751 |
// Add second entry with the some icon - not null icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
752 |
mStorage->AddL(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
753 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
754 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
755 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
756 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
757 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
758 |
query->ExecuteL(countIconsAfterAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
759 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
760 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
761 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
762 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
763 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
764 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
765 |
innerEntry->SetTextL(KTestNameUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
766 |
innerEntry->SetFlags(flagUpdate); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
767 |
//innerEntry->SetIconId( 0 ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
768 |
innerEntry->SetIconDataL(_L("filename2"), _L("skinId2"), KNullDesC); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
769 |
// Update entry with empty icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
770 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
771 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
772 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
773 |
// Check db after update with empty icon |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
774 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
775 |
query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
776 |
query->SetQueryL(KSQLGetIdCountFromIconTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
777 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
778 |
query->ExecuteL(countIconsAfterUpdateWithEmptyIcon); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
779 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
780 |
CleanupStack::PopAndDestroy(innerEntry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
781 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
782 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
783 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
784 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
785 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
786 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
787 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
788 |
// icon shouldn't be removed from db because it is use by other entry |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
789 |
QCOMPARE(countIconsAfterUpdateWithEmptyIcon, countIconsAfterAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
790 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
791 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
792 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
793 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
794 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
795 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
796 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
797 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
798 |
void CCAStorageTest::testAddAttributes() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
799 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
800 |
TInt err(KErrGeneral); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
801 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
802 |
TRAP(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
803 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
804 |
RPointerArray<CCaInnerEntry> innerEntryArray; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
805 |
CleanupResetAndDestroyPushL(innerEntryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
806 |
innerEntryArray.AppendL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
807 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
808 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
809 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
810 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
811 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
812 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
813 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
814 |
innerEntry->AddAttributeL(KAttrName_1, KAttrValue_1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
815 |
innerEntry->AddAttributeL(KAttrName_2, KAttrValue_2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
816 |
innerEntry->AddAttributeL(KAttrName_3, KAttrValue_3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
817 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
818 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
819 |
// check status |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
820 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
821 |
query->SetQueryL(KSQLCheckAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
822 |
query->SetTableType(CCaSqlQuery::EAttributeTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
823 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
824 |
query->BindEntryIdL(innerEntry->GetId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
825 |
RPointerArray<CCaInnerEntry> entryArray; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
826 |
CleanupResetAndDestroyPushL(entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
827 |
TInt count = query->ExecuteL(entryArray, CCaSqlQuery::EAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
828 |
query->CloseStatement(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
829 |
CleanupStack::PopAndDestroy(&entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
830 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
831 |
if (innerEntry->GetId() > 0) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
832 |
if (innerEntry->GetIconId() > 0) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
833 |
if (innerEntry->GetAttributes().Count() == count) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
834 |
err = KErrNone; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
835 |
} else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
836 |
err = KErrArgument; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
837 |
else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
838 |
err = KErrNotFound; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
839 |
else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
840 |
err = KErrNotFound; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
841 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
842 |
if (!err) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
843 |
query->SetQueryL(KSQLGetAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
844 |
query->SetTableType(CCaSqlQuery::EAttributeTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
845 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
846 |
query->BindValuesForAddAttributeL(innerEntry, NULL); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
847 |
query->ExecuteL(innerEntryArray, CCaSqlQuery::EAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
848 |
query->CloseStatement(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
849 |
RCaEntryAttrArray attributes = innerEntry->GetAttributes(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
850 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
851 |
if (!( |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
852 |
(attributes[0])->Name().Compare(KAttrName_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
853 |
&& (attributes[0])->Value().Compare(KAttrValue_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
854 |
&& (attributes[1])->Name().Compare(KAttrName_2) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
855 |
&& (attributes[1])->Value().Compare(KAttrValue_2) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
856 |
&& (attributes[2])->Name().Compare(KAttrName_3) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
857 |
&& (attributes[2])->Value().Compare(KAttrValue_3) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
858 |
)) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
859 |
err = KErrNone; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
860 |
else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
861 |
err = KErrNotSupported; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
862 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
863 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
864 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
865 |
CleanupStack::PopAndDestroy(&innerEntryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
866 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
867 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
868 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
869 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
870 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
871 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
872 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
873 |
void CCAStorageTest::testUpdateAttributes() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
874 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
875 |
TInt err(KErrGeneral); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
876 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
877 |
// TRAP(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
878 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
879 |
RPointerArray<CCaInnerEntry> innerEntryArray; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
880 |
CleanupResetAndDestroyPushL(innerEntryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
881 |
innerEntryArray.AppendL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
882 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
883 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
884 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
885 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
886 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
887 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
888 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
889 |
innerEntry->AddAttributeL(KAttrName_1, KAttrValue_1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
890 |
innerEntry->AddAttributeL(KAttrName_2, KAttrValue_2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
891 |
innerEntry->AddAttributeL(KAttrName_3, KAttrValue_3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
892 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
893 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
894 |
// check status |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
895 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
896 |
query->SetQueryL(KSQLCheckAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
897 |
query->SetTableType(CCaSqlQuery::EAttributeTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
898 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
899 |
query->BindEntryIdL(innerEntry->GetId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
900 |
RPointerArray<CCaInnerEntry> entryArray; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
901 |
CleanupResetAndDestroyPushL(entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
902 |
TInt count = query->ExecuteL(entryArray, CCaSqlQuery::EAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
903 |
query->CloseStatement(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
904 |
CleanupStack::PopAndDestroy(&entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
905 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
906 |
if (innerEntry->GetId() > 0) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
907 |
if (innerEntry->GetIconId() > 0) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
908 |
if (innerEntry->GetAttributes().Count() == count) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
909 |
err = KErrNone; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
910 |
} else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
911 |
err = KErrArgument; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
912 |
else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
913 |
err = KErrNotFound; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
914 |
else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
915 |
err = KErrNotFound; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
916 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
917 |
if (!err) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
918 |
innerEntry->AddAttributeL(KAttrName_2, KAttrName_1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
919 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
920 |
// check status |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
921 |
query->SetQueryL(KSQLCheckAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
922 |
query->SetTableType(CCaSqlQuery::EAttributeTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
923 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
924 |
query->BindEntryIdL(innerEntry->GetId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
925 |
RPointerArray<CCaInnerEntry> entryArray; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
926 |
CleanupResetAndDestroyPushL(entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
927 |
TInt count = query->ExecuteL(entryArray, CCaSqlQuery::EAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
928 |
query->CloseStatement(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
929 |
CleanupStack::PopAndDestroy(&entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
930 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
931 |
RCaEntryAttrArray attributes = innerEntry->GetAttributes(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
932 |
if (innerEntry->GetAttributes().Count() == count) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
933 |
if (!( |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
934 |
(attributes[0])->Name().Compare(KAttrName_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
935 |
&& (attributes[0])->Value().Compare(KAttrValue_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
936 |
&& (attributes[1])->Name().Compare(KAttrName_2) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
937 |
&& (attributes[1])->Value().Compare(KAttrValue_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
938 |
&& (attributes[2])->Name().Compare(KAttrName_3) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
939 |
&& (attributes[2])->Value().Compare(KAttrValue_3) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
940 |
)) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
941 |
innerEntry->RemoveAttributeL(KAttrName_1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
942 |
innerEntry->RemoveAttributeL(KAttrName_2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
943 |
innerEntry->RemoveAttributeL(KAttrName_3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
944 |
query->SetQueryL(KSQLGetAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
945 |
query->SetTableType(CCaSqlQuery::EAttributeTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
946 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
947 |
query->BindValuesForAddAttributeL(innerEntry, NULL); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
948 |
query->ExecuteL(innerEntryArray, CCaSqlQuery::EAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
949 |
query->CloseStatement(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
950 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
951 |
RCaEntryAttrArray newAttributes = innerEntry->GetAttributes(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
952 |
if (!( |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
953 |
(newAttributes[0])->Name().Compare(KAttrName_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
954 |
&& (newAttributes[0])->Value().Compare(KAttrValue_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
955 |
&& (newAttributes[1])->Name().Compare(KAttrName_2) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
956 |
&& (newAttributes[1])->Value().Compare(KAttrValue_1) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
957 |
&& (newAttributes[2])->Name().Compare(KAttrName_3) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
958 |
&& (newAttributes[2])->Value().Compare(KAttrValue_3) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
959 |
)) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
960 |
err = KErrNone; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
961 |
else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
962 |
err = KErrNotSupported; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
963 |
} else { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
964 |
err = KErrNotReady; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
965 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
966 |
} else |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
967 |
err = KErrNotReady; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
968 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
969 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
970 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
971 |
CleanupStack::PopAndDestroy(&innerEntryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
972 |
// ); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
973 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
974 |
QCOMPARE(err, KErrNone); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
975 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
976 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
977 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
978 |
void CCAStorageTest::testDeleteAttributes() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
979 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
980 |
TInt entryId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
981 |
TInt iconId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
982 |
TInt attributesACount(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
983 |
TInt queryAResultCount(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
984 |
TInt attributesBCount(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
985 |
TInt queryBResultCount(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
986 |
__UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
987 |
TRAPD(err, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
988 |
// A query section starts |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
989 |
CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
990 |
innerEntry->SetTextL(KTestName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
991 |
innerEntry->SetEntryTypeNameL(KTypeName); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
992 |
innerEntry->SetFlags(flag); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
993 |
innerEntry->SetRole(CCaInnerQuery::Group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
994 |
innerEntry->SetIconDataL(_L("filename"), _L("skinId"), _L("268458321")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
995 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
996 |
innerEntry->AddAttributeL(KAttrName_1, KAttrValue_1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
997 |
innerEntry->AddAttributeL(KAttrName_2, KAttrValue_2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
998 |
innerEntry->AddAttributeL(KAttrName_3, KAttrValue_3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
999 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1000 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1001 |
// check status |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1002 |
CCaSqlQuery *query = CCaSqlQuery::NewLC(((CCaSqLiteStorage *)mStorage)->iSqlDb); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1003 |
query->SetQueryL(KSQLCheckAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1004 |
query->SetTableType(CCaSqlQuery::EAttributeTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1005 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1006 |
query->BindEntryIdL(innerEntry->GetId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1007 |
RPointerArray<CCaInnerEntry> entryArray; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1008 |
CleanupResetAndDestroyPushL(entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1009 |
queryAResultCount = query->ExecuteL(entryArray, CCaSqlQuery::EAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1010 |
query->CloseStatement(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1011 |
CleanupStack::PopAndDestroy(&entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1012 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1013 |
if (!err) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1014 |
entryId = innerEntry->GetId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1015 |
iconId = innerEntry->GetIconId(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1016 |
attributesACount = innerEntry->GetAttributes().Count(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1017 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1018 |
// B query section starts |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1019 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1020 |
innerEntry->RemoveAttributeL(KAttrName_1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1021 |
innerEntry->RemoveAttributeL(KAttrName_2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1022 |
innerEntry->RemoveAttributeL(KAttrName_3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1023 |
mStorage->AddL(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1024 |
// check status |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1025 |
query->SetQueryL(KSQLCheckAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1026 |
query->SetTableType(CCaSqlQuery::EAttributeTable); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1027 |
query->PrepareL(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1028 |
query->BindEntryIdL(innerEntry->GetId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1029 |
RPointerArray<CCaInnerEntry> entryArray; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1030 |
CleanupResetAndDestroyPushL(entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1031 |
queryBResultCount= query->ExecuteL(entryArray, CCaSqlQuery::EAttribute); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1032 |
query->CloseStatement(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1033 |
CleanupStack::PopAndDestroy(&entryArray); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1034 |
attributesBCount = innerEntry->GetAttributes().Count(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1035 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1036 |
CleanupStack::PopAndDestroy(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1037 |
CleanupStack::PopAndDestroy(innerEntry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1038 |
); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1039 |
__UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1040 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1041 |
QVERIFY(entryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1042 |
QVERIFY(iconId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1043 |
QCOMPARE(queryAResultCount, attributesACount); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1044 |
QCOMPARE(queryBResultCount, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1045 |
QCOMPARE(queryBResultCount, attributesBCount); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1046 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1047 |
// end of file |