Skip to content

Commit 1d170a5

Browse files
TakayukiHoshi1984TakayukiHoshi1984
authored
Merge pull request #240 from TakayukiHoshi1984/bugfix_xctest_event
Bugfix xctest event
2 parents 06871ba + ad23e5b commit 1d170a5

35 files changed

Lines changed: 542 additions & 384 deletions

‎dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestBatteryProfile.m‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@
1010
#import "DeviceTestPlugin.h"
1111
#import "TestBatteryProfile.h"
1212

13+
1314
const double TestBatteryChargingTime = 50000.0;
1415
const double TestBatteryDischargingTime = 10000.0;
1516
const double TestBatteryLevel = 0.5;
1617
const BOOL TestBatteryCharging = NO;
17-
1818
@implementation TestBatteryProfile
19-
2019
- (id) init {
2120
self = [super init];
2221

2322
if (self) {
24-
2523
__weak TestBatteryProfile *weakSelf = self;
2624

2725
// API登録(didReceiveGetAllRequest相当)
@@ -108,24 +106,22 @@ - (id) init {
108106
[self addPutPath: putOnChargingChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
109107

110108
NSString *serviceId = [request serviceId];
111-
NSString *sessionKey = [request sessionKey];
109+
NSString *accessToken = [request accessToken];
112110

113-
CheckDIDAndSK(response, serviceId, sessionKey) {
111+
CheckDIDAndSK(response, serviceId, accessToken) {
114112
response.result = DConnectMessageResultTypeOk;
115-
116113
DConnectMessage *event = [DConnectMessage message];
117-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
114+
[event setString:accessToken forKey:DConnectMessageAccessToken];
118115
[event setString:serviceId forKey:DConnectMessageServiceId];
119116
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
120117
[event setString:DConnectBatteryProfileAttrOnChargingChange forKey:DConnectMessageAttribute];
121118

122119
DConnectMessage *battery = [DConnectMessage message];
123120
[DConnectBatteryProfile setCharging:TestBatteryCharging target:battery];
124-
125121
[DConnectBatteryProfile setBattery:battery target:event];
126122
[weakSelf.plugin asyncSendEvent:event];
127123
}
128-
124+
129125
return YES;
130126
}];
131127

@@ -135,13 +131,12 @@ - (id) init {
135131
[self addPutPath: putOnBatteryChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
136132

137133
NSString *serviceId = [request serviceId];
138-
NSString *sessionKey = [request sessionKey];
139-
140-
CheckDIDAndSK(response, serviceId, sessionKey) {
134+
NSString *accessToken = [request accessToken];
135+
CheckDIDAndSK(response, serviceId, accessToken) {
141136
response.result = DConnectMessageResultTypeOk;
142137

143138
DConnectMessage *event = [DConnectMessage message];
144-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
139+
[event setString:accessToken forKey:DConnectMessageAccessToken];
145140
[event setString:serviceId forKey:DConnectMessageServiceId];
146141
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
147142
[event setString:DConnectBatteryProfileAttrOnBatteryChange forKey:DConnectMessageAttribute];
@@ -165,9 +160,9 @@ - (id) init {
165160
[self addDeletePath: deleteOnChargingChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
166161

167162
NSString *serviceId = [request serviceId];
168-
NSString *sessionKey = [request sessionKey];
163+
NSString *accessToken = [request accessToken];
169164

170-
CheckDIDAndSK(response, serviceId, sessionKey) {
165+
CheckDIDAndSK(response, serviceId, accessToken) {
171166
response.result = DConnectMessageResultTypeOk;
172167
}
173168

@@ -179,9 +174,8 @@ - (id) init {
179174
[self addDeletePath: deleteOnBatteryChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
180175

181176
NSString *serviceId = [request serviceId];
182-
NSString *sessionKey = [request sessionKey];
183-
184-
CheckDIDAndSK(response, serviceId, sessionKey) {
177+
NSString *accessToken = [request accessToken];
178+
CheckDIDAndSK(response, serviceId, accessToken) {
185179
response.result = DConnectMessageResultTypeOk;
186180
}
187181

‎dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestConnectionProfile.m‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ - (id) init {
153153
[self addPutPath: putOnWifiChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
154154

155155
NSString *serviceId = [request serviceId];
156-
NSString *sessionKey = [request sessionKey];
156+
NSString *accessToken = [request accessToken];
157157

158-
CheckDIDAndSK(response, serviceId, sessionKey) {
158+
CheckDIDAndSK(response, serviceId, accessToken) {
159159
response.result = DConnectMessageResultTypeOk;
160160

161161
DConnectMessage *event = [DConnectMessage message];
162-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
162+
[event setString:accessToken forKey:DConnectMessageAccessToken];
163163
[event setString:serviceId forKey:DConnectMessageServiceId];
164164
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
165165
[event setString:DConnectConnectionProfileAttrOnWifiChange forKey:DConnectMessageAttribute];
@@ -181,13 +181,13 @@ - (id) init {
181181
[self addPutPath: putOnBluetoothChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
182182

183183
NSString *serviceId = [request serviceId];
184-
NSString *sessionKey = [request sessionKey];
184+
NSString *accessToken = [request accessToken];
185185

186-
CheckDIDAndSK(response, serviceId, sessionKey) {
186+
CheckDIDAndSK(response, serviceId, accessToken) {
187187
response.result = DConnectMessageResultTypeOk;
188188

189189
DConnectMessage *event = [DConnectMessage message];
190-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
190+
[event setString:accessToken forKey:DConnectMessageAccessToken];
191191
[event setString:serviceId forKey:DConnectMessageServiceId];
192192
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
193193
[event setString:DConnectConnectionProfileAttrOnBluetoothChange forKey:DConnectMessageAttribute];
@@ -209,13 +209,13 @@ - (id) init {
209209
[self addPutPath: putOnBLEChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
210210

211211
NSString *serviceId = [request serviceId];
212-
NSString *sessionKey = [request sessionKey];
212+
NSString *accessToken = [request accessToken];
213213

214-
CheckDIDAndSK(response, serviceId, sessionKey) {
214+
CheckDIDAndSK(response, serviceId, accessToken) {
215215
response.result = DConnectMessageResultTypeOk;
216216

217217
DConnectMessage *event = [DConnectMessage message];
218-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
218+
[event setString:accessToken forKey:DConnectMessageAccessToken];
219219
[event setString:serviceId forKey:DConnectMessageServiceId];
220220
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
221221
[event setString:DConnectConnectionProfileAttrOnBLEChange forKey:DConnectMessageAttribute];
@@ -237,13 +237,13 @@ - (id) init {
237237
[self addPutPath: putOnNFCChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
238238

239239
NSString *serviceId = [request serviceId];
240-
NSString *sessionKey = [request sessionKey];
240+
NSString *accessToken = [request accessToken];
241241

242-
CheckDIDAndSK(response, serviceId, sessionKey) {
242+
CheckDIDAndSK(response, serviceId, accessToken) {
243243
response.result = DConnectMessageResultTypeOk;
244244

245245
DConnectMessage *event = [DConnectMessage message];
246-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
246+
[event setString:accessToken forKey:DConnectMessageAccessToken];
247247
[event setString:serviceId forKey:DConnectMessageServiceId];
248248
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
249249
[event setString:DConnectConnectionProfileAttrOnNFCChange forKey:DConnectMessageAttribute];
@@ -338,9 +338,9 @@ - (id) init {
338338
[self addDeletePath: deleteOnWifiChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
339339

340340
NSString *serviceId = [request serviceId];
341-
NSString *sessionKey = [request sessionKey];
341+
NSString *accessToken = [request accessToken];
342342

343-
CheckDIDAndSK(response, serviceId, sessionKey) {
343+
CheckDIDAndSK(response, serviceId, accessToken) {
344344
response.result = DConnectMessageResultTypeOk;
345345
}
346346

@@ -353,9 +353,9 @@ - (id) init {
353353
[self addDeletePath: deleteOnBluetoothChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
354354

355355
NSString *serviceId = [request serviceId];
356-
NSString *sessionKey = [request sessionKey];
356+
NSString *accessToken = [request accessToken];
357357

358-
CheckDIDAndSK(response, serviceId, sessionKey) {
358+
CheckDIDAndSK(response, serviceId, accessToken) {
359359
response.result = DConnectMessageResultTypeOk;
360360
}
361361

@@ -368,9 +368,9 @@ - (id) init {
368368
[self addDeletePath: deleteOnBLEChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
369369

370370
NSString *serviceId = [request serviceId];
371-
NSString *sessionKey = [request sessionKey];
371+
NSString *accessToken = [request accessToken];
372372

373-
CheckDIDAndSK(response, serviceId, sessionKey) {
373+
CheckDIDAndSK(response, serviceId, accessToken) {
374374
response.result = DConnectMessageResultTypeOk;
375375
}
376376
return YES;
@@ -382,9 +382,9 @@ - (id) init {
382382
[self addDeletePath: deleteOnNFCChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
383383

384384
NSString *serviceId = [request serviceId];
385-
NSString *sessionKey = [request sessionKey];
385+
NSString *accessToken = [request accessToken];
386386

387-
CheckDIDAndSK(response, serviceId, sessionKey) {
387+
CheckDIDAndSK(response, serviceId, accessToken) {
388388
response.result = DConnectMessageResultTypeOk;
389389
}
390390
return YES;

‎dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestDeviceOrientationProfile.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ - (id) init {
4040
[self addPutPath: putOnDeviceOrientationRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
4141

4242
NSString *serviceId = [request serviceId];
43-
NSString *sessionKey = [request sessionKey];
43+
NSString *accessToken = [request accessToken];
4444

45-
CheckDIDAndSK(response, serviceId, sessionKey) {
45+
CheckDIDAndSK(response, serviceId, accessToken) {
4646
response.result = DConnectMessageResultTypeOk;
4747

4848
DConnectMessage *event = [DConnectMessage message];
49-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
49+
[event setString:accessToken forKey:DConnectMessageAccessToken];
5050
[event setString:serviceId forKey:DConnectMessageServiceId];
5151
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
5252
[event setString:DConnectDeviceOrientationProfileAttrOnDeviceOrientation
@@ -65,9 +65,9 @@ - (id) init {
6565
[self addDeletePath: deleteOnDeviceOrientationRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
6666

6767
NSString *serviceId = [request serviceId];
68-
NSString *sessionKey = [request sessionKey];
68+
NSString *accessToken = [request accessToken];
6969

70-
CheckDIDAndSK(response, serviceId, sessionKey) {
70+
CheckDIDAndSK(response, serviceId, accessToken) {
7171
response.result = DConnectMessageResultTypeOk;
7272
}
7373

‎dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestFileDescriptorProfile.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ - (id) init {
117117
[self addPutPath: putOnWatchFileRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
118118

119119
NSString *serviceId = [request serviceId];
120-
NSString *sessionKey = [request sessionKey];
120+
NSString *accessToken = [request accessToken];
121121

122-
CheckDIDAndSK(response, serviceId, sessionKey) {
122+
CheckDIDAndSK(response, serviceId, accessToken) {
123123
response.result = DConnectMessageResultTypeOk;
124124

125125
DConnectMessage *event = [DConnectMessage message];
126126
[event setString:serviceId forKey:DConnectMessageServiceId];
127-
[event setString:sessionKey forKey:DConnectMessageSessionKey];
127+
[event setString:accessToken forKey:DConnectMessageAccessToken];
128128
[event setString:weakSelf.profileName forKey:DConnectMessageProfile];
129129
[event setString:DConnectFileDescriptorProfileAttrOnWatchFile forKey:DConnectMessageAttribute];
130130

@@ -143,9 +143,9 @@ - (id) init {
143143
[self addDeletePath: deleteOnWatchFileRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
144144

145145
NSString *serviceId = [request serviceId];
146-
NSString *sessionKey = [request sessionKey];
146+
NSString *accessToken = [request accessToken];
147147

148-
CheckDIDAndSK(response, serviceId, sessionKey) {
148+
CheckDIDAndSK(response, serviceId, accessToken) {
149149
response.result = DConnectMessageResultTypeOk;
150150
}
151151

‎dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestFileProfile.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ - (id) init {
3737
// API登録(didReceiveGetReceiveRequest相当)
3838
NSString *getReceiveRequestApiPath =
3939
[self apiPath: nil
40-
attributeName: DConnectFileProfileAttrReceive];
40+
attributeName: nil];
4141
[self addGetPath: getReceiveRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
4242

4343
NSString *serviceId = request.serviceId;
@@ -92,7 +92,7 @@ - (id) init {
9292
// API登録(didReceivePostSendRequest相当)
9393
NSString *postSendRequestApiPath =
9494
[self apiPath: nil
95-
attributeName: DConnectFileProfileAttrSend];
95+
attributeName: nil];
9696
[self addPostPath: postSendRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
9797

9898
NSData *data = [DConnectFileProfile dataFromRequest:request];
@@ -120,7 +120,7 @@ - (id) init {
120120
// API登録(didReceiveDeleteRemoveRequest相当)
121121
NSString *deleteRemoveRequestApiPath =
122122
[self apiPath: nil
123-
attributeName: DConnectFileProfileAttrRemove];
123+
attributeName: nil];
124124
[self addDeletePath: deleteRemoveRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
125125

126126
NSString *serviceId = [request serviceId];

‎dConnectDevicePlugin/dConnectDeviceTest/dConnectDeviceTest/Classes/Profile/TestMediaPlayerProfile.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,13 @@ - (id) init {
286286
[self addPutPath: putOnStatusChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
287287

288288
NSString *serviceId = [request serviceId];
289-
NSString *sessionkey = [request sessionKey];
289+
NSString *sessionkey = [request accessToken];
290290

291291
CheckDIDAndSK(response, serviceId, sessionkey) {
292292
response.result = DConnectMessageResultTypeOk;
293293

294294
DConnectMessage *event = [DConnectMessage message];
295-
[event setString:sessionkey forKey:DConnectMessageSessionKey];
295+
[event setString:sessionkey forKey:DConnectMessageAccessToken];
296296
[event setString:serviceId forKey:DConnectMessageServiceId];
297297
[event setString:[weakSelf profileName] forKey:DConnectMessageProfile];
298298
[event setString:DConnectMediaPlayerProfileAttrOnStatusChange forKey:DConnectMessageAttribute];
@@ -367,7 +367,7 @@ - (id) init {
367367
[self addDeletePath: deleteOnStatusChangeRequestApiPath api: ^BOOL(DConnectRequestMessage *request, DConnectResponseMessage *response) {
368368

369369
NSString *serviceId = [request serviceId];
370-
NSString *sessionkey = [request sessionKey];
370+
NSString *sessionkey = [request accessToken];
371371

372372
CheckDIDAndSK(response, serviceId, sessionkey) {
373373
response.result = DConnectMessageResultTypeOk;

0 commit comments

Comments
 (0)