author | Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com> |
Thu, 16 Sep 2010 12:11:40 +0100 | |
changeset 117 | c63ee96dbe5f |
permissions | -rw-r--r-- |
117
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1 |
/* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2 |
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
3 |
* All rights reserved. |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
4 |
* This component and the accompanying materials are made available |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
5 |
* under the terms of "Eclipse Public License v1.0" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
6 |
* which accompanies this distribution, and is available |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
7 |
* at the URL "http://www.eclipse.org/legal/epl-v10.html". |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
8 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
9 |
* Initial Contributors: |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
10 |
* Nokia Corporation - initial contribution. |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
11 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
12 |
* Contributors: |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
13 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
14 |
* Description: Main test class for hspluginmodel library. |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
15 |
* |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
16 |
*/ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
17 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
18 |
#include <QScopedPointer> |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
19 |
#include <qservicemanager.h> |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
20 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
21 |
#include "t_caclient.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
22 |
#include "caservice.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
23 |
#include "canotifier.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
24 |
#include "canotifierfilter.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
25 |
#include "caquery.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
26 |
#include "t_caclientNotifier.h" |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
27 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
28 |
const int entryIdFake(-1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
29 |
const int waitTime500ms(500); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
30 |
const int waitTime1sec(1000); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
31 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
32 |
QTM_USE_NAMESPACE |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
33 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
34 |
QStringList pluginPaths; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
35 |
QString xmlName("caapphandlerplugin.xml"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
36 |
|
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 |
void TestCaClient::initTestCase() |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
43 |
startThread(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
44 |
#endif //Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
45 |
mService = CaService::instance(); |
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 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
48 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
49 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
50 |
void TestCaClient::cleanupTestCase() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
51 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
52 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
53 |
stopThread(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
54 |
#endif //Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
55 |
QSharedPointer<CaService> serviceNull(NULL); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
56 |
mService = serviceNull; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
57 |
QTest::qWait(5000); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
58 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
59 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
60 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
61 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
62 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
63 |
int threadFunction(void *params) |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
66 |
while (ETrue) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
67 |
User::ResetInactivityTime();//it should help for Viewserver11 panic |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
68 |
User::After(5000000); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
69 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
70 |
#endif //Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
71 |
return 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
72 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
73 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
74 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
75 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
76 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
77 |
void TestCaClient::startThread() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
78 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
79 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
80 |
User::LeaveIfError(iThread.Create( |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
81 |
_L("thread_kill_viewsrv11"), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
82 |
threadFunction, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
83 |
16384, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
84 |
4000, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
85 |
4000, |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
86 |
NULL)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
87 |
iThread.Resume(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
88 |
#endif //Q_OS_SYMBIAN |
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 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
93 |
void TestCaClient::stopThread() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
94 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
95 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
96 |
iThread.Close(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
97 |
#endif //Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
98 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
99 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
100 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
101 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
102 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
103 |
void TestCaClient::TestAssignmentOperatorNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
104 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
105 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
106 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
107 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
108 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
109 |
#endif//Q_OS_SYMBIAN |
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 |
CaNotifierFilter filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
112 |
filter.setEntryRole(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
113 |
filter.setTypeNames(QStringList() << "typeName1" << "typeName2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
114 |
filter.setParentId(22); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
115 |
filter.setIds(QList<int>() << 11 << 22); |
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 |
CaNotifierFilter filterAssign; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
118 |
filterAssign = filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
119 |
QCOMPARE(filterAssign.getEntryRole(), filter.getEntryRole()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
120 |
QCOMPARE(filterAssign.getParentId(), filter.getParentId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
121 |
for (int i(0); i < filter.getIds().count(); i++) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
122 |
QCOMPARE(filterAssign.getIds().at(i), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
123 |
filter.getIds().at(i)); |
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 |
for (int i(0); i < filter.getTypeNames().count(); i++) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
126 |
QCOMPARE(filterAssign.getTypeNames().at(i), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
127 |
filter.getTypeNames().at(i)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
128 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
129 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
130 |
filter.setEntryRole(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
131 |
filter.getTypeNames().clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
132 |
filter.setTypeNames(QStringList() << "typeName3" << "typeName4"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
133 |
filter.setParentId(55); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
134 |
filter.getIds().clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
135 |
filter.setIds(QList<int>() << 33 << 44); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
136 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
137 |
QVERIFY(filterAssign.getEntryRole() != filter.getEntryRole()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
138 |
QVERIFY(filterAssign.getParentId() != filter.getParentId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
139 |
for (int i(0); i < filter.getIds().count(); i++) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
140 |
QVERIFY(filterAssign.getIds().at(i) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
141 |
!= filter.getIds().at(i)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
142 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
143 |
for (int i(0); i < filter.getTypeNames().count(); i++) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
144 |
QVERIFY(filterAssign.getTypeNames().at(i) |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
145 |
!= filter.getTypeNames().at(i)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
146 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
147 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
148 |
CaNotifierFilter filterCopyConstructor(filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
149 |
QCOMPARE(filterCopyConstructor.getEntryRole(), filter.getEntryRole()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
150 |
QCOMPARE(filterCopyConstructor.getParentId(), filter.getParentId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
151 |
for (int i(0); i < filter.getIds().count(); i++) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
152 |
QCOMPARE(filterCopyConstructor.getIds().at(i), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
153 |
filter.getIds().at(i)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
154 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
155 |
for (int i(0); i < filter.getTypeNames().count(); i++) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
156 |
QCOMPARE(filterCopyConstructor.getTypeNames().at(i), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
157 |
filter.getTypeNames().at(i)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
158 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
159 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
160 |
CaQuery query; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
161 |
query.setEntryRoles(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
162 |
query.setEntryTypeNames(QStringList() << "Query1" << "Query2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
163 |
query.setParentId(77); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
164 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
165 |
CaNotifierFilter filterQuery(query); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
166 |
QCOMPARE(filterQuery.getEntryRole(), query.entryRoles()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
167 |
QCOMPARE(filterQuery.getParentId(), query.parentId()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
168 |
QCOMPARE(filterQuery.getIds().count(), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
169 |
for (int i(0); i < query.entryTypeNames().count(); i++) { |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
170 |
QCOMPARE(filterQuery.getTypeNames().at(i), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
171 |
query.entryTypeNames().at(i)); |
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 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
174 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
175 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
176 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
177 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
178 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
179 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
180 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
181 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
182 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
183 |
void TestCaClient::TestAddItemChangeTypeNotifier() |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
186 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
187 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
188 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
189 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
190 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
191 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
192 |
filter->setEntryRole(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
193 |
QStringList strList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
194 |
strList.append("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
195 |
filter->setTypeNames(strList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
196 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
197 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
198 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
199 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
200 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
201 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
202 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
203 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
204 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
205 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
206 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
207 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
208 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
209 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
210 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
211 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
212 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
213 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
214 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
215 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
216 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
217 |
delete filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
218 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
219 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
220 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
221 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
222 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
223 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
224 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
225 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
226 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
227 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
228 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
229 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
230 |
void TestCaClient::TestAddGroupChangeTypeNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
231 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
232 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
233 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
234 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
235 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
236 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
237 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
238 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
239 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
240 |
filter->setEntryRole(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
241 |
filter->setTypeNames(QStringList() << "TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
242 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
243 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
244 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
245 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
246 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
247 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
248 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
249 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
250 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
251 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
252 |
QSharedPointer<CaEntry> entry = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
253 |
QTest::qWait(waitTime1sec); |
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 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
256 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
257 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
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 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
260 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
261 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
262 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
263 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
264 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
265 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
266 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
267 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
268 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
269 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
270 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
271 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
272 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
273 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
274 |
void TestCaClient::TestRemoveEntryChangeTypeNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
275 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
276 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
277 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
278 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
279 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
280 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
281 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
282 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
283 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
284 |
filter->setEntryRole(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
285 |
filter->setTypeNames(QStringList() << "TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
286 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
287 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
288 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
289 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
290 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
291 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
292 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
293 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
294 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
295 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
296 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
297 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
298 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
299 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
300 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
301 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
302 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
303 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
304 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
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 |
int entryId = clientNotifier->mEntryId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
307 |
clientNotifier->mEntryId = 0; |
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 |
bool removed = mService->removeEntry(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
310 |
QTest::qWait(waitTime1sec); |
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 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
313 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
314 |
QCOMPARE(clientNotifier->mEntryId, entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
315 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
316 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
317 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
318 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
319 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
320 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
321 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
322 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
323 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
324 |
mService->removeEntry(entry->id()); |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
327 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
328 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
329 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
330 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
331 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
332 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
333 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
334 |
void TestCaClient::TestRemoveEntryIdChangeTypeNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
335 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
336 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
337 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
338 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
339 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
340 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
341 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
342 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
343 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
344 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
345 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
346 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
347 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
348 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
349 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
350 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
351 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
352 |
filter->setEntryRole(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
353 |
filter->setTypeNames(QStringList() << "TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
354 |
filter->setIds(QList<int>() << entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
355 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
356 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
357 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
358 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
359 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
360 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
361 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
362 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
363 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
364 |
int entryId = entry->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
365 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
366 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
367 |
bool removed = mService->removeEntry(entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
368 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
369 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
370 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
371 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
372 |
QCOMPARE(clientNotifier->mEntryId, entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
373 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
374 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
375 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
376 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
377 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
378 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
379 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
380 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
381 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
382 |
delete filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
383 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
384 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
385 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
386 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
387 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
388 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
389 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
390 |
} |
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 |
void TestCaClient::TestRemoveEntryChangeTypeNotifierFake() |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
396 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
397 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
398 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
399 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
400 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
401 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
402 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
403 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
404 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
405 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
406 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
407 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
408 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
409 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
410 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
411 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
412 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
413 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
414 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
415 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
416 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
417 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
418 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
419 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
420 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
421 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
422 |
CaEntry *entryFake = new CaEntry(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
423 |
entryFake->setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
424 |
entryFake->setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
425 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
426 |
bool removed = mService->removeEntry(*entryFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
427 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
428 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
429 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
430 |
QCOMPARE(removed, FALSE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
431 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
432 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
433 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
434 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
435 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
436 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
437 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
438 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
439 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
440 |
delete entryFake; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
441 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
442 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
443 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
444 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
445 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
446 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
447 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
448 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
449 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
450 |
void TestCaClient::TestRemoveEntryIdChangeTypeNotifierFake() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
451 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
452 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
453 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
454 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
455 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
456 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
457 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
458 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
459 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
460 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
461 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
462 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
463 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
464 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
465 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
466 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
467 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
468 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
469 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
470 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
471 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
472 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
473 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
474 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
475 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
476 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
477 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
478 |
bool removed = mService->removeEntry(entryIdFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
479 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
480 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
481 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
482 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
483 |
QCOMPARE(removed, FALSE); |
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 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
486 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
487 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
488 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
489 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
490 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
491 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
492 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
493 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
494 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
495 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
496 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
497 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
498 |
#endif//Q_OS_SYMBIAN |
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 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
502 |
void TestCaClient::TestRemoveEntriesChangeTypeNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
503 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
504 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
505 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
506 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
507 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
508 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
509 |
{ |
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 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
512 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
513 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
514 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
515 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
516 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
517 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
518 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
519 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
520 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
521 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
522 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
523 |
item3.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
524 |
item3.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
525 |
QSharedPointer<CaEntry> entry3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
526 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
527 |
CaEntry item4; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
528 |
item4.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
529 |
item4.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
530 |
QSharedPointer<CaEntry> entry4 = mService->createEntry(item4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
531 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
532 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
533 |
QList< QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
534 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
535 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
536 |
entriesList.append(entry3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
537 |
entriesList.append(entry4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
538 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
539 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
540 |
filter->setEntryRole(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
541 |
filter->setTypeNames(QStringList() << "TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
542 |
filter->setIds(QList<int>() << entry2->id() << entry3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
543 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
544 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
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 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
547 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
548 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
549 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
550 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
551 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
552 |
clientNotifier->mEntryId = 0; |
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 |
bool removed = mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
555 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
556 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
557 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
558 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
559 |
QCOMPARE(clientNotifier->mEntryId, entry3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
560 |
QCOMPARE(removed, TRUE); |
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 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
563 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
564 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
565 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
566 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
567 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
568 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
569 |
delete filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
570 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
571 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
572 |
entriesList.clear(); |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
575 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
576 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
577 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
578 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
579 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
580 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
581 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
582 |
void TestCaClient::TestRemoveEntriesIdsChangeTypeNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
583 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
584 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
585 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
586 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
587 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
588 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
589 |
{ |
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 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
592 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
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 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
595 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
596 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
597 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
598 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
599 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
600 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
601 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
602 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
603 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
604 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
605 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
606 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
607 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
608 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
609 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
610 |
item3.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
611 |
item3.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
612 |
QSharedPointer<CaEntry> entry3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
613 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
614 |
CaEntry item4; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
615 |
item4.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
616 |
item4.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
617 |
QSharedPointer<CaEntry> entry4 = mService->createEntry(item4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
618 |
QTest::qWait(waitTime1sec); |
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 |
QList<int> entriesIdsList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
621 |
entriesIdsList.append(entry1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
622 |
entriesIdsList.append(entry2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
623 |
entriesIdsList.append(entry3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
624 |
entriesIdsList.append(entry4->id()); |
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 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
627 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
628 |
bool removed = mService->removeEntries(entriesIdsList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
629 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
630 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
631 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
632 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
633 |
QCOMPARE(clientNotifier->mEntryId, entry4->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
634 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
635 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
636 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
637 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
638 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
639 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
640 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
641 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
642 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
643 |
mService->removeEntries(entriesIdsList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
644 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
645 |
entriesIdsList.clear(); |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
648 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
649 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
650 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
651 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
652 |
} |
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 |
void TestCaClient::TestRemoveEntriesChangeTypeNotifierFake() |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
658 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
659 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
660 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
661 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
662 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
663 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
664 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
665 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
666 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
667 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
668 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
669 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
670 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
671 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
672 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
673 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
674 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
675 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
676 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
677 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
678 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
679 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
680 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
681 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
682 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
683 |
item3.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
684 |
item3.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
685 |
QSharedPointer<CaEntry> entry3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
686 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
687 |
CaEntry item4; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
688 |
item4.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
689 |
item4.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
690 |
QSharedPointer<CaEntry> entry4 = mService->createEntry(item4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
691 |
QTest::qWait(waitTime1sec); |
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 |
QList<QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
694 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
695 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
696 |
entriesList.append(entry3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
697 |
entriesList.append(entry4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
698 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
699 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
700 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
701 |
CaEntry itemFake1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
702 |
itemFake1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
703 |
itemFake1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
704 |
QSharedPointer<CaEntry> entryFake1 = mService->createEntry(itemFake1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
705 |
int entryFake1Id = entryFake1->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
706 |
entryFake1->setId(entryIdFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
707 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
708 |
CaEntry itemFake2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
709 |
itemFake2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
710 |
itemFake2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
711 |
QSharedPointer<CaEntry> entryFake2 = mService->createEntry(itemFake2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
712 |
int entryFake2Id = entryFake2->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
713 |
entryFake2->setId(entryIdFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
714 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
715 |
QList<QSharedPointer<CaEntry> > entriesListFake; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
716 |
entriesListFake.append(entryFake1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
717 |
entriesListFake.append(entryFake2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
718 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
719 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
720 |
clientNotifier->mChangeType = AddChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
721 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
722 |
bool removed = mService->removeEntries(entriesListFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
723 |
QTest::qWait(waitTime1sec); |
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 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
726 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
727 |
QCOMPARE(removed, FALSE); |
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 |
entryFake1->setId(entryFake1Id); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
730 |
entryFake2->setId(entryFake2Id); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
731 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
732 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
733 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
734 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
735 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
736 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
737 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
738 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
739 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
740 |
mService->removeEntries(entriesListFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
741 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
742 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
743 |
entriesListFake.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
744 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
745 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
746 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
747 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
748 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
749 |
#endif//Q_OS_SYMBIAN |
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 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
752 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
753 |
void TestCaClient::TestRemoveEntriesIdsChangeTypeNotifierFake() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
754 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
755 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
756 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
757 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
758 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
759 |
#endif//Q_OS_SYMBIAN |
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 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
762 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
763 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
764 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
765 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
766 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
767 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
768 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
769 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
770 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
771 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
772 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
773 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
774 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
775 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
776 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
777 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
778 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
779 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
780 |
item3.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
781 |
item3.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
782 |
QSharedPointer<CaEntry> entry3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
783 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
784 |
CaEntry item4; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
785 |
item4.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
786 |
item4.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
787 |
QSharedPointer<CaEntry> entry4 = mService->createEntry(item4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
788 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
789 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
790 |
QList<int> entriesIdsList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
791 |
entriesIdsList.append(entry1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
792 |
entriesIdsList.append(entry2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
793 |
entriesIdsList.append(entry3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
794 |
entriesIdsList.append(entry4->id()); |
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 |
CaEntry itemFake1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
797 |
itemFake1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
798 |
itemFake1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
799 |
QSharedPointer<CaEntry> entryFake1 = mService->createEntry(itemFake1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
800 |
int entryFake1Id = entryFake1->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
801 |
entryFake1->setId(entryIdFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
802 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
803 |
CaEntry itemFake2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
804 |
itemFake2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
805 |
itemFake2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
806 |
QSharedPointer<CaEntry> entryFake2 = mService->createEntry(itemFake2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
807 |
int entryFake2Id = entryFake2->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
808 |
entryFake2->setId(entryIdFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
809 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
810 |
QList<int> entriesIdsListFake; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
811 |
entriesIdsListFake.append(entryFake1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
812 |
entriesIdsListFake.append(entryFake2->id()); |
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 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
815 |
clientNotifier->mChangeType = AddChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
816 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
817 |
bool removed = mService->removeEntries(entriesIdsListFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
818 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
819 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
820 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
821 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
822 |
QCOMPARE(removed, FALSE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
823 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
824 |
entryFake1->setId(entryFake1Id); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
825 |
entryFake2->setId(entryFake2Id); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
826 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
827 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
828 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
829 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
830 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
831 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
832 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
833 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
834 |
mService->removeEntries(entriesIdsList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
835 |
mService->removeEntry(*entryFake1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
836 |
mService->removeEntry(*entryFake2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
837 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
838 |
entriesIdsList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
839 |
entriesIdsListFake.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
840 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
841 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
842 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
843 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
844 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
845 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
846 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
847 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
848 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
849 |
void TestCaClient::TestRemoveGroupChangeTypeNotifier() |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
852 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
853 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
854 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
855 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
856 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
857 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
858 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
859 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
860 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
861 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
862 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
863 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
864 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
865 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
866 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
867 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
868 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
869 |
QSharedPointer<CaEntry> entry = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
870 |
QTest::qWait(waitTime1sec); |
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 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
873 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
874 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
875 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
876 |
int entryId = clientNotifier->mEntryId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
877 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
878 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
879 |
bool removed = mService->removeEntry(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
880 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
881 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
882 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
883 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
884 |
QCOMPARE(clientNotifier->mEntryId, entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
885 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
886 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
887 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
888 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
889 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
890 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
891 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
892 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
893 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
894 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
895 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
896 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
897 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
898 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
899 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
900 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
901 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
902 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
903 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
904 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
905 |
void TestCaClient::TestRemoveGroupsChangeTypeNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
906 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
907 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
908 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
909 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
910 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
911 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
912 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
913 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
914 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
915 |
CaEntry group1(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
916 |
group1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
917 |
group1.setEntryTypeName("TypeName1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
918 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(group1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
919 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
920 |
CaEntry group2(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
921 |
group2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
922 |
group2.setEntryTypeName("TypeName2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
923 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(group2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
924 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
925 |
CaEntry group3(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
926 |
group3.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
927 |
group3.setEntryTypeName("TypeName3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
928 |
QSharedPointer<CaEntry> entry3 = mService->createEntry(group3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
929 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
930 |
CaEntry group4(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
931 |
group4.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
932 |
group4.setEntryTypeName("TypeName4"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
933 |
QSharedPointer<CaEntry> entry4 = mService->createEntry(group4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
934 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
935 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
936 |
QList< QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
937 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
938 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
939 |
entriesList.append(entry3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
940 |
entriesList.append(entry4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
941 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
942 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
943 |
filter->setEntryRole(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
944 |
filter->setTypeNames(QStringList() << "TypeName3" << "TypeName4"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
945 |
filter->setIds(QList<int>() << entry3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
946 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
947 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
948 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
949 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
950 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
951 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
952 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
953 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
954 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
955 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
956 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
957 |
bool removed = mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
958 |
QTest::qWait(waitTime1sec); |
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 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
961 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
962 |
QCOMPARE(clientNotifier->mEntryId, entry3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
963 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
964 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
965 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
966 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
967 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
968 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
969 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
970 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
971 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
972 |
delete filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
973 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
974 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
975 |
entriesList.clear(); |
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 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
978 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
979 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
980 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
981 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
982 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
983 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
984 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
985 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
986 |
void TestCaClient::TestUpdateChangeTypeNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
987 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
988 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
989 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
990 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
991 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
992 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
993 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
994 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
995 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
996 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
997 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
998 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
999 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1000 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1001 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1002 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1003 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1004 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1005 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1006 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1007 |
item.setDescription("description"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1008 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1009 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1010 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1011 |
QTest::qWait(waitTime1sec); |
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 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1014 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1015 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1016 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1017 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1018 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1019 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1020 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1021 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1022 |
int entryId = clientNotifier->mEntryId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1023 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1024 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1025 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1026 |
filter->setEntryRole(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1027 |
filter->setIds(QList<int>() << entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1028 |
TestCaClientNotifier *clientNotifierUpdate = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1029 |
CaNotifier *notifierUpdate = clientNotifierUpdate->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1030 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1031 |
connect(notifierUpdate, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1032 |
clientNotifierUpdate, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1033 |
connect(notifierUpdate, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1034 |
clientNotifierUpdate, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1035 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1036 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1037 |
bool updated = mService->updateEntry(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1038 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1039 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1040 |
QCOMPARE(clientNotifierUpdate->mChangeType, UpdateChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1041 |
QVERIFY(clientNotifierUpdate->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1042 |
QCOMPARE(clientNotifierUpdate->mEntryId, entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1043 |
QCOMPARE(clientNotifierUpdate->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1044 |
QCOMPARE(clientNotifierUpdate->mEntry->description(), QString("description")); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1045 |
QCOMPARE(updated, TRUE); |
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 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1048 |
disconnect(notifierUpdate, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1049 |
clientNotifierUpdate, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1050 |
disconnect(notifierUpdate, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1051 |
clientNotifierUpdate, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1052 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1053 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1054 |
delete clientNotifierUpdate; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1055 |
delete filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1056 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1057 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1058 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1059 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1060 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1061 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1062 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1063 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1064 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1065 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1066 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1067 |
void TestCaClient::TestUpdateChangeTypeNotifierFake() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1068 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1069 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1070 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1071 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1072 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1073 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1074 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1075 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1076 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1077 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1078 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1079 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1080 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1081 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1082 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1083 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1084 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1085 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1086 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1087 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1088 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1089 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1090 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1091 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1092 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1093 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1094 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1095 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1096 |
int entryId = clientNotifier->mEntryId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1097 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1098 |
CaEntry itemFake; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1099 |
itemFake.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1100 |
itemFake.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1101 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1102 |
bool updated = mService->updateEntry(itemFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1103 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1104 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1105 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1106 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1107 |
QCOMPARE(updated, FALSE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1108 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1109 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1110 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1111 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1112 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1113 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1114 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1115 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1116 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1117 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1118 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1119 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1120 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1121 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1122 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1123 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1124 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1125 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1126 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1127 |
void TestCaClient::TestAddUpdateRemove() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1128 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1129 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1130 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1131 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1132 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1133 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1134 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1135 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1136 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1137 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1138 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1139 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1140 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1141 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1142 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1143 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1144 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1145 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1146 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1147 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1148 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1149 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1150 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1151 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1152 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1153 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1154 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1155 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1156 |
int entryId = clientNotifier->mEntryId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1157 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1158 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1159 |
bool updated = mService->updateEntry(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1160 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1161 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1162 |
QCOMPARE(clientNotifier->mChangeType, UpdateChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1163 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1164 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1165 |
QCOMPARE(updated, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1166 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1167 |
entryId = clientNotifier->mEntryId; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1168 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1169 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1170 |
bool removed = mService->removeEntry(entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1171 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1172 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1173 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1174 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1175 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1176 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1177 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1178 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1179 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1180 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1181 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1182 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1183 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1184 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1185 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1186 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1187 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1188 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1189 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1190 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1191 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1192 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1193 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1194 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1195 |
void TestCaClient::TestRegisterNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1196 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1197 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1198 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1199 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1200 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1201 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1202 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1203 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1204 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1205 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1206 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1207 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1208 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1209 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1210 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1211 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1212 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1213 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1214 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1215 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1216 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(int,ChangeType))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1217 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(CaEntry,ChangeType))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1218 |
QCOMPARE(notifier->receivers(SIGNAL(entryTouched(int))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1219 |
QCOMPARE(notifier->receivers(SIGNAL(groupContentChanged(int))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1220 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1221 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1222 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1223 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1224 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1225 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1226 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1227 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1228 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1229 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1230 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1231 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1232 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(int,ChangeType))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1233 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(CaEntry,ChangeType))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1234 |
QCOMPARE(notifier->receivers(SIGNAL(entryTouched(int))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1235 |
QCOMPARE(notifier->receivers(SIGNAL(groupContentChanged(int))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1236 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1237 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1238 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1239 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1240 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1241 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1242 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1243 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1244 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1245 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1246 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1247 |
void TestCaClient::TestUnregisterNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1248 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1249 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1250 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1251 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1252 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1253 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1254 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1255 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1256 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1257 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1258 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1259 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1260 |
connect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1261 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1262 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1263 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1264 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1265 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1266 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1267 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1268 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1269 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1270 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1271 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1272 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1273 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1274 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1275 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1276 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1277 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1278 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1279 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1280 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1281 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(int,ChangeType))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1282 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(CaEntry,ChangeType))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1283 |
QCOMPARE(notifier->receivers(SIGNAL(entryTouched(int))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1284 |
QCOMPARE(notifier->receivers(SIGNAL(groupContentChanged(int))), 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1285 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1286 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1287 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1288 |
disconnect(notifier, SIGNAL(entryChanged(const CaEntry &,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1289 |
clientNotifier, SLOT(entryChanged(const CaEntry &,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1290 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1291 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1292 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1293 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1294 |
connect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1295 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1296 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1297 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1298 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1299 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1300 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1301 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1302 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(int,ChangeType))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1303 |
QCOMPARE(notifier->receivers(SIGNAL(entryChanged(CaEntry,ChangeType))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1304 |
QCOMPARE(notifier->receivers(SIGNAL(entryTouched(int))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1305 |
QCOMPARE(notifier->receivers(SIGNAL(groupContentChanged(int))), 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1306 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1307 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1308 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1309 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1310 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1311 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1312 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1313 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1314 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1315 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1316 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1317 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1318 |
void TestCaClient::TestTouchEntryNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1319 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1320 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1321 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1322 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1323 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1324 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1325 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1326 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1327 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1328 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1329 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1330 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1331 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1332 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1333 |
filter->setEntryRole(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1334 |
filter->setIds(QList<int>() << entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1335 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1336 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1337 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1338 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1339 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1340 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1341 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1342 |
bool touched = mService->touch(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1343 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1344 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1345 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1346 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1347 |
QCOMPARE(touched, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1348 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1349 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1350 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1351 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1352 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1353 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1354 |
delete filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1355 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1356 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1357 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1358 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1359 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1360 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1361 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1362 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1363 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1364 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1365 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1366 |
void TestCaClient::TestTouchEntryIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1367 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1368 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1369 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1370 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1371 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1372 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1373 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1374 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1375 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1376 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1377 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1378 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1379 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1380 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1381 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1382 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1383 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1384 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1385 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1386 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1387 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1388 |
bool touched = mService->touch(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1389 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1390 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1391 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1392 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1393 |
QCOMPARE(touched, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1394 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1395 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1396 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1397 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1398 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1399 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1400 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1401 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1402 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1403 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1404 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1405 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1406 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1407 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1408 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1409 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1410 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1411 |
void TestCaClient::TestTouchEntryNotifierFake() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1412 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1413 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1414 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1415 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1416 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1417 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1418 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1419 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1420 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1421 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1422 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1423 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1424 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1425 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1426 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1427 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1428 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1429 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1430 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1431 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1432 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1433 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1434 |
CaEntry *entryFake = new CaEntry(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1435 |
entryFake->setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1436 |
entryFake->setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1437 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1438 |
bool touched = mService->touch(*entryFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1439 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1440 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1441 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1442 |
QCOMPARE(touched, FALSE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1443 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1444 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1445 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1446 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1447 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1448 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1449 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1450 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1451 |
delete entryFake; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1452 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1453 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1454 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1455 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1456 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1457 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1458 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1459 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1460 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1461 |
void TestCaClient::TestTouchEntryUidNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1462 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1463 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1464 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1465 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1466 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1467 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1468 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1469 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1470 |
QScopedPointer<TestCaClientNotifier> clientNotifier( |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1471 |
new TestCaClientNotifier(*mService)); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1472 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1473 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1474 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1475 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1476 |
clientNotifier.data(), SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1477 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1478 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1479 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1480 |
item.setEntryTypeName("application"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1481 |
item.setAttribute( |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1482 |
"application:uid", |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1483 |
"-3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1484 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1485 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1486 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1487 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1488 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1489 |
QVERIFY(!entry.isNull()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1490 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1491 |
const int expectedEntryId = entry->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1492 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1493 |
entry->setId(0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1494 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1495 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1496 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1497 |
bool touched = mService->touch(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1498 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1499 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1500 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1501 |
QCOMPARE(clientNotifier->mEntryId, expectedEntryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1502 |
QCOMPARE(touched, true); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1503 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1504 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1505 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1506 |
clientNotifier.data(), SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1507 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1508 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1509 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1510 |
mService->removeEntry(expectedEntryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1511 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1512 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1513 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1514 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1515 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1516 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1517 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1518 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1519 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1520 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1521 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1522 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1523 |
void TestCaClient::TestTouchEntryIdNotifierFake() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1524 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1525 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1526 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1527 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1528 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1529 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1530 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1531 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1532 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1533 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1534 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1535 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1536 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1537 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1538 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1539 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1540 |
QSharedPointer<CaEntry> entry = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1541 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1542 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1543 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1544 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1545 |
QScopedPointer<CaEntry> entryFake(new CaEntry()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1546 |
entryFake->setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1547 |
entryFake->setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1548 |
entryFake->setId(entryIdFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1549 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1550 |
bool touched = mService->touch(*entryFake); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1551 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1552 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1553 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1554 |
QCOMPARE(touched, FALSE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1555 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1556 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1557 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1558 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1559 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1560 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1561 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1562 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1563 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1564 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1565 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1566 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1567 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1568 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1569 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1570 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1571 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1572 |
void TestCaClient::TestTouchGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1573 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1574 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1575 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1576 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1577 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1578 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1579 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1580 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1581 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1582 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1583 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1584 |
connect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1585 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1586 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1587 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1588 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1589 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1590 |
QSharedPointer<CaEntry> entry = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1591 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1592 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1593 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1594 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1595 |
bool touched = mService->touch(*entry); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1596 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1597 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1598 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1599 |
QCOMPARE(clientNotifier->mEntryId, entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1600 |
QCOMPARE(touched, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1601 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1602 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1603 |
disconnect(notifier, SIGNAL(entryTouched(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1604 |
clientNotifier, SLOT(entryTouched(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1605 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1606 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1607 |
mService->removeEntry(entry->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1608 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1609 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1610 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1611 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1612 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1613 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1614 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1615 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1616 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1617 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1618 |
void TestCaClient::TestAppendEntryGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1619 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1620 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1621 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1622 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1623 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1624 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1625 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1626 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1627 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1628 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1629 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1630 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1631 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1632 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1633 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1634 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1635 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1636 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1637 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1638 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1639 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1640 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1641 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1642 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1643 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1644 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1645 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1646 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1647 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1648 |
QSharedPointer<CaEntry> entryI = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1649 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1650 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1651 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1652 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1653 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1654 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1655 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1656 |
bool appended = mService->appendEntryToGroup((CaEntry &)(*entryG), *entryI); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1657 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1658 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1659 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1660 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1661 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1662 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1663 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1664 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1665 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1666 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1667 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1668 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1669 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1670 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1671 |
mService->removeEntry(entryI->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1672 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1673 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1674 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1675 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1676 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1677 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1678 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1679 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1680 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1681 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1682 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1683 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1684 |
void TestCaClient::TestAppendEntryGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1685 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1686 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1687 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1688 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1689 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1690 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1691 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1692 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1693 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1694 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1695 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1696 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1697 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1698 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1699 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1700 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1701 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1702 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1703 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1704 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1705 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1706 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1707 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1708 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1709 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1710 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1711 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1712 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1713 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1714 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1715 |
QSharedPointer<CaEntry> entryI = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1716 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1717 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1718 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1719 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1720 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1721 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1722 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1723 |
bool appended = mService->appendEntryToGroup(((CaEntry &)*entryG).id(), (*entryI).id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1724 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1725 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1726 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1727 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1728 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1729 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1730 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1731 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1732 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1733 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1734 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1735 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1736 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1737 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1738 |
mService->removeEntry(entryI->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1739 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1740 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1741 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1742 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1743 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1744 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1745 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1746 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1747 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1748 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1749 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1750 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1751 |
void TestCaClient::TestAppendEntriesGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1752 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1753 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1754 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1755 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1756 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1757 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1758 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1759 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1760 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1761 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1762 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1763 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1764 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1765 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1766 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1767 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1768 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1769 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1770 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1771 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1772 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1773 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1774 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1775 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1776 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1777 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1778 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1779 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1780 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1781 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1782 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1783 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1784 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1785 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1786 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1787 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1788 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1789 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1790 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1791 |
QList< QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1792 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1793 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1794 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1795 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1796 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1797 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1798 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1799 |
bool appended = mService->appendEntriesToGroup((CaEntry &)*entryGroup, entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1800 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1801 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1802 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1803 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1804 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1805 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1806 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1807 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1808 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1809 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1810 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1811 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1812 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1813 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1814 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1815 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1816 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1817 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1818 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1819 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1820 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1821 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1822 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1823 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1824 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1825 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1826 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1827 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1828 |
void TestCaClient::TestAppendEntriesGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1829 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1830 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1831 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1832 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1833 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1834 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1835 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1836 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1837 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1838 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1839 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1840 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1841 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1842 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1843 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1844 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1845 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1846 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1847 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1848 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1849 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1850 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1851 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1852 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1853 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1854 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1855 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1856 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1857 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1858 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1859 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1860 |
QSharedPointer<CaEntry> entryItem1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1861 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1862 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1863 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1864 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1865 |
QSharedPointer<CaEntry> entryItem2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1866 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1867 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1868 |
QList<int> entriesIdsList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1869 |
entriesIdsList.append(entryItem1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1870 |
entriesIdsList.append(entryItem2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1871 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1872 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1873 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1874 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1875 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1876 |
bool appended = mService->appendEntriesToGroup(((CaEntry &)*entryGroup).id(), entriesIdsList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1877 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1878 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1879 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1880 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1881 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1882 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1883 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1884 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1885 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1886 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1887 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1888 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1889 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1890 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1891 |
mService->removeEntries(entriesIdsList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1892 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1893 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1894 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1895 |
entriesIdsList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1896 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1897 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1898 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1899 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1900 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1901 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1902 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1903 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1904 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1905 |
void TestCaClient::TestPrependEntryGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1906 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1907 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1908 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1909 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1910 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1911 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1912 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1913 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1914 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1915 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1916 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1917 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1918 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1919 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1920 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1921 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1922 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1923 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1924 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1925 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1926 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1927 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1928 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1929 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1930 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1931 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1932 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1933 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1934 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1935 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1936 |
QSharedPointer<CaEntry> entryI = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1937 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1938 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1939 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1940 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1941 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1942 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1943 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1944 |
bool appended = mService->prependEntryToGroup((CaEntry &)(*entryG), *entryI); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1945 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1946 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1947 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1948 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1949 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1950 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1951 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1952 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1953 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1954 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1955 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1956 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1957 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1958 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1959 |
mService->removeEntry(entryI->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1960 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1961 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1962 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1963 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1964 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1965 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1966 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1967 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1968 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1969 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1970 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1971 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1972 |
void TestCaClient::TestPrependEntryGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1973 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1974 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1975 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1976 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1977 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1978 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1979 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1980 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1981 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1982 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1983 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1984 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1985 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1986 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1987 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1988 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1989 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1990 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1991 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1992 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1993 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1994 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1995 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1996 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1997 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1998 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
1999 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2000 |
CaEntry item; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2001 |
item.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2002 |
item.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2003 |
QSharedPointer<CaEntry> entryI = mService->createEntry(item); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2004 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2005 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2006 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2007 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2008 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2009 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2010 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2011 |
bool appended = mService->prependEntryToGroup(((CaEntry &)*entryG).id(), (*entryI).id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2012 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2013 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2014 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2015 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2016 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2017 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2018 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2019 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2020 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2021 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2022 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2023 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2024 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2025 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2026 |
mService->removeEntry(entryI->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2027 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2028 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2029 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2030 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2031 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2032 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2033 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2034 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2035 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2036 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2037 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2038 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2039 |
void TestCaClient::TestPrependEntriesGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2040 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2041 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2042 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2043 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2044 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2045 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2046 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2047 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2048 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2049 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2050 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2051 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2052 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2053 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2054 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2055 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2056 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2057 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2058 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2059 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2060 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2061 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2062 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2063 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2064 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2065 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2066 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2067 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2068 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2069 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2070 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2071 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2072 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2073 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2074 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2075 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2076 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2077 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2078 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2079 |
QList< QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2080 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2081 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2082 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2083 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2084 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2085 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2086 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2087 |
bool appended = mService->prependEntriesToGroup((CaEntry &)*entryGroup, entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2088 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2089 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2090 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2091 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2092 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2093 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2094 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2095 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2096 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2097 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2098 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2099 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2100 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2101 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2102 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2103 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2104 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2105 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2106 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2107 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2108 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2109 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2110 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2111 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2112 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2113 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2114 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2115 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2116 |
void TestCaClient::TestPrependEntriesGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2117 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2118 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2119 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2120 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2121 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2122 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2123 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2124 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2125 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2126 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2127 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2128 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2129 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2130 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2131 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2132 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2133 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2134 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2135 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2136 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2137 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2138 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2139 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2140 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2141 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2142 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2143 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2144 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2145 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2146 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2147 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2148 |
QSharedPointer<CaEntry> entryItem1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2149 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2150 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2151 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2152 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2153 |
QSharedPointer<CaEntry> entryItem2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2154 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2155 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2156 |
QList<int> entriesIdsList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2157 |
entriesIdsList.append(entryItem1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2158 |
entriesIdsList.append(entryItem2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2159 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2160 |
clientNotifier->mChangeType = RemoveChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2161 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2162 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2163 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2164 |
bool appended = mService->prependEntriesToGroup(((CaEntry &)*entryGroup).id(), entriesIdsList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2165 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2166 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2167 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2168 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2169 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2170 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2171 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2172 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2173 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2174 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2175 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2176 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2177 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2178 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2179 |
mService->removeEntries(entriesIdsList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2180 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2181 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2182 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2183 |
entriesIdsList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2184 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2185 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2186 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2187 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2188 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2189 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2190 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2191 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2192 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2193 |
void TestCaClient::TestRemoveEntryGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2194 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2195 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2196 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2197 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2198 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2199 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2200 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2201 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2202 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2203 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2204 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2205 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2206 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2207 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2208 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2209 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2210 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2211 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2212 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2213 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2214 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2215 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2216 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2217 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2218 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2219 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2220 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2221 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2222 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2223 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2224 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2225 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2226 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2227 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2228 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2229 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2230 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2231 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2232 |
QList< QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2233 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2234 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2235 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2236 |
bool appended = mService->appendEntriesToGroup((CaEntry &)*entryGroup, entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2237 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2238 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2239 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2240 |
clientNotifier->mChangeType = AddChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2241 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2242 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2243 |
bool removed = mService->removeEntryFromGroup((CaEntry &)*entryGroup, *entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2244 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2245 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2246 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2247 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2248 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2249 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2250 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2251 |
clientNotifier->mChangeType = AddChangeType; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2252 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2253 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2254 |
removed = mService->removeEntryFromGroup((CaEntry &)*entryGroup, *entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2255 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2256 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2257 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2258 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2259 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2260 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2261 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2262 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2263 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2264 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2265 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2266 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2267 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2268 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2269 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2270 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2271 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2272 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2273 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2274 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2275 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2276 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2277 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2278 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2279 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2280 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2281 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2282 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2283 |
void TestCaClient::TestRemoveEntryGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2284 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2285 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2286 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2287 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2288 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2289 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2290 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2291 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2292 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2293 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2294 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2295 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2296 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2297 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2298 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2299 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2300 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2301 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2302 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2303 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2304 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2305 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2306 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2307 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2308 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2309 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2310 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2311 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2312 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2313 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2314 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2315 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2316 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2317 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2318 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2319 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2320 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2321 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2322 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2323 |
QList< QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2324 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2325 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2326 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2327 |
bool appended = mService->appendEntriesToGroup((CaEntry &)*entryGroup, entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2328 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2329 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2330 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2331 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2332 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2333 |
bool removed = mService->removeEntryFromGroup(entryGroup->id(), entry1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2334 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2335 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2336 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2337 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2338 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2339 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2340 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2341 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2342 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2343 |
removed = mService->removeEntryFromGroup(entryGroup->id(), entry2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2344 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2345 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2346 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2347 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2348 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2349 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2350 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2351 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2352 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2353 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2354 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2355 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2356 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2357 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2358 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2359 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2360 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2361 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2362 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2363 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2364 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2365 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2366 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2367 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2368 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2369 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2370 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2371 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2372 |
void TestCaClient::TestRemoveEntriesGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2373 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2374 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2375 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2376 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2377 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2378 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2379 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2380 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2381 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2382 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2383 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2384 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2385 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2386 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2387 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2388 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2389 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2390 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2391 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2392 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2393 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2394 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2395 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2396 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2397 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2398 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2399 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2400 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2401 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2402 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2403 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2404 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2405 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2406 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2407 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2408 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2409 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2410 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2411 |
QList<QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2412 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2413 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2414 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2415 |
bool appended = mService->appendEntriesToGroup((CaEntry &)*entryGroup, entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2416 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2417 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2418 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2419 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2420 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2421 |
bool removed = mService->removeEntriesFromGroup((CaEntry &)*entryGroup, entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2422 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2423 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2424 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2425 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2426 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2427 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2428 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2429 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2430 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2431 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2432 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2433 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2434 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2435 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2436 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2437 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2438 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2439 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2440 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2441 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2442 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2443 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2444 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2445 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2446 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2447 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2448 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2449 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2450 |
void TestCaClient::TestRemoveEntriesGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2451 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2452 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2453 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2454 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2455 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2456 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2457 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2458 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2459 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2460 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2461 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2462 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2463 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2464 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2465 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2466 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2467 |
QSharedPointer<CaEntry> entryGroup = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2468 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2469 |
int groupId = entryGroup->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2470 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2471 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2472 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2473 |
QCOMPARE(clientNotifier->mEntryId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2474 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2475 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2476 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2477 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2478 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2479 |
item1.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2480 |
item1.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2481 |
QSharedPointer<CaEntry> entry1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2482 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2483 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2484 |
item2.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2485 |
item2.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2486 |
QSharedPointer<CaEntry> entry2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2487 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2488 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2489 |
QList<QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2490 |
entriesList.append(entry1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2491 |
entriesList.append(entry2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2492 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2493 |
bool appended = mService->appendEntriesToGroup((CaEntry &)*entryGroup, entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2494 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2495 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2496 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2497 |
QList<int> entriesIdList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2498 |
entriesIdList.append(entry1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2499 |
entriesIdList.append(entry2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2500 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2501 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2502 |
bool removed = mService->removeEntriesFromGroup(entryGroup->id(), entriesIdList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2503 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2504 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2505 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2506 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2507 |
QCOMPARE(clientNotifier->mGroupId, entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2508 |
QCOMPARE(removed, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2509 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2510 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2511 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2512 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2513 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2514 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2515 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2516 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2517 |
mService->removeEntries(entriesList); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2518 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2519 |
mService->removeEntry(entryGroup->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2520 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2521 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2522 |
entriesIdList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2523 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2524 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2525 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2526 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2527 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2528 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2529 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2530 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2531 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2532 |
void TestCaClient::TestInsertEntryGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2533 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2534 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2535 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2536 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2537 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2538 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2539 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2540 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2541 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2542 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2543 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2544 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2545 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2546 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2547 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2548 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2549 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2550 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2551 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2552 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2553 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2554 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2555 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2556 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2557 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2558 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2559 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2560 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2561 |
item1.setText("Text1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2562 |
item1.setEntryTypeName("TypeName1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2563 |
QSharedPointer<CaEntry> entryI1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2564 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2565 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2566 |
item2.setText("Text2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2567 |
item2.setEntryTypeName("TypeName2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2568 |
QSharedPointer<CaEntry> entryI2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2569 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2570 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2571 |
bool appended = mService->appendEntryToGroup((CaEntry &)(*entryG), *entryI1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2572 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2573 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2574 |
appended = mService->prependEntryToGroup((CaEntry &)(*entryG), *entryI2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2575 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2576 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2577 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2578 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2579 |
item3.setText("Text3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2580 |
item3.setEntryTypeName("TypeName3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2581 |
QSharedPointer<CaEntry> entryI3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2582 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2583 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2584 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2585 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2586 |
bool inserted = mService->insertEntryIntoGroup((CaEntry &)*entryG, *entryI3, entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2587 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2588 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2589 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2590 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2591 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2592 |
QCOMPARE(inserted, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2593 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2594 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2595 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2596 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2597 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2598 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2599 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2600 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2601 |
mService->removeEntry(entryI1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2602 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2603 |
mService->removeEntry(entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2604 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2605 |
mService->removeEntry(entryI3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2606 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2607 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2608 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2609 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2610 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2611 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2612 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2613 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2614 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2615 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2616 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2617 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2618 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2619 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2620 |
void TestCaClient::TestInsertEntryGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2621 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2622 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2623 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2624 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2625 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2626 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2627 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2628 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2629 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2630 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2631 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2632 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2633 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2634 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2635 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2636 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2637 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2638 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2639 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2640 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2641 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2642 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2643 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2644 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2645 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2646 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2647 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2648 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2649 |
item1.setText("Text1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2650 |
item1.setEntryTypeName("TypeName1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2651 |
QSharedPointer<CaEntry> entryI1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2652 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2653 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2654 |
item2.setText("Text2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2655 |
item2.setEntryTypeName("TypeName2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2656 |
QSharedPointer<CaEntry> entryI2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2657 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2658 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2659 |
bool appended = mService->appendEntryToGroup(entryG->id(), entryI1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2660 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2661 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2662 |
appended = mService->prependEntryToGroup(entryG->id(), entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2663 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2664 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2665 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2666 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2667 |
item3.setText("Text3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2668 |
item3.setEntryTypeName("TypeName3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2669 |
QSharedPointer<CaEntry> entryI3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2670 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2671 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2672 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2673 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2674 |
bool inserted = mService->insertEntryIntoGroup(entryG->id(), entryI3->id(), entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2675 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2676 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2677 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2678 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2679 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2680 |
QCOMPARE(inserted, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2681 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2682 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2683 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2684 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2685 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2686 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2687 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2688 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2689 |
mService->removeEntry(entryI1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2690 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2691 |
mService->removeEntry(entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2692 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2693 |
mService->removeEntry(entryI3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2694 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2695 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2696 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2697 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2698 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2699 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2700 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2701 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2702 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2703 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2704 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2705 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2706 |
void TestCaClient::TestInsertEntriesGroupNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2707 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2708 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2709 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2710 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2711 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2712 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2713 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2714 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2715 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2716 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2717 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2718 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2719 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2720 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2721 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2722 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2723 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2724 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2725 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2726 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2727 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2728 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2729 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2730 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2731 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2732 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2733 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2734 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2735 |
item1.setText("Text1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2736 |
item1.setEntryTypeName("TypeName1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2737 |
QSharedPointer<CaEntry> entryI1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2738 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2739 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2740 |
item2.setText("Text2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2741 |
item2.setEntryTypeName("TypeName2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2742 |
QSharedPointer<CaEntry> entryI2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2743 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2744 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2745 |
bool appended = mService->appendEntryToGroup((CaEntry &)(*entryG), *entryI1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2746 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2747 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2748 |
appended = mService->prependEntryToGroup((CaEntry &)(*entryG), *entryI2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2749 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2750 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2751 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2752 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2753 |
item3.setText("Text3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2754 |
item3.setEntryTypeName("TypeName3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2755 |
QSharedPointer<CaEntry> entryI3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2756 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2757 |
CaEntry item4; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2758 |
item4.setText("Text4"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2759 |
item4.setEntryTypeName("TypeName4"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2760 |
QSharedPointer<CaEntry> entryI4 = mService->createEntry(item4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2761 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2762 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2763 |
QList<QSharedPointer<CaEntry> > entriesList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2764 |
entriesList.append(entryI3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2765 |
entriesList.append(entryI4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2766 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2767 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2768 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2769 |
bool inserted = mService->insertEntriesIntoGroup((CaEntry &)*entryG, entriesList, entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2770 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2771 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2772 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2773 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2774 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2775 |
QCOMPARE(inserted, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2776 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2777 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2778 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2779 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2780 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2781 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2782 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2783 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2784 |
mService->removeEntry(entryI1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2785 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2786 |
mService->removeEntry(entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2787 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2788 |
mService->removeEntry(entryI3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2789 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2790 |
mService->removeEntry(entryI4->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2791 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2792 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2793 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2794 |
entriesList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2795 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2796 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2797 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2798 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2799 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2800 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2801 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2802 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2803 |
void TestCaClient::TestInsertEntriesGroupIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2804 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2805 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2806 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2807 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2808 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2809 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2810 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2811 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2812 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2813 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2814 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2815 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2816 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2817 |
CaEntry group(GroupEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2818 |
group.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2819 |
group.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2820 |
QSharedPointer<CaEntry> entryG = mService->createEntry(group); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2821 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2822 |
int groupId = entryG->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2823 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2824 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2825 |
QVERIFY(clientNotifier->mEntryId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2826 |
QCOMPARE(clientNotifier->mEntryId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2827 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2828 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2829 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2830 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2831 |
CaEntry item1; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2832 |
item1.setText("Text1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2833 |
item1.setEntryTypeName("TypeName1"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2834 |
QSharedPointer<CaEntry> entryI1 = mService->createEntry(item1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2835 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2836 |
CaEntry item2; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2837 |
item2.setText("Text2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2838 |
item2.setEntryTypeName("TypeName2"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2839 |
QSharedPointer<CaEntry> entryI2 = mService->createEntry(item2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2840 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2841 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2842 |
bool appended = mService->appendEntryToGroup((CaEntry &)(*entryG), *entryI1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2843 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2844 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2845 |
appended = mService->prependEntryToGroup((CaEntry &)(*entryG), *entryI2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2846 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2847 |
QCOMPARE(appended, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2848 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2849 |
CaEntry item3; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2850 |
item3.setText("Text3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2851 |
item3.setEntryTypeName("TypeName3"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2852 |
QSharedPointer<CaEntry> entryI3 = mService->createEntry(item3); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2853 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2854 |
CaEntry item4; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2855 |
item4.setText("Text4"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2856 |
item4.setEntryTypeName("TypeName4"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2857 |
QSharedPointer<CaEntry> entryI4 = mService->createEntry(item4); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2858 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2859 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2860 |
QList<int> entriesIdsList; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2861 |
entriesIdsList.append(entryI3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2862 |
entriesIdsList.append(entryI4->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2863 |
clientNotifier->mEntryId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2864 |
clientNotifier->mGroupId = 0; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2865 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2866 |
bool inserted = mService->insertEntriesIntoGroup(entryG->id(), entriesIdsList, entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2867 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2868 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2869 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2870 |
QCOMPARE(clientNotifier->mGroupId, groupId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2871 |
QCOMPARE(clientNotifier->mGroupId, entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2872 |
QCOMPARE(inserted, TRUE); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2873 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2874 |
// cleanup |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2875 |
disconnect(notifier, SIGNAL(entryChanged(int,ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2876 |
clientNotifier, SLOT(entryChanged(int,ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2877 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2878 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2879 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2880 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2881 |
mService->removeEntry(entryI1->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2882 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2883 |
mService->removeEntry(entryI2->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2884 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2885 |
mService->removeEntry(entryI3->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2886 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2887 |
mService->removeEntry(entryI4->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2888 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2889 |
mService->removeEntry(entryG->id()); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2890 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2891 |
entriesIdsList.clear(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2892 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2893 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2894 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2895 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2896 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2897 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2898 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2899 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2900 |
// --------------------------------------------------------------------------- |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2901 |
// |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2902 |
void TestCaClient::TestChangeEntryWithParentIdNotifier() |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2903 |
{ |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2904 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2905 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2906 |
// __UHEAP_MARK; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2907 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2908 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2909 |
CaNotifierFilter *filter = new CaNotifierFilter(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2910 |
filter->setParentId(1); // AllCollections |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2911 |
TestCaClientNotifier *clientNotifier = new TestCaClientNotifier(*mService, filter); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2912 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2913 |
CaNotifier *notifier = clientNotifier->getNotifier(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2914 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2915 |
connect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2916 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2917 |
connect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2918 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2919 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2920 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2921 |
CaEntry entryToAdd(ItemEntryRole); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2922 |
entryToAdd.setText("Text"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2923 |
entryToAdd.setEntryTypeName("TypeName"); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2924 |
QSharedPointer<CaEntry> entry = mService->createEntry(entryToAdd); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2925 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2926 |
int entryId = entry->id(); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2927 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2928 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2929 |
QCOMPARE(clientNotifier->mEntryId, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2930 |
QCOMPARE(clientNotifier->mCount, 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2931 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2932 |
bool appended = mService->appendEntryToGroup(3, entryId); // office |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2933 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2934 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2935 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2936 |
QCOMPARE(clientNotifier->mChangeType, AddChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2937 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2938 |
QCOMPARE(clientNotifier->mCount, 1); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2939 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2940 |
mService->removeEntry(entryId); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2941 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2942 |
QTest::qWait(waitTime1sec); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2943 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2944 |
QCOMPARE(clientNotifier->mChangeType, RemoveChangeType); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2945 |
QVERIFY(clientNotifier->mGroupId > 0); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2946 |
QCOMPARE(clientNotifier->mCount, 2); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2947 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2948 |
disconnect(notifier, SIGNAL(entryChanged(int, ChangeType)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2949 |
clientNotifier, SLOT(entryChanged(int, ChangeType))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2950 |
disconnect(notifier, SIGNAL(groupContentChanged(int)), |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2951 |
clientNotifier, SLOT(groupContentChanged(int))); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2952 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2953 |
QTest::qWait(waitTime500ms); |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2954 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2955 |
delete clientNotifier; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2956 |
delete filter; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2957 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2958 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2959 |
#ifdef Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2960 |
#ifdef UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2961 |
// __UHEAP_MARKEND; |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2962 |
#endif//UT_MEMORY_CHECK |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2963 |
#endif//Q_OS_SYMBIAN |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2964 |
} |
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2965 |
|
c63ee96dbe5f
Missing activityfw and taskswitcher components - fix for Bug 3670
Jaakko Haukipuro (Nokia-MS/Oulu) <Jaakko.Haukipuro@nokia.com>
parents:
diff
changeset
|
2966 |
//QTEST_MAIN(homescreen::test::TestCaClient) |