1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
From d3ba6d4c19ca0b1081fbafc757d3c496cc21ada2 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Sun, 15 Oct 2023 18:34:07 +0200
Subject: [PATCH 01/10] Port QSignalSpys to PMF syntax
---
tests/oauth2plugintest.cpp | 86 ++++++++++++++++----------------------
1 file changed, 37 insertions(+), 49 deletions(-)
diff --git a/tests/oauth2plugintest.cpp b/tests/oauth2plugintest.cpp
index 94e5c43..b257dc7 100644
--- a/tests/oauth2plugintest.cpp
+++ b/tests/oauth2plugintest.cpp
@@ -244,7 +244,7 @@ void OAuth2PluginTest::testPluginCancel()
m_testPlugin->cancel();
//then real cancel
- QSignalSpy pluginError(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
+ QSignalSpy pluginError(m_testPlugin, &Plugin::error);
OAuth2PluginData userAgentData;
userAgentData.setHost("https://localhost");
@@ -435,11 +435,10 @@ void OAuth2PluginTest::testPluginProcess()
QFETCH(QVariantMap, response);
QFETCH(QVariantMap, stored);
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
+ QSignalSpy store(m_testPlugin, &Plugin::store);
m_testPlugin->process(sessionData, mechanism);
if (errorCode < 0) {
@@ -696,11 +695,10 @@ void OAuth2PluginTest::testPluginHmacSha1Process()
QFETCH(QVariantMap, response);
QFETCH(QVariantMap, stored);
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
+ QSignalSpy store(m_testPlugin, &Plugin::store);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -777,11 +775,10 @@ void OAuth2PluginTest::testPluginUseragentUserActionFinished()
QStringList scopes = QStringList() << "scope1" << "scope2";
data.setScope(scopes);
- QSignalSpy resultSpy(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
- QSignalSpy store(m_testPlugin, SIGNAL(store(const SignOn::SessionData&)));
+ QSignalSpy resultSpy(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
+ QSignalSpy store(m_testPlugin, &Plugin::store);
m_testPlugin->process(data, QString("user_agent"));
@@ -1286,10 +1283,9 @@ void OAuth2PluginTest::testPluginWebserverUserActionFinished()
data.setScope(QStringList() << "one" << "two" << "three");
data.setDisableStateParameter(disableStateParameter);
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -1362,9 +1358,8 @@ void OAuth2PluginTest::testUserActionFinishedErrors()
data.setClientSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj");
data.setRedirectUri("http://localhost/resp.html");
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
m_testPlugin->process(data, QString("web_server"));
QTRY_COMPARE(userActionRequired.count(), 1);
@@ -1486,10 +1481,9 @@ void OAuth2PluginTest::testOauth1UserActionFinished()
data.setConsumerSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj");
data.setRealm("MyHost");
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -1610,9 +1604,8 @@ void OAuth2PluginTest::testOAuth2Errors()
data.setClientSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj");
data.setRedirectUri("http://localhost/resp.html");
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -1683,8 +1676,8 @@ void OAuth2PluginTest::testRefreshToken()
SignOn::UiSessionData info;
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -1766,9 +1759,8 @@ void OAuth2PluginTest::testRefreshTokenError()
SignOn::UiSessionData info;
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -1842,10 +1834,9 @@ void OAuth2PluginTest::testClientAuthentication()
data.setRedirectUri("http://localhost/resp.html");
data.setForceClientAuthViaRequestBody(forceAuthViaRequestBody);
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -1908,10 +1899,9 @@ void OAuth2PluginTest::testTokenPath()
data.setClientId("104660106251471");
data.setRedirectUri("http://localhost/resp.html");
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
TestNetworkAccessManager *nam = new TestNetworkAccessManager;
m_testPlugin->m_networkAccessManager = nam;
@@ -1995,10 +1985,9 @@ void OAuth2PluginTest::testTokenQuery()
data.setClientId("104660106251471");
data.setRedirectUri("http://localhost/resp.html");
- QSignalSpy result(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)));
- QSignalSpy error(m_testPlugin, SIGNAL(error(const SignOn::Error &)));
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy result(m_testPlugin, &Plugin::result);
+ QSignalSpy error(m_testPlugin, &Plugin::error);
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
QScopedPointer<TestNetworkAccessManager> nam(new TestNetworkAccessManager);
m_testPlugin->m_networkAccessManager = nam.data();
@@ -2062,8 +2051,7 @@ void OAuth2PluginTest::testOAuth2AuthRequestUri()
QFETCH(QVariantMap, sessionData);
QFETCH(QString, expectedUri);
- QSignalSpy userActionRequired(m_testPlugin,
- SIGNAL(userActionRequired(const SignOn::UiSessionData&)));
+ QSignalSpy userActionRequired(m_testPlugin, &Plugin::userActionRequired);
m_testPlugin->process(sessionData, mechanism);
QCOMPARE(userActionRequired.count(), 1);
--
2.43.0
|
GitWeb