From aa0d686d68c069c1c618b9b3fc077cf5d2a979a5 Mon Sep 17 00:00:00 2001 From: Vikram Bhat Date: Tue, 14 Dec 2021 15:31:46 +0530 Subject: [PATCH 1/3] 1.Disabling location attribute read due to issue#12983 2.Adding manual test cases -Test_TC_DD_1_5 -Test_TC_DD_1_6 -Test_TC_DD_1_7 -Test_TC_DD_1_8 -Test_TC_DD_1_9 --- examples/chip-tool/templates/tests.js | 9 ++++ .../tests/suites/TestBasicInformation.yaml | 6 ++- src/app/tests/suites/TestGroupMessaging.yaml | 6 ++- .../suites/certification/Test_TC_DD_1_5.yaml | 31 +++++++++++ .../suites/certification/Test_TC_DD_1_6.yaml | 48 +++++++++++++++++ .../suites/certification/Test_TC_DD_1_7.yaml | 41 +++++++++++++++ .../suites/certification/Test_TC_DD_1_8.yaml | 40 ++++++++++++++ .../suites/certification/Test_TC_DD_1_9.yaml | 52 +++++++++++++++++++ src/darwin/Framework/CHIP/templates/tests.js | 9 ++++ 9 files changed, 238 insertions(+), 4 deletions(-) create mode 100644 src/app/tests/suites/certification/Test_TC_DD_1_5.yaml create mode 100644 src/app/tests/suites/certification/Test_TC_DD_1_6.yaml create mode 100644 src/app/tests/suites/certification/Test_TC_DD_1_7.yaml create mode 100644 src/app/tests/suites/certification/Test_TC_DD_1_8.yaml create mode 100644 src/app/tests/suites/certification/Test_TC_DD_1_9.yaml diff --git a/examples/chip-tool/templates/tests.js b/examples/chip-tool/templates/tests.js index 5d286454b31316..b37f8f2413b36b 100644 --- a/examples/chip-tool/templates/tests.js +++ b/examples/chip-tool/templates/tests.js @@ -54,6 +54,14 @@ function getTests() 'Test_TC_CC_9_3', ]; + const DeviceDiscovery = [ + 'Test_TC_DD_1_5', + 'Test_TC_DD_1_6', + 'Test_TC_DD_1_7', + 'Test_TC_DD_1_8', + 'Test_TC_DD_1_9', + ]; + const DeviceManagement = [ 'Test_TC_DM_1_1', 'Test_TC_DM_3_1', @@ -207,6 +215,7 @@ function getTests() BinaryInput, // BooleanState, // ColorControl, // + DeviceDiscovery, // DeviceManagement, // ElectricalMeasurement, // FlowMeasurement, // diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml index 8c5c078c9552aa..fb7503668fe81f 100644 --- a/src/app/tests/suites/TestBasicInformation.yaml +++ b/src/app/tests/suites/TestBasicInformation.yaml @@ -22,8 +22,9 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" - + #Disabled due to issue-12983 - label: "Read location" + disabled: true command: "readAttribute" attribute: "location" response: @@ -34,8 +35,9 @@ tests: attribute: "location" arguments: value: "us" - + #Disabled due to issue-12983 - label: "Read back location" + disabled: true command: "readAttribute" attribute: "location" response: diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml index 0483ed5a6a9af8..fc9fcc2367af4c 100644 --- a/src/app/tests/suites/TestGroupMessaging.yaml +++ b/src/app/tests/suites/TestGroupMessaging.yaml @@ -33,8 +33,9 @@ tests: groupId: "1234" arguments: value: "us" - + #Disabled due to issue-12983 - label: "Read back Attribute" + disabled: true command: "readAttribute" attribute: "location" response: @@ -46,8 +47,9 @@ tests: groupId: "1234" arguments: value: "" - + #Disabled due to issue-12983 - label: "Read back Attribute" + disabled: true command: "readAttribute" attribute: "location" response: diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml new file mode 100644 index 00000000000000..e29a76c13bdf87 --- /dev/null +++ b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml @@ -0,0 +1,31 @@ +# Copyright (c) 2021 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: 7.1.5. [TC-DD-1.5] NFC Rules of advertisement and Onboarding + +config: + cluster: "Basic" + endpoint: 0 + +tests: + - label: "Step 1" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Verify that the onboarding payload for NFC tags SHALL use + NDEF URI Record Type Definition as defined by NFC Forum in + URI Record Type Definition RTD URI" diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml new file mode 100644 index 00000000000000..3787682fcd885b --- /dev/null +++ b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml @@ -0,0 +1,48 @@ +# Copyright (c) 2021 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: 7.1.6. [TC-DD-1.6] QR Code Format and Label + +config: + cluster: "Basic" + endpoint: 0 + +tests: + - label: "Step 1" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: "Scan the DUTs QR code using a QR code reader" + + - label: "Step 1 verification" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Verify the QR code gets scanned successfully and the QR + code must be of sufficient size and contrast respective to + surface material as to be readable with standard readers + such as smartphones in normal lighting conditions" + + - label: "Step 2 verificaiton" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: "Verify QR code version is 1 or higher" diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml new file mode 100644 index 00000000000000..6e27e1c6184356 --- /dev/null +++ b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml @@ -0,0 +1,41 @@ +# Copyright (c) 2021 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: 7.1.7. [TC-DD-1.7] Setup Code Format and Label + +config: + cluster: "Basic" + endpoint: 0 + +tests: + - label: "Precondition" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Verify manual pairing code is printed on the device or in + additional provided materials" + + - label: "Step 1" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Verify that the Manual Pairing Code should be printed using + a minimum font size of 6 points typically producing a + typeface height of 2.1 mm" diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml new file mode 100644 index 00000000000000..eceabeb11df140 --- /dev/null +++ b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml @@ -0,0 +1,40 @@ +# Copyright (c) 2021 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: + 7.1.8. [TC-DD-1.8] QR Code Onboarding Payload Verification [DUT - + Commissioner] + +config: + cluster: "Basic" + endpoint: 0 + +tests: + - label: "Step 1" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: "Scan the device QR code using DUT" + + - label: "Step 1 verification" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Verify the DUT is able to scan and parse the QR code + successfully to onboard the device onto the CHIP network" diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml new file mode 100644 index 00000000000000..5389207336ece5 --- /dev/null +++ b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml @@ -0,0 +1,52 @@ +# Copyright (c) 2021 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: + 7.1.9. [TC-DD-1.9] Manual Pairing Code Payload Verification [DUT - + Commissioner] + +config: + cluster: "Basic" + endpoint: 0 + +tests: + - label: "Precondition" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Verify that the manual pairing code is printed on the + device or in additional provided materials" + + - label: "Step 1" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Provide the 11 digit or 21 digit pairing code from the + Device in text speech or any format supported by DUT" + + - label: "Step 1 verification" + cluster: "LogCommands" + command: "Log" + arguments: + values: + - name: "message" + value: + "Verify that the manual pairing code can be provided to DUT + and parsed to onboard the device onto the CHIP network" diff --git a/src/darwin/Framework/CHIP/templates/tests.js b/src/darwin/Framework/CHIP/templates/tests.js index b718df0d8f4e30..703f9f183bc5e8 100644 --- a/src/darwin/Framework/CHIP/templates/tests.js +++ b/src/darwin/Framework/CHIP/templates/tests.js @@ -54,6 +54,14 @@ function getTests() 'Test_TC_CC_9_3', ]; + const DeviceDiscovery = [ + 'Test_TC_DD_1_5', + 'Test_TC_DD_1_6', + 'Test_TC_DD_1_7', + 'Test_TC_DD_1_8', + 'Test_TC_DD_1_9', + ]; + const DeviceManagement = [ 'Test_TC_DM_1_1', 'Test_TC_DM_3_1', @@ -189,6 +197,7 @@ function getTests() BinaryInput, // BooleanState, // ColorControl, // + DeviceDiscovery, // DeviceManagement, // ElectricalMeasurement, // FlowMeasurement, // From 3c024579c60c5049d1157e8a6406dfd885768ba2 Mon Sep 17 00:00:00 2001 From: Vikram Bhat Date: Tue, 14 Dec 2021 15:32:13 +0530 Subject: [PATCH 2/3] Adding autogenerated files. --- .../Framework/CHIPTests/CHIPClustersTests.m | 155 +++-- .../chip-tool/zap-generated/test/Commands.h | 567 ++++++++++++------ 2 files changed, 502 insertions(+), 220 deletions(-) diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index 02df3fe8e53744..b144bb996dd379 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -9088,6 +9088,107 @@ - (void)testSendClusterTest_TC_CC_9_3_000014_Off [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } +- (void)testSendClusterTest_TC_DD_1_5_000000_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, Verify that the onboarding payload for NFC tags SHALL use NDEF URI Record Type Definition as defined by NFC Forum in URI Record Type Definition RTD URI); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} + +- (void)testSendClusterTest_TC_DD_1_6_000000_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, Scan the DUTs QR code using a QR code reader); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} +- (void)testSendClusterTest_TC_DD_1_6_000001_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1 verification"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, + Verify the QR code gets scanned successfully and the QR code must be of sufficient size + and contrast respective to surface material as to be readable with standard readers such as smartphones in normal + lighting conditions); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} +- (void)testSendClusterTest_TC_DD_1_6_000002_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 2 verificaiton"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, Verify QR code version is 1 or higher); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} + +- (void)testSendClusterTest_TC_DD_1_7_000000_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Precondition"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, Verify manual pairing code is printed on the device or in additional provided materials); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} +- (void)testSendClusterTest_TC_DD_1_7_000001_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, + Verify that the Manual Pairing Code should be printed using a minimum font size of 6 points typically producing a typeface + height of 2.1 mm); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} + +- (void)testSendClusterTest_TC_DD_1_8_000000_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, Scan the device QR code using DUT); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} +- (void)testSendClusterTest_TC_DD_1_8_000001_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1 verification"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, + Verify the DUT is able to scan and parse the QR code successfully to onboard the device onto the CHIP network); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} + +- (void)testSendClusterTest_TC_DD_1_9_000000_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Precondition"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, Verify that the manual pairing code is printed on the device or in additional provided materials); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} +- (void)testSendClusterTest_TC_DD_1_9_000001_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, + Provide the 11 digit or 21 digit pairing code from the Device in text speech or any format supported by DUT); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} +- (void)testSendClusterTest_TC_DD_1_9_000002_Log +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1 verification"]; + + dispatch_queue_t queue = dispatch_get_main_queue(); + Log(expectation, queue, + Verify that the manual pairing code can be provided to DUT and parsed to onboard the device onto the CHIP network); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} + - (void)testSendClusterTest_TC_DM_1_1_000000_WaitForCommissionee { XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; @@ -33972,31 +34073,7 @@ - (void)testSendClusterTestBasicInformation_000000_WaitForCommissionee WaitForCommissionee(expectation, queue); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTestBasicInformation_000001_ReadAttribute -{ - XCTestExpectation * expectation = [self expectationWithDescription:@"Read location"]; - - CHIPDevice * device = GetConnectedDevice(); - dispatch_queue_t queue = dispatch_get_main_queue(); - CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:queue]; - XCTAssertNotNil(cluster); - - [cluster readAttributeLocationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) { - NSLog(@"Read location Error: %@", err); - - XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0); - - { - id actualValue = value; - XCTAssertTrue([actualValue isEqualToString:@"XX"]); - } - - [expectation fulfill]; - }]; - - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; -} -- (void)testSendClusterTestBasicInformation_000002_WriteAttribute +- (void)testSendClusterTestBasicInformation_000001_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"Write location"]; @@ -34018,31 +34095,7 @@ - (void)testSendClusterTestBasicInformation_000002_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTestBasicInformation_000003_ReadAttribute -{ - XCTestExpectation * expectation = [self expectationWithDescription:@"Read back location"]; - - CHIPDevice * device = GetConnectedDevice(); - dispatch_queue_t queue = dispatch_get_main_queue(); - CHIPTestBasic * cluster = [[CHIPTestBasic alloc] initWithDevice:device endpoint:0 queue:queue]; - XCTAssertNotNil(cluster); - - [cluster readAttributeLocationWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) { - NSLog(@"Read back location Error: %@", err); - - XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0); - - { - id actualValue = value; - XCTAssertTrue([actualValue isEqualToString:@"us"]); - } - - [expectation fulfill]; - }]; - - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; -} -- (void)testSendClusterTestBasicInformation_000004_WriteAttribute +- (void)testSendClusterTestBasicInformation_000002_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"Restore initial location value"]; @@ -34064,7 +34117,7 @@ - (void)testSendClusterTestBasicInformation_000004_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTestBasicInformation_000005_ReadAttribute +- (void)testSendClusterTestBasicInformation_000003_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"Read AttributeList value"]; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 46ace0f3bb842f..d45c0b702ba989 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -60,6 +60,11 @@ class TestList : public Command printf("Test_TC_CC_9_1\n"); printf("Test_TC_CC_9_2\n"); printf("Test_TC_CC_9_3\n"); + printf("Test_TC_DD_1_5\n"); + printf("Test_TC_DD_1_6\n"); + printf("Test_TC_DD_1_7\n"); + printf("Test_TC_DD_1_8\n"); + printf("Test_TC_DD_1_9\n"); printf("Test_TC_DM_1_1\n"); printf("Test_TC_DM_3_1\n"); printf("Test_TC_DM_2_2\n"); @@ -13756,6 +13761,361 @@ class Test_TC_CC_9_3 : public TestCommand void OnSuccessResponse_14() { NextTest(); } }; +class Test_TC_DD_1_5 : public TestCommand +{ +public: + Test_TC_DD_1_5() : TestCommand("Test_TC_DD_1_5"), mTestIndex(0) {} + + /////////// TestCommand Interface ///////// + void NextTest() override + { + CHIP_ERROR err = CHIP_NO_ERROR; + + if (0 == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Start: Test_TC_DD_1_5\n"); + } + + if (mTestCount == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DD_1_5\n"); + SetCommandExitStatus(CHIP_NO_ERROR); + return; + } + + Wait(); + + // Ensure we increment mTestIndex before we start running the relevant + // command. That way if we lose the timeslice after we send the message + // but before our function call returns, we won't end up with an + // incorrect mTestIndex value observed when we get the response. + switch (mTestIndex++) + { + case 0: + ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1\n"); + err = TestStep1_0(); + break; + } + + if (CHIP_NO_ERROR != err) + { + ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err)); + SetCommandExitStatus(err); + } + } + +private: + std::atomic_uint16_t mTestIndex; + const uint16_t mTestCount = 1; + + // + // Tests methods + // + + CHIP_ERROR TestStep1_0() + { + SetIdentity(kIdentityAlpha); + return Log("Verify that the onboarding payload for NFC tags SHALL use NDEF URI Record Type Definition as defined by NFC " + "Forum in URI Record Type Definition RTD URI"); + } +}; + +class Test_TC_DD_1_6 : public TestCommand +{ +public: + Test_TC_DD_1_6() : TestCommand("Test_TC_DD_1_6"), mTestIndex(0) {} + + /////////// TestCommand Interface ///////// + void NextTest() override + { + CHIP_ERROR err = CHIP_NO_ERROR; + + if (0 == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Start: Test_TC_DD_1_6\n"); + } + + if (mTestCount == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DD_1_6\n"); + SetCommandExitStatus(CHIP_NO_ERROR); + return; + } + + Wait(); + + // Ensure we increment mTestIndex before we start running the relevant + // command. That way if we lose the timeslice after we send the message + // but before our function call returns, we won't end up with an + // incorrect mTestIndex value observed when we get the response. + switch (mTestIndex++) + { + case 0: + ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1\n"); + err = TestStep1_0(); + break; + case 1: + ChipLogProgress(chipTool, " ***** Test Step 1 : Step 1 verification\n"); + err = TestStep1Verification_1(); + break; + case 2: + ChipLogProgress(chipTool, " ***** Test Step 2 : Step 2 verificaiton\n"); + err = TestStep2Verificaiton_2(); + break; + } + + if (CHIP_NO_ERROR != err) + { + ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err)); + SetCommandExitStatus(err); + } + } + +private: + std::atomic_uint16_t mTestIndex; + const uint16_t mTestCount = 3; + + // + // Tests methods + // + + CHIP_ERROR TestStep1_0() + { + SetIdentity(kIdentityAlpha); + return Log("Scan the DUTs QR code using a QR code reader"); + } + + CHIP_ERROR TestStep1Verification_1() + { + SetIdentity(kIdentityAlpha); + return Log( + "Verify the QR code gets scanned successfully and the QR code must be of sufficient size and contrast respective to " + "surface material as to be readable with standard readers such as smartphones in normal lighting conditions"); + } + + CHIP_ERROR TestStep2Verificaiton_2() + { + SetIdentity(kIdentityAlpha); + return Log("Verify QR code version is 1 or higher"); + } +}; + +class Test_TC_DD_1_7 : public TestCommand +{ +public: + Test_TC_DD_1_7() : TestCommand("Test_TC_DD_1_7"), mTestIndex(0) {} + + /////////// TestCommand Interface ///////// + void NextTest() override + { + CHIP_ERROR err = CHIP_NO_ERROR; + + if (0 == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Start: Test_TC_DD_1_7\n"); + } + + if (mTestCount == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DD_1_7\n"); + SetCommandExitStatus(CHIP_NO_ERROR); + return; + } + + Wait(); + + // Ensure we increment mTestIndex before we start running the relevant + // command. That way if we lose the timeslice after we send the message + // but before our function call returns, we won't end up with an + // incorrect mTestIndex value observed when we get the response. + switch (mTestIndex++) + { + case 0: + ChipLogProgress(chipTool, " ***** Test Step 0 : Precondition\n"); + err = TestPrecondition_0(); + break; + case 1: + ChipLogProgress(chipTool, " ***** Test Step 1 : Step 1\n"); + err = TestStep1_1(); + break; + } + + if (CHIP_NO_ERROR != err) + { + ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err)); + SetCommandExitStatus(err); + } + } + +private: + std::atomic_uint16_t mTestIndex; + const uint16_t mTestCount = 2; + + // + // Tests methods + // + + CHIP_ERROR TestPrecondition_0() + { + SetIdentity(kIdentityAlpha); + return Log("Verify manual pairing code is printed on the device or in additional provided materials"); + } + + CHIP_ERROR TestStep1_1() + { + SetIdentity(kIdentityAlpha); + return Log("Verify that the Manual Pairing Code should be printed using a minimum font size of 6 points typically " + "producing a typeface height of 2.1 mm"); + } +}; + +class Test_TC_DD_1_8 : public TestCommand +{ +public: + Test_TC_DD_1_8() : TestCommand("Test_TC_DD_1_8"), mTestIndex(0) {} + + /////////// TestCommand Interface ///////// + void NextTest() override + { + CHIP_ERROR err = CHIP_NO_ERROR; + + if (0 == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Start: Test_TC_DD_1_8\n"); + } + + if (mTestCount == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DD_1_8\n"); + SetCommandExitStatus(CHIP_NO_ERROR); + return; + } + + Wait(); + + // Ensure we increment mTestIndex before we start running the relevant + // command. That way if we lose the timeslice after we send the message + // but before our function call returns, we won't end up with an + // incorrect mTestIndex value observed when we get the response. + switch (mTestIndex++) + { + case 0: + ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1\n"); + err = TestStep1_0(); + break; + case 1: + ChipLogProgress(chipTool, " ***** Test Step 1 : Step 1 verification\n"); + err = TestStep1Verification_1(); + break; + } + + if (CHIP_NO_ERROR != err) + { + ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err)); + SetCommandExitStatus(err); + } + } + +private: + std::atomic_uint16_t mTestIndex; + const uint16_t mTestCount = 2; + + // + // Tests methods + // + + CHIP_ERROR TestStep1_0() + { + SetIdentity(kIdentityAlpha); + return Log("Scan the device QR code using DUT"); + } + + CHIP_ERROR TestStep1Verification_1() + { + SetIdentity(kIdentityAlpha); + return Log("Verify the DUT is able to scan and parse the QR code successfully to onboard the device onto the CHIP network"); + } +}; + +class Test_TC_DD_1_9 : public TestCommand +{ +public: + Test_TC_DD_1_9() : TestCommand("Test_TC_DD_1_9"), mTestIndex(0) {} + + /////////// TestCommand Interface ///////// + void NextTest() override + { + CHIP_ERROR err = CHIP_NO_ERROR; + + if (0 == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Start: Test_TC_DD_1_9\n"); + } + + if (mTestCount == mTestIndex) + { + ChipLogProgress(chipTool, " **** Test Complete: Test_TC_DD_1_9\n"); + SetCommandExitStatus(CHIP_NO_ERROR); + return; + } + + Wait(); + + // Ensure we increment mTestIndex before we start running the relevant + // command. That way if we lose the timeslice after we send the message + // but before our function call returns, we won't end up with an + // incorrect mTestIndex value observed when we get the response. + switch (mTestIndex++) + { + case 0: + ChipLogProgress(chipTool, " ***** Test Step 0 : Precondition\n"); + err = TestPrecondition_0(); + break; + case 1: + ChipLogProgress(chipTool, " ***** Test Step 1 : Step 1\n"); + err = TestStep1_1(); + break; + case 2: + ChipLogProgress(chipTool, " ***** Test Step 2 : Step 1 verification\n"); + err = TestStep1Verification_2(); + break; + } + + if (CHIP_NO_ERROR != err) + { + ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err)); + SetCommandExitStatus(err); + } + } + +private: + std::atomic_uint16_t mTestIndex; + const uint16_t mTestCount = 3; + + // + // Tests methods + // + + CHIP_ERROR TestPrecondition_0() + { + SetIdentity(kIdentityAlpha); + return Log("Verify that the manual pairing code is printed on the device or in additional provided materials"); + } + + CHIP_ERROR TestStep1_1() + { + SetIdentity(kIdentityAlpha); + return Log("Provide the 11 digit or 21 digit pairing code from the Device in text speech or any format supported by DUT"); + } + + CHIP_ERROR TestStep1Verification_2() + { + SetIdentity(kIdentityAlpha); + return Log( + "Verify that the manual pairing code can be provided to DUT and parsed to onboard the device onto the CHIP network"); + } +}; + class Test_TC_DM_1_1 : public TestCommand { public: @@ -54301,24 +54661,16 @@ class TestBasicInformation : public TestCommand err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : Read location\n"); - err = TestReadLocation_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Write location\n"); + err = TestWriteLocation_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Write location\n"); - err = TestWriteLocation_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : Restore initial location value\n"); + err = TestRestoreInitialLocationValue_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Read back location\n"); - err = TestReadBackLocation_3(); - break; - case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Restore initial location value\n"); - err = TestRestoreInitialLocationValue_4(); - break; - case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Read AttributeList value\n"); - err = TestReadAttributeListValue_5(); + ChipLogProgress(chipTool, " ***** Test Step 3 : Read AttributeList value\n"); + err = TestReadAttributeListValue_3(); break; } @@ -54331,17 +54683,14 @@ class TestBasicInformation : public TestCommand private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 6; + const uint16_t mTestCount = 4; static void OnFailureCallback_1(void * context, EmberAfStatus status) { (static_cast(context))->OnFailureResponse_1(status); } - static void OnSuccessCallback_1(void * context, chip::CharSpan location) - { - (static_cast(context))->OnSuccessResponse_1(location); - } + static void OnSuccessCallback_1(void * context) { (static_cast(context))->OnSuccessResponse_1(); } static void OnFailureCallback_2(void * context, EmberAfStatus status) { @@ -54355,26 +54704,9 @@ class TestBasicInformation : public TestCommand (static_cast(context))->OnFailureResponse_3(status); } - static void OnSuccessCallback_3(void * context, chip::CharSpan location) - { - (static_cast(context))->OnSuccessResponse_3(location); - } - - static void OnFailureCallback_4(void * context, EmberAfStatus status) - { - (static_cast(context))->OnFailureResponse_4(status); - } - - static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } - - static void OnFailureCallback_5(void * context, EmberAfStatus status) + static void OnSuccessCallback_3(void * context, const chip::app::DataModel::DecodableList & attributeList) { - (static_cast(context))->OnFailureResponse_5(status); - } - - static void OnSuccessCallback_5(void * context, const chip::app::DataModel::DecodableList & attributeList) - { - (static_cast(context))->OnSuccessResponse_5(attributeList); + (static_cast(context))->OnSuccessResponse_3(attributeList); } // @@ -54387,27 +54719,7 @@ class TestBasicInformation : public TestCommand return WaitForCommissionee(); } - CHIP_ERROR TestReadLocation_1() - { - const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 0; - chip::Controller::BasicClusterTest cluster; - cluster.Associate(mDevices[kIdentityAlpha], endpoint); - - ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1)); - return CHIP_NO_ERROR; - } - - void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } - - void OnSuccessResponse_1(chip::CharSpan location) - { - VerifyOrReturn(CheckValueAsString("location", location, chip::CharSpan("XX", 2))); - - NextTest(); - } - - CHIP_ERROR TestWriteLocation_2() + CHIP_ERROR TestWriteLocation_1() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 0; chip::Controller::BasicClusterTest cluster; @@ -54417,35 +54729,15 @@ class TestBasicInformation : public TestCommand locationArgument = chip::Span("usgarbage: not in length on purpose", 2); ReturnErrorOnFailure(cluster.WriteAttribute( - locationArgument, this, OnSuccessCallback_2, OnFailureCallback_2)); - return CHIP_NO_ERROR; - } - - void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } - - void OnSuccessResponse_2() { NextTest(); } - - CHIP_ERROR TestReadBackLocation_3() - { - const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 0; - chip::Controller::BasicClusterTest cluster; - cluster.Associate(mDevices[kIdentityAlpha], endpoint); - - ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3)); + locationArgument, this, OnSuccessCallback_1, OnFailureCallback_1)); return CHIP_NO_ERROR; } - void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - - void OnSuccessResponse_3(chip::CharSpan location) - { - VerifyOrReturn(CheckValueAsString("location", location, chip::CharSpan("us", 2))); + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } - NextTest(); - } + void OnSuccessResponse_1() { NextTest(); } - CHIP_ERROR TestRestoreInitialLocationValue_4() + CHIP_ERROR TestRestoreInitialLocationValue_2() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 0; chip::Controller::BasicClusterTest cluster; @@ -54455,28 +54747,28 @@ class TestBasicInformation : public TestCommand locationArgument = chip::Span("garbage: not in length on purpose", 0); ReturnErrorOnFailure(cluster.WriteAttribute( - locationArgument, this, OnSuccessCallback_4, OnFailureCallback_4)); + locationArgument, this, OnSuccessCallback_2, OnFailureCallback_2)); return CHIP_NO_ERROR; } - void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_4() { NextTest(); } + void OnSuccessResponse_2() { NextTest(); } - CHIP_ERROR TestReadAttributeListValue_5() + CHIP_ERROR TestReadAttributeListValue_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 0; chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5)); + this, OnSuccessCallback_3, OnFailureCallback_3)); return CHIP_NO_ERROR; } - void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_5(const chip::app::DataModel::DecodableList & attributeList) + void OnSuccessResponse_3(const chip::app::DataModel::DecodableList & attributeList) { auto iter = attributeList.begin(); VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter, 0)); @@ -56164,16 +56456,8 @@ class TestGroupMessaging : public TestCommand err = TestGroupWriteAttribute_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Read back Attribute\n"); - err = TestReadBackAttribute_2(); - break; - case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Restore initial location value\n"); - err = TestRestoreInitialLocationValue_3(); - break; - case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Read back Attribute\n"); - err = TestReadBackAttribute_4(); + ChipLogProgress(chipTool, " ***** Test Step 2 : Restore initial location value\n"); + err = TestRestoreInitialLocationValue_2(); break; } @@ -56186,7 +56470,7 @@ class TestGroupMessaging : public TestCommand private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 5; + const uint16_t mTestCount = 3; static void OnDoneCallback_1(void * context) { (static_cast(context))->OnDoneResponse_1(); } @@ -56197,34 +56481,14 @@ class TestGroupMessaging : public TestCommand static void OnSuccessCallback_1(void * context) { (static_cast(context))->OnSuccessResponse_1(); } + static void OnDoneCallback_2(void * context) { (static_cast(context))->OnDoneResponse_2(); } + static void OnFailureCallback_2(void * context, EmberAfStatus status) { (static_cast(context))->OnFailureResponse_2(status); } - static void OnSuccessCallback_2(void * context, chip::CharSpan location) - { - (static_cast(context))->OnSuccessResponse_2(location); - } - - static void OnDoneCallback_3(void * context) { (static_cast(context))->OnDoneResponse_3(); } - - static void OnFailureCallback_3(void * context, EmberAfStatus status) - { - (static_cast(context))->OnFailureResponse_3(status); - } - - static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } - - static void OnFailureCallback_4(void * context, EmberAfStatus status) - { - (static_cast(context))->OnFailureResponse_4(status); - } - - static void OnSuccessCallback_4(void * context, chip::CharSpan location) - { - (static_cast(context))->OnSuccessResponse_4(location); - } + static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } // // Tests methods @@ -56256,27 +56520,7 @@ class TestGroupMessaging : public TestCommand void OnDoneResponse_1() { NextTest(); } - CHIP_ERROR TestReadBackAttribute_2() - { - const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 0; - chip::Controller::BasicClusterTest cluster; - cluster.Associate(mDevices[kIdentityAlpha], endpoint); - - ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2)); - return CHIP_NO_ERROR; - } - - void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } - - void OnSuccessResponse_2(chip::CharSpan location) - { - VerifyOrReturn(CheckValueAsString("location", location, chip::CharSpan("us", 2))); - - NextTest(); - } - - CHIP_ERROR TestRestoreInitialLocationValue_3() + CHIP_ERROR TestRestoreInitialLocationValue_2() { const chip::GroupId groupId = 1234; chip::Controller::BasicClusterTest cluster; @@ -56286,35 +56530,15 @@ class TestGroupMessaging : public TestCommand locationArgument = chip::Span("garbage: not in length on purpose", 0); ReturnErrorOnFailure(cluster.WriteAttribute( - locationArgument, this, OnSuccessCallback_3, OnFailureCallback_3, OnDoneCallback_3)); + locationArgument, this, OnSuccessCallback_2, OnFailureCallback_2, OnDoneCallback_2)); return CHIP_NO_ERROR; } - void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - - void OnSuccessResponse_3() { NextTest(); } - - void OnDoneResponse_3() { NextTest(); } - - CHIP_ERROR TestReadBackAttribute_4() - { - const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 0; - chip::Controller::BasicClusterTest cluster; - cluster.Associate(mDevices[kIdentityAlpha], endpoint); - - ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4)); - return CHIP_NO_ERROR; - } - - void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_4(chip::CharSpan location) - { - VerifyOrReturn(CheckValueAsString("location", location, chip::CharSpan("", 0))); + void OnSuccessResponse_2() { NextTest(); } - NextTest(); - } + void OnDoneResponse_2() { NextTest(); } }; class Test_TC_DIAGSW_1_1 : public TestCommand @@ -56932,6 +57156,11 @@ void registerCommandsTests(Commands & commands) make_unique(), make_unique(), make_unique(), + make_unique(), + make_unique(), + make_unique(), + make_unique(), + make_unique(), make_unique(), make_unique(), make_unique(), From 7d833ddf1514e659ea12a6a0c88a00ea9e034e0a Mon Sep 17 00:00:00 2001 From: Vikram Bhat Date: Wed, 15 Dec 2021 12:52:50 +0530 Subject: [PATCH 3/3] Updating autogenerated files after rebase. --- .../Framework/CHIPTests/CHIPClustersTests.m | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index b144bb996dd379..d07c84cba65d04 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -9093,7 +9093,9 @@ - (void)testSendClusterTest_TC_DD_1_5_000000_Log XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; dispatch_queue_t queue = dispatch_get_main_queue(); - Log(expectation, queue, Verify that the onboarding payload for NFC tags SHALL use NDEF URI Record Type Definition as defined by NFC Forum in URI Record Type Definition RTD URI); + Log(expectation, queue, + @"Verify that the onboarding payload for NFC tags SHALL use NDEF URI Record Type Definition as defined by NFC Forum in URI " + @"Record Type Definition RTD URI"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -9102,7 +9104,7 @@ - (void)testSendClusterTest_TC_DD_1_6_000000_Log XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; dispatch_queue_t queue = dispatch_get_main_queue(); - Log(expectation, queue, Scan the DUTs QR code using a QR code reader); + Log(expectation, queue, @"Scan the DUTs QR code using a QR code reader"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DD_1_6_000001_Log @@ -9111,9 +9113,8 @@ - (void)testSendClusterTest_TC_DD_1_6_000001_Log dispatch_queue_t queue = dispatch_get_main_queue(); Log(expectation, queue, - Verify the QR code gets scanned successfully and the QR code must be of sufficient size - and contrast respective to surface material as to be readable with standard readers such as smartphones in normal - lighting conditions); + @"Verify the QR code gets scanned successfully and the QR code must be of sufficient size and contrast respective to " + @"surface material as to be readable with standard readers such as smartphones in normal lighting conditions"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DD_1_6_000002_Log @@ -9121,7 +9122,7 @@ - (void)testSendClusterTest_TC_DD_1_6_000002_Log XCTestExpectation * expectation = [self expectationWithDescription:@"Step 2 verificaiton"]; dispatch_queue_t queue = dispatch_get_main_queue(); - Log(expectation, queue, Verify QR code version is 1 or higher); + Log(expectation, queue, @"Verify QR code version is 1 or higher"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -9130,7 +9131,7 @@ - (void)testSendClusterTest_TC_DD_1_7_000000_Log XCTestExpectation * expectation = [self expectationWithDescription:@"Precondition"]; dispatch_queue_t queue = dispatch_get_main_queue(); - Log(expectation, queue, Verify manual pairing code is printed on the device or in additional provided materials); + Log(expectation, queue, @"Verify manual pairing code is printed on the device or in additional provided materials"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DD_1_7_000001_Log @@ -9139,8 +9140,8 @@ - (void)testSendClusterTest_TC_DD_1_7_000001_Log dispatch_queue_t queue = dispatch_get_main_queue(); Log(expectation, queue, - Verify that the Manual Pairing Code should be printed using a minimum font size of 6 points typically producing a typeface - height of 2.1 mm); + @"Verify that the Manual Pairing Code should be printed using a minimum font size of 6 points typically producing a " + @"typeface height of 2.1 mm"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -9149,7 +9150,7 @@ - (void)testSendClusterTest_TC_DD_1_8_000000_Log XCTestExpectation * expectation = [self expectationWithDescription:@"Step 1"]; dispatch_queue_t queue = dispatch_get_main_queue(); - Log(expectation, queue, Scan the device QR code using DUT); + Log(expectation, queue, @"Scan the device QR code using DUT"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DD_1_8_000001_Log @@ -9158,7 +9159,7 @@ - (void)testSendClusterTest_TC_DD_1_8_000001_Log dispatch_queue_t queue = dispatch_get_main_queue(); Log(expectation, queue, - Verify the DUT is able to scan and parse the QR code successfully to onboard the device onto the CHIP network); + @"Verify the DUT is able to scan and parse the QR code successfully to onboard the device onto the CHIP network"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -9167,7 +9168,7 @@ - (void)testSendClusterTest_TC_DD_1_9_000000_Log XCTestExpectation * expectation = [self expectationWithDescription:@"Precondition"]; dispatch_queue_t queue = dispatch_get_main_queue(); - Log(expectation, queue, Verify that the manual pairing code is printed on the device or in additional provided materials); + Log(expectation, queue, @"Verify that the manual pairing code is printed on the device or in additional provided materials"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DD_1_9_000001_Log @@ -9176,7 +9177,7 @@ - (void)testSendClusterTest_TC_DD_1_9_000001_Log dispatch_queue_t queue = dispatch_get_main_queue(); Log(expectation, queue, - Provide the 11 digit or 21 digit pairing code from the Device in text speech or any format supported by DUT); + @"Provide the 11 digit or 21 digit pairing code from the Device in text speech or any format supported by DUT"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DD_1_9_000002_Log @@ -9185,7 +9186,7 @@ - (void)testSendClusterTest_TC_DD_1_9_000002_Log dispatch_queue_t queue = dispatch_get_main_queue(); Log(expectation, queue, - Verify that the manual pairing code can be provided to DUT and parsed to onboard the device onto the CHIP network); + @"Verify that the manual pairing code can be provided to DUT and parsed to onboard the device onto the CHIP network"); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; }