Skip to content

Commit 3274196

Browse files
vivien-applepull[bot]
authored andcommitted
[Darwin] Remove automatically generated tests for Darwin since there are many YAMLs tests now (#14828)
* [Darwin] Remove automatically generated tests for Darwin since there are many YAMLs tests now * Update generated darwin tests
1 parent d1ead82 commit 3274196

File tree

3 files changed

+8
-16611
lines changed

3 files changed

+8
-16611
lines changed

src/darwin/Framework/CHIP/templates/clusters-tests.zapt

-67
Original file line numberDiff line numberDiff line change
@@ -212,71 +212,4 @@ CHIPDevice * GetConnectedDevice(void)
212212

213213
{{>test_cluster tests=(getTests)}}
214214

215-
{{#chip_client_clusters}}
216-
{{#unless (isStrEqual "Test Cluster" name)}}
217-
{{#unless (isStrEqual "Access Control" name)}}
218-
{{#unless (isStrEqual "Basic" name)}}
219-
{{#unless (isStrEqual "Thermostat" name)}}
220-
{{#unless (isStrEqual "OTA Software Update Provider" name)}}
221-
{{#unless (isStrEqual "Network Commissioning" name)}} {{! "Networks" is broken }}
222-
{{#unless (isStrEqual "Application Basic" name)}} {{! "Application App" is broken }}
223-
{{#chip_server_cluster_attributes}}
224-
- (void)testSendCluster{{asUpperCamelCase parent.name}}ReadAttribute{{asUpperCamelCase name}}WithCompletionHandler
225-
{
226-
dispatch_queue_t queue = dispatch_get_main_queue();
227-
228-
XCTestExpectation * connectedExpectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"];
229-
WaitForCommissionee(connectedExpectation, queue);
230-
[self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
231-
232-
CHIPDevice * device = GetConnectedDevice();
233-
CHIP{{asUpperCamelCase parent.name}} * cluster = [[CHIP{{asUpperCamelCase parent.name}} alloc] initWithDevice:device endpoint:{{asExpectedEndpointForCluster (asUpperCamelCase parent.name)}} queue:queue];
234-
XCTAssertNotNil(cluster);
235-
236-
XCTestExpectation * expectation = [self expectationWithDescription:@"{{asUpperCamelCase parent.name}}ReadAttribute{{asUpperCamelCase name}}WithCompletionHandler"];
237-
238-
[cluster readAttribute{{asUpperCamelCase name}}WithCompletionHandler:^({{asObjectiveCClass type parent.name}} * _Nullable value, NSError * _Nullable err) {
239-
NSLog(@"{{asUpperCamelCase parent.name}} {{asUpperCamelCase name}} Error: %@", err);
240-
XCTAssertEqual(err.code, 0);
241-
[expectation fulfill];
242-
}];
243-
244-
[self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
245-
}
246-
247-
{{#if isWritableAttribute}}
248-
- (void)testSendCluster{{asUpperCamelCase parent.name}}WriteAttribute{{asUpperCamelCase name}}WithValue
249-
{
250-
dispatch_queue_t queue = dispatch_get_main_queue();
251-
252-
XCTestExpectation * connectedExpectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"];
253-
WaitForCommissionee(connectedExpectation, queue);
254-
[self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
255-
256-
CHIPDevice * device = GetConnectedDevice();
257-
CHIP{{asUpperCamelCase parent.name}} * cluster = [[CHIP{{asUpperCamelCase parent.name}} alloc] initWithDevice:device endpoint:{{asExpectedEndpointForCluster (asUpperCamelCase parent.name)}} queue:queue];
258-
XCTAssertNotNil(cluster);
259-
260-
XCTestExpectation * expectation = [self expectationWithDescription:@"{{asUpperCamelCase parent.name}}WriteAttribute{{asUpperCamelCase name}}WithValue"];
261-
262-
{{asObjectiveCType type parent.name}} value = {{asTestValue parent.name}};
263-
[cluster writeAttribute{{asUpperCamelCase name}}WithValue:value completionHandler:^(NSError * _Nullable err) {
264-
NSLog(@"{{asUpperCamelCase parent.name}} {{asUpperCamelCase name}} Error: %@", err);
265-
XCTAssertEqual(err.code, 0);
266-
[expectation fulfill];
267-
}];
268-
269-
[self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
270-
}
271-
{{/if}}
272-
{{/chip_server_cluster_attributes}}
273-
{{/unless}}
274-
{{/unless}}
275-
{{/unless}}
276-
{{/unless}}
277-
{{/unless}}
278-
{{/unless}}
279-
{{/unless}}
280-
{{/chip_client_clusters}}
281-
282215
@end

src/darwin/Framework/CHIP/templates/helper.js

+8-57
Original file line numberDiff line numberDiff line change
@@ -25,53 +25,6 @@ const ChipTypesHelper = require('../../../../../src/app/zap-templates/common/Chi
2525
const StringHelper = require('../../../../../src/app/zap-templates/common/StringHelper.js');
2626
const appHelper = require('../../../../../src/app/zap-templates/templates/app/helper.js');
2727

28-
// Ideally those clusters clusters endpoints should be retrieved from the
29-
// descriptor cluster.
30-
function asExpectedEndpointForCluster(clusterName)
31-
{
32-
switch (clusterName) {
33-
case 'AccessControl':
34-
case 'AdministratorCommissioning':
35-
case 'Basic':
36-
case 'Descriptor':
37-
case 'DiagnosticLogs':
38-
case 'GeneralCommissioning':
39-
case 'GeneralDiagnostics':
40-
case 'LocalizationConfiguration':
41-
case 'SoftwareDiagnostics':
42-
case 'ThreadNetworkDiagnostics':
43-
case 'EthernetNetworkDiagnostics':
44-
case 'WiFiNetworkDiagnostics':
45-
case 'GroupKeyManagement':
46-
case 'NetworkCommissioning':
47-
case 'OperationalCredentials':
48-
case 'TimeFormatLocalization':
49-
case 'TrustedRootCertificates':
50-
case 'OtaSoftwareUpdateProvider':
51-
case 'OtaSoftwareUpdateRequestor':
52-
case 'PowerSourceConfiguration':
53-
case 'UnitLocalization':
54-
return 0;
55-
}
56-
return 1;
57-
}
58-
59-
async function asTestValue(cluster, options)
60-
{
61-
if (StringHelper.isOctetString(this.type)) {
62-
return `[@"${"Test".substring(0, this.maxLength)}" dataUsingEncoding:NSUTF8StringEncoding]`;
63-
} else if (StringHelper.isCharString(this.type)) {
64-
return `@"${"Test".substring(0, this.maxLength)}"`;
65-
} else if (this.isArray) {
66-
return '[NSArray array]';
67-
} else if (this.isStruct) {
68-
let ourClass = await asObjectiveCClass.call(this, this.type, cluster, options);
69-
return `[[${ourClass} alloc] init]`;
70-
} else {
71-
return `@(${this.min || this.max || 0})`;
72-
}
73-
}
74-
7528
function asObjectiveCBasicType(type, options)
7629
{
7730
if (StringHelper.isOctetString(type)) {
@@ -200,13 +153,11 @@ function commandHasRequiredField(command)
200153
//
201154
// Module exports
202155
//
203-
exports.asObjectiveCBasicType = asObjectiveCBasicType;
204-
exports.asObjectiveCNumberType = asObjectiveCNumberType;
205-
exports.asExpectedEndpointForCluster = asExpectedEndpointForCluster;
206-
exports.asTestIndex = asTestIndex;
207-
exports.asTestValue = asTestValue;
208-
exports.asObjectiveCClass = asObjectiveCClass;
209-
exports.asObjectiveCType = asObjectiveCType;
210-
exports.asStructPropertyName = asStructPropertyName;
211-
exports.asGetterName = asGetterName;
212-
exports.commandHasRequiredField = commandHasRequiredField;
156+
exports.asObjectiveCBasicType = asObjectiveCBasicType;
157+
exports.asObjectiveCNumberType = asObjectiveCNumberType;
158+
exports.asTestIndex = asTestIndex;
159+
exports.asObjectiveCClass = asObjectiveCClass;
160+
exports.asObjectiveCType = asObjectiveCType;
161+
exports.asStructPropertyName = asStructPropertyName;
162+
exports.asGetterName = asGetterName;
163+
exports.commandHasRequiredField = commandHasRequiredField;

0 commit comments

Comments
 (0)