From ecbe0e65ccd0c795f7c51418a3aae753f3b187f3 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Thu, 11 May 2023 10:59:45 +0200 Subject: [PATCH 01/23] MediaClusters: Update SkipChannel per issue 26104 --- .../all-clusters-minimal-app.matter | 2 +- examples/tv-app/tv-common/tv-app.matter | 2 +- .../tv-casting-common/tv-casting-app.matter | 2 +- .../app-templates/endpoint_config.h | 10 +- .../app-templates/endpoint_config.h | 5 +- .../zcl/data-model/chip/channel-cluster.xml | 2 +- .../data_model/controller-clusters.matter | 2 +- .../python/chip/clusters/Objects.py | 4 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 8 +- .../CHIP/zap-generated/MTRClusters.mm | 8 +- .../app-common/zap-generated/cluster-enums.h | 75 +- .../zap-generated/cluster-objects.cpp | 697 ++++++- .../zap-generated/cluster-objects.h | 4 +- .../zap-generated/cluster/Commands.h | 4 + .../chip-tool/zap-generated/test/Commands.h | 1802 +++++++++++++---- .../zap-generated/cluster/Commands.h | 4 +- .../zap-generated/test/Commands.h | 4 +- .../zap-generated/IMClusterCommandHandler.cpp | 4 +- .../zap-generated/endpoint_config.h | 12 +- 19 files changed, 2137 insertions(+), 514 deletions(-) diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 256f2299e2c686..8069d0f4e2f665 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -3083,7 +3083,7 @@ server cluster Channel = 1284 { } request struct SkipChannelRequest { - INT16U count = 0; + INT16S count = 0; } command ChangeChannelByNumber(ChangeChannelByNumberRequest): DefaultSuccess = 2; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index eb909228662b9c..378d4d0aa81ff7 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1850,7 +1850,7 @@ server cluster Channel = 1284 { } request struct SkipChannelRequest { - INT16U count = 0; + INT16S count = 0; } response struct ChangeChannelResponse = 1 { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index cb5ee908d264c7..c66b0783124e69 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1370,7 +1370,7 @@ client cluster Channel = 1284 { } request struct SkipChannelRequest { - INT16U count = 0; + INT16S count = 0; } /** Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. */ diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index befeed9758c537..94ba74bb4f188c 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -347,10 +347,7 @@ { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 }, /* nullable_range_restricted_int16u */ \ { (uint16_t) -0x64, (uint16_t) -0x96, (uint16_t) 0xC8 }, /* nullable_range_restricted_int16s */ \ \ - /* Endpoint: 2, Cluster: On/Off (server) */ \ - { \ - (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 \ - } /* StartUpOnOff */ \ + /* Endpoint: 2, Cluster: On/Off (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 } /* StartUpOnOff */ \ } // This is an array of EmberAfAttributeMetadata structures. @@ -2984,10 +2981,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, \ - { \ - 0xF002, 1 \ - } \ + { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, { 0xF002, 1 } \ } // Array of device type offsets diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h index 43598a42835cd6..6a1b74207e1c62 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h @@ -1186,10 +1186,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, \ - { \ - 0x0101, 1 \ - } \ + { 0x0016, 1 }, { 0x0101, 1 } \ } // Array of device type offsets diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml index 47ac01d7eb5cc1..97ffeefe64b424 100644 --- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml @@ -41,7 +41,7 @@ limitations under the License. This command provides channel up and channel down functionality, but allows channel index jumps of size Count. When the value of the increase or decrease is larger than the number of channels remaining in the given direction, then the behavior SHALL be to return to the beginning (or end) of the channel list and continue. For example, if the current channel is at index 0 and count value of -1 is given, then the current channel should change to the last channel. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index f1f4eb2bdf4cca..86d336bbaa0226 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -5026,7 +5026,7 @@ client cluster Channel = 1284 { } request struct SkipChannelRequest { - INT16U count = 0; + INT16S count = 0; } /** Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. */ diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 0b2a818f8ed959..709c549fce833c 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -28124,10 +28124,10 @@ class SkipChannel(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="count", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="count", Tag=0, Type=int), ]) - count: 'uint' = 0 + count: 'int' = 0 class Attributes: @dataclass diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index c72f186934b01b..f8824de91a3023 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -36,11 +36,11 @@ using chip::Callback::Callback; using chip::Callback::Cancelable; using namespace chip::app::Clusters; -using chip::Optional; -using chip::SessionHandle; using chip::Messaging::ExchangeManager; -using chip::System::Clock::Seconds16; +using chip::SessionHandle; +using chip::Optional; using chip::System::Clock::Timeout; +using chip::System::Clock::Seconds16; // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects. @implementation MTRBaseClusterIdentify @@ -93960,7 +93960,7 @@ - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params compl invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.count = params.count.unsignedShortValue; + request.count = params.count.shortValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 70c0811649afc8..28c5d31d8a4aed 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -36,11 +36,11 @@ using chip::Callback::Callback; using chip::Callback::Cancelable; using namespace chip::app::Clusters; -using chip::Optional; -using chip::SessionHandle; using chip::Messaging::ExchangeManager; -using chip::System::Clock::Seconds16; +using chip::SessionHandle; +using chip::Optional; using chip::System::Clock::Timeout; +using chip::System::Clock::Seconds16; static void MTRClustersLogEnqueue(NSString * logPrefix, MTRAsyncCallbackWorkQueue * workQueue) { @@ -25434,7 +25434,7 @@ - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.count = params.count.unsignedShortValue; + request.count = params.count.shortValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index baa6af449d6508..8f2a13957ffe52 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -184,7 +184,8 @@ enum class OnOffFeature : uint32_t }; } // namespace OnOff -namespace OnOffSwitchConfiguration {} // namespace OnOffSwitchConfiguration +namespace OnOffSwitchConfiguration { +} // namespace OnOffSwitchConfiguration namespace LevelControl { @@ -242,13 +243,17 @@ enum class LevelControlOptions : uint8_t }; } // namespace LevelControl -namespace BinaryInputBasic {} // namespace BinaryInputBasic +namespace BinaryInputBasic { +} // namespace BinaryInputBasic -namespace PulseWidthModulation {} // namespace PulseWidthModulation +namespace PulseWidthModulation { +} // namespace PulseWidthModulation -namespace Descriptor {} // namespace Descriptor +namespace Descriptor { +} // namespace Descriptor -namespace Binding {} // namespace Binding +namespace Binding { +} // namespace Binding namespace AccessControl { @@ -514,7 +519,8 @@ enum class OTAUpdateStateEnum : uint8_t }; } // namespace OtaSoftwareUpdateRequestor -namespace LocalizationConfiguration {} // namespace LocalizationConfiguration +namespace LocalizationConfiguration { +} // namespace LocalizationConfiguration namespace TimeFormatLocalization { @@ -575,7 +581,8 @@ enum class UnitLocalizationFeature : uint32_t }; } // namespace UnitLocalization -namespace PowerSourceConfiguration {} // namespace PowerSourceConfiguration +namespace PowerSourceConfiguration { +} // namespace PowerSourceConfiguration namespace PowerSource { @@ -1474,17 +1481,23 @@ enum class GroupKeySecurityPolicyEnum : uint8_t }; } // namespace GroupKeyManagement -namespace FixedLabel {} // namespace FixedLabel +namespace FixedLabel { +} // namespace FixedLabel -namespace UserLabel {} // namespace UserLabel +namespace UserLabel { +} // namespace UserLabel -namespace ProxyConfiguration {} // namespace ProxyConfiguration +namespace ProxyConfiguration { +} // namespace ProxyConfiguration -namespace ProxyDiscovery {} // namespace ProxyDiscovery +namespace ProxyDiscovery { +} // namespace ProxyDiscovery -namespace ProxyValid {} // namespace ProxyValid +namespace ProxyValid { +} // namespace ProxyValid -namespace BooleanState {} // namespace BooleanState +namespace BooleanState { +} // namespace BooleanState namespace IcdManagement { @@ -2683,7 +2696,8 @@ enum class WindowCoveringFeature : uint32_t }; } // namespace WindowCovering -namespace BarrierControl {} // namespace BarrierControl +namespace BarrierControl { +} // namespace BarrierControl namespace PumpConfigurationAndControl { @@ -2906,7 +2920,8 @@ enum class WindSupportMask : uint8_t }; } // namespace FanControl -namespace ThermostatUserInterfaceConfiguration {} // namespace ThermostatUserInterfaceConfiguration +namespace ThermostatUserInterfaceConfiguration { +} // namespace ThermostatUserInterfaceConfiguration namespace ColorControl { @@ -3049,7 +3064,8 @@ enum class ColorLoopUpdateFlags : uint8_t }; } // namespace ColorControl -namespace BallastConfiguration {} // namespace BallastConfiguration +namespace BallastConfiguration { +} // namespace BallastConfiguration namespace IlluminanceMeasurement { @@ -3066,7 +3082,8 @@ enum class LightSensorType : uint8_t }; } // namespace IlluminanceMeasurement -namespace TemperatureMeasurement {} // namespace TemperatureMeasurement +namespace TemperatureMeasurement { +} // namespace TemperatureMeasurement namespace PressureMeasurement { @@ -3077,9 +3094,11 @@ enum class PressureMeasurementFeature : uint32_t }; } // namespace PressureMeasurement -namespace FlowMeasurement {} // namespace FlowMeasurement +namespace FlowMeasurement { +} // namespace FlowMeasurement -namespace RelativeHumidityMeasurement {} // namespace RelativeHumidityMeasurement +namespace RelativeHumidityMeasurement { +} // namespace RelativeHumidityMeasurement namespace OccupancySensing { @@ -3112,7 +3131,8 @@ enum class OccupancySensorTypeBitmap : uint8_t }; } // namespace OccupancySensing -namespace WakeOnLan {} // namespace WakeOnLan +namespace WakeOnLan { +} // namespace WakeOnLan namespace Channel { @@ -3235,7 +3255,8 @@ enum class MediaInputFeature : uint32_t }; } // namespace MediaInput -namespace LowPower {} // namespace LowPower +namespace LowPower { +} // namespace LowPower namespace KeypadInput { @@ -3487,10 +3508,18 @@ enum class ApplicationStatusEnum : uint8_t }; } // namespace ApplicationBasic -namespace AccountLogin {} // namespace AccountLogin +namespace AccountLogin { +} // namespace AccountLogin -namespace ElectricalMeasurement {} // namespace ElectricalMeasurement +namespace ElectricalMeasurement { +} // namespace ElectricalMeasurement +<<<<<<< HEAD +======= +namespace ClientMonitoring { +} // namespace ClientMonitoring + +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) namespace UnitTesting { // Enum for SimpleEnum diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index faea894cbc0cc9..3b325d58f6df97 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -237,7 +237,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace Identify namespace Groups { @@ -673,7 +674,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace Groups namespace Scenes { @@ -1691,7 +1693,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace Scenes namespace OnOff { @@ -1963,12 +1966,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace OnOff namespace OnOffSwitchConfiguration { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2007,7 +2012,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace OnOffSwitchConfiguration namespace LevelControl { @@ -2509,12 +2515,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace LevelControl namespace BinaryInputBasic { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2574,12 +2582,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace BinaryInputBasic namespace PulseWidthModulation { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2612,7 +2622,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace PulseWidthModulation namespace Descriptor { @@ -2663,7 +2674,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace DeviceTypeStruct } // namespace Structs -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2708,7 +2720,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace Descriptor namespace Binding { @@ -2784,7 +2797,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace TargetStruct } // namespace Structs -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2820,7 +2834,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace Binding namespace AccessControl { @@ -3018,7 +3033,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace AccessControlExtensionStruct } // namespace Structs -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -4604,7 +4620,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace OtaSoftwareUpdateProvider namespace OtaSoftwareUpdateRequestor { @@ -4916,7 +4933,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace OtaSoftwareUpdateRequestor namespace LocalizationConfiguration { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -4955,12 +4973,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace LocalizationConfiguration namespace TimeFormatLocalization { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5002,12 +5022,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace TimeFormatLocalization namespace UnitLocalization { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5043,12 +5065,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace UnitLocalization namespace PowerSourceConfiguration { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5084,7 +5108,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace PowerSourceConfiguration namespace PowerSource { @@ -5223,7 +5248,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace WiredFaultChangeType } // namespace Structs -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5817,7 +5843,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace GeneralCommissioning namespace NetworkCommissioning { @@ -6447,7 +6474,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace NetworkCommissioning namespace DiagnosticLogs { @@ -6580,7 +6608,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace DiagnosticLogs namespace GeneralDiagnostics { @@ -8072,7 +8101,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace EthernetNetworkDiagnostics namespace TimeSynchronization { @@ -8799,7 +8829,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace ProductAppearanceStruct } // namespace Structs -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -9026,7 +9057,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace BridgedDeviceBasicInformation namespace Switch { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -9509,7 +9541,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace AdministratorCommissioning namespace OperationalCredentials { @@ -10193,7 +10226,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace OperationalCredentials namespace GroupKeyManagement { @@ -10662,13 +10696,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace GroupKeyManagement namespace FixedLabel { -namespace Structs {} // namespace Structs +namespace Structs { +} // namespace Structs -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10704,13 +10741,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace FixedLabel namespace UserLabel { -namespace Structs {} // namespace Structs +namespace Structs { +} // namespace Structs -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10746,12 +10786,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace UserLabel namespace ProxyConfiguration { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10784,12 +10826,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace ProxyConfiguration namespace ProxyDiscovery { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10822,12 +10866,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace ProxyDiscovery namespace ProxyValid { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10860,12 +10906,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace ProxyValid namespace BooleanState { -namespace Commands {} // namespace Commands +namespace Commands { +} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -11233,7 +11281,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace IcdManagement namespace ModeSelect { @@ -14098,6 +14147,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const return CHIP_NO_ERROR; } +<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -14125,6 +14175,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) break; } } +======= +namespace Events { +} // namespace Events +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); @@ -14341,8 +14395,33 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::NumberOfHolidaySchedulesSupported::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, numberOfHolidaySchedulesSupported)); break; +<<<<<<< HEAD case Attributes::MaxPINCodeLength::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, maxPINCodeLength)); +======= + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace BarrierControl +namespace PumpConfigurationAndControl { + +namespace Commands { +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::MaxPressure::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, maxPressure)); +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) break; case Attributes::MinPINCodeLength::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, minPINCodeLength)); @@ -15528,6 +15607,13 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events { +} // namespace Events +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -15548,6 +15634,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } +<<<<<<< HEAD VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; @@ -15561,14 +15648,95 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +======= +namespace Commands { +} // namespace Commands +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { +<<<<<<< HEAD CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) +======= + switch (path.mAttributeId) + { + case Attributes::FanMode::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, fanMode)); + break; + case Attributes::FanModeSequence::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, fanModeSequence)); + break; + case Attributes::PercentSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, percentSetting)); + break; + case Attributes::PercentCurrent::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, percentCurrent)); + break; + case Attributes::SpeedMax::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, speedMax)); + break; + case Attributes::SpeedSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, speedSetting)); + break; + case Attributes::SpeedCurrent::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, speedCurrent)); + break; + case Attributes::RockSupport::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, rockSupport)); + break; + case Attributes::RockSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, rockSetting)); + break; + case Attributes::WindSupport::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, windSupport)); + break; + case Attributes::WindSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, windSetting)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace FanControl +namespace ThermostatUserInterfaceConfiguration { + +namespace Commands { +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) { if (!TLV::IsContextTag(reader.GetTag())) { @@ -15585,13 +15753,26 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace ElectronicTemperatureHigh. namespace PumpBlocked { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace ThermostatUserInterfaceConfiguration +namespace ColorControl { + +namespace Commands { +namespace MoveToHue { +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -16691,6 +16872,13 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events { +} // namespace Events +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16726,6 +16914,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } +<<<<<<< HEAD VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; @@ -16744,6 +16933,10 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +======= +namespace Commands { +} // namespace Commands +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16797,6 +16990,19 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace BallastConfiguration +namespace IlluminanceMeasurement { + +namespace Commands { +} // namespace Commands +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16849,6 +17055,19 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace IlluminanceMeasurement +namespace TemperatureMeasurement { + +namespace Commands { +} // namespace Commands +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16885,9 +17104,25 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace MoveColor. namespace StepColor { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace TemperatureMeasurement +namespace PressureMeasurement { + +namespace Commands { +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -16899,6 +17134,19 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace PressureMeasurement +namespace FlowMeasurement { + +namespace Commands { +} // namespace Commands +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16951,6 +17199,19 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace FlowMeasurement +namespace RelativeHumidityMeasurement { + +namespace Commands { +} // namespace Commands +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16987,8 +17248,139 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace MoveToColorTemperature. namespace EnhancedMoveToHue { +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace RelativeHumidityMeasurement +namespace OccupancySensing { + +namespace Commands { +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::Occupancy::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupancy)); + break; + case Attributes::OccupancySensorType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorType)); + break; + case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap)); + break; + case Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIROccupiedToUnoccupiedDelay)); + break; + case Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedDelay)); + break; + case Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedThreshold)); + break; + case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay)); + break; + case Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedDelay)); + break; + case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedThreshold)); + break; + case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactOccupiedToUnoccupiedDelay)); + break; + case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedDelay)); + break; + case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedThreshold)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace OccupancySensing +namespace WakeOnLan { + +namespace Commands { +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::MACAddress::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, MACAddress)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace WakeOnLan +namespace Channel { +namespace Structs { +namespace ChannelInfoStruct { +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -17256,8 +17648,61 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace ColorLoopSet. namespace StopMoveStep { +======= +} // namespace SkipChannel. +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::ChannelList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, channelList)); + break; + case Attributes::Lineup::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, lineup)); + break; + case Attributes::CurrentChannel::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, currentChannel)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace Channel +namespace TargetNavigator { +namespace Structs { +namespace TargetInfoStruct { +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -17608,6 +18053,90 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre return CHIP_NO_ERROR; } } // namespace Attributes +<<<<<<< HEAD +======= + +namespace Events { +} // namespace Events + +} // namespace TargetNavigator +namespace MediaPlayback { +namespace Structs { +namespace PlaybackPositionStruct { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kUpdatedAt), updatedAt)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kPosition), position)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kUpdatedAt): + ReturnErrorOnFailure(DataModel::Decode(reader, updatedAt)); + break; + case to_underlying(Fields::kPosition): + ReturnErrorOnFailure(DataModel::Decode(reader, position)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + + return CHIP_NO_ERROR; +} + +} // namespace PlaybackPositionStruct +} // namespace Structs + +namespace Commands { +namespace Play { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + default: + break; + } + } +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) namespace Events {} // namespace Events @@ -17857,7 +18386,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace PressureMeasurement namespace FlowMeasurement { @@ -18386,7 +18916,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace Channel namespace TargetNavigator { @@ -18433,6 +18964,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events { +} // namespace Events +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) } // namespace TargetInfoStruct } // namespace Structs @@ -18559,7 +19097,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace TargetNavigator namespace MediaPlayback { @@ -18911,8 +19450,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace SkipForward. namespace SkipBackward { +======= +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace ContentLauncher +namespace AudioOutput { +namespace Structs { +namespace OutputInfoStruct { +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19081,7 +19632,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace MediaPlayback namespace MediaInput { @@ -19324,8 +19876,10 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events +<<<<<<< HEAD } // namespace MediaInput namespace LowPower { @@ -19363,6 +19917,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace Sleep. +======= +} // namespace ApplicationLauncher +namespace ApplicationBasic { +namespace Structs { +} // namespace Structs + +namespace Commands { +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) } // namespace Commands namespace Attributes { @@ -19396,7 +19958,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace LowPower namespace KeypadInput { @@ -19618,6 +20181,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const return CHIP_NO_ERROR; } +<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -19646,6 +20210,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) break; } } +======= +namespace Events { +} // namespace Events +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); @@ -20458,7 +21026,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace ApplicationBasic namespace AccountLogin { @@ -21253,7 +21822,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace ElectricalMeasurement namespace UnitTesting { @@ -23700,7 +24270,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events {} // namespace Events +namespace Events { +} // namespace Events } // namespace FaultInjection diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index f712d1fc4df4e6..fa8de958fb201f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -24799,7 +24799,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } - uint16_t count = static_cast(0); + int16_t count = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -24814,7 +24814,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } - uint16_t count = static_cast(0); + int16_t count = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SkipChannel diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 728f0c8f4ab04a..9f027e971a8162 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -6529,11 +6529,15 @@ class ColorControlStepColor : public ClusterCommand public: ColorControlStepColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-color", credsIssuerConfig) { +<<<<<<< HEAD AddArgument("StepX", INT16_MIN, INT16_MAX, &mRequest.stepX); AddArgument("StepY", INT16_MIN, INT16_MAX, &mRequest.stepY); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride); +======= + AddArgument("Count", INT16_MIN, INT16_MAX, &mRequest.count); +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) ClusterCommand::AddArguments(); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index ab7ca592e76553..1153c00e5bb2af 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -2865,8 +2865,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -2902,12 +2902,12 @@ class Test_TC_ACL_2_3Suite : public TestCommand ? mDOkFull.Value() : chip::ByteSpan(chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20" - "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" - "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" - "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x31\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" - "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" - "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x00\x18"), - 128); + "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" + "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" + "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x31\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" + "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" + "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x00\x18"), + 128); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; value = chip::app::DataModel::List( @@ -2942,12 +2942,12 @@ class Test_TC_ACL_2_3Suite : public TestCommand ? mDBadLength.Value() : chip::ByteSpan(chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20" - "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" - "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" - "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x32\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" - "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" - "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x2E\x00\x18"), - 129); + "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" + "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" + "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x32\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" + "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" + "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x2E\x00\x18"), + 129); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; value = chip::app::DataModel::List( @@ -2999,8 +2999,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x37\x01\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68" - "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69" - "\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69" + "\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 72); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -3029,9 +3029,9 @@ class Test_TC_ACL_2_3Suite : public TestCommand ? mDBadElem.Value() : chip::ByteSpan(chip::Uint8::from_const_char( "\x17\x10\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69\x73\x20\x69" - "\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), - 65); + "\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + 65); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; value = chip::app::DataModel::List( @@ -3060,8 +3060,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18\xFF"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18\xFF"), 72); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -3091,8 +3091,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00"), 70); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -3151,8 +3151,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[1].fabricIndex = CurrentFabricIndex; @@ -6053,8 +6053,8 @@ class Test_TC_ACL_2_7Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = TH2FabricIndex; @@ -7548,8 +7548,8 @@ class Test_TC_ACL_2_10Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = TH2FabricIndex; @@ -7671,8 +7671,8 @@ class Test_TC_ACL_2_10Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = TH2FabricIndex; @@ -34421,7 +34421,8 @@ class Test_TC_TGTNAV_8_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -36758,7 +36759,7 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand VerifyOrDo(!ShouldSkip("CHANNEL.S.C03.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = 1U; + value.count = 1; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional @@ -60844,7 +60845,7 @@ class TV_ChannelClusterSuite : public TestCommand LogStep(6, "Skip Channel Command"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = 1U; + value.count = 1; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional @@ -93876,7 +93877,8 @@ class Test_TC_DD_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -93931,7 +93933,8 @@ class Test_TC_DD_1_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -93986,7 +93989,8 @@ class Test_TC_DD_1_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94041,7 +94045,8 @@ class Test_TC_DD_1_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94096,7 +94101,8 @@ class Test_TC_DD_1_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94151,7 +94157,8 @@ class Test_TC_DD_1_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94206,7 +94213,8 @@ class Test_TC_DD_1_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94261,7 +94269,8 @@ class Test_TC_DD_1_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94316,7 +94325,8 @@ class Test_TC_DD_1_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94371,7 +94381,8 @@ class Test_TC_DD_1_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94426,7 +94437,8 @@ class Test_TC_DD_1_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94481,7 +94493,8 @@ class Test_TC_DD_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94536,7 +94549,8 @@ class Test_TC_DD_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94591,7 +94605,8 @@ class Test_TC_DD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94646,7 +94661,8 @@ class Test_TC_DD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94701,7 +94717,8 @@ class Test_TC_DD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94756,7 +94773,8 @@ class Test_TC_DD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94811,7 +94829,8 @@ class Test_TC_DD_3_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94866,7 +94885,8 @@ class Test_TC_DD_3_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94921,7 +94941,8 @@ class Test_TC_DD_3_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -94976,7 +94997,8 @@ class Test_TC_DD_3_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95031,7 +95053,8 @@ class Test_TC_DD_3_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95086,7 +95109,8 @@ class Test_TC_DD_3_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95141,7 +95165,8 @@ class Test_TC_DD_3_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95196,7 +95221,8 @@ class Test_TC_DD_3_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95251,7 +95277,8 @@ class Test_TC_DD_3_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95306,7 +95333,8 @@ class Test_TC_DD_3_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95361,7 +95389,8 @@ class Test_TC_DD_3_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95416,7 +95445,8 @@ class Test_TC_DD_3_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95471,7 +95501,8 @@ class Test_TC_DD_3_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95526,7 +95557,8 @@ class Test_TC_DD_3_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95581,7 +95613,8 @@ class Test_TC_DD_3_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95636,7 +95669,8 @@ class Test_TC_DD_3_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -95691,7 +95725,8 @@ class Test_TC_DD_3_21Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96203,7 +96238,8 @@ class Test_TC_G_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96258,7 +96294,8 @@ class Test_TC_G_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96313,7 +96350,8 @@ class Test_TC_G_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96368,7 +96406,8 @@ class Test_TC_BDX_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96423,7 +96462,8 @@ class Test_TC_BDX_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96478,7 +96518,8 @@ class Test_TC_BDX_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96533,7 +96574,8 @@ class Test_TC_BDX_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96588,7 +96630,8 @@ class Test_TC_BDX_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96643,7 +96686,8 @@ class Test_TC_BDX_1_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96698,7 +96742,8 @@ class Test_TC_BDX_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96753,7 +96798,8 @@ class Test_TC_BDX_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96808,7 +96854,8 @@ class Test_TC_BDX_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96863,7 +96910,8 @@ class Test_TC_BDX_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96918,7 +96966,8 @@ class Test_TC_BDX_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -96973,7 +97022,8 @@ class Test_TC_BR_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97028,7 +97078,8 @@ class Test_TC_BR_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97083,7 +97134,8 @@ class Test_TC_BR_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97138,7 +97190,8 @@ class Test_TC_BR_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97193,7 +97246,8 @@ class Test_TC_DA_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97248,7 +97302,8 @@ class Test_TC_DA_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97303,7 +97358,8 @@ class Test_TC_DA_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97358,7 +97414,8 @@ class Test_TC_DA_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97413,7 +97470,8 @@ class Test_TC_DA_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97468,7 +97526,8 @@ class Test_TC_DA_1_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97523,7 +97582,8 @@ class Test_TC_BINFO_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97578,7 +97638,8 @@ class Test_TC_BINFO_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97634,7 +97695,8 @@ class Test_TC_OPCREDS_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97690,7 +97752,8 @@ class Test_TC_OPCREDS_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97746,7 +97809,8 @@ class Test_TC_OPCREDS_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97802,7 +97866,8 @@ class Test_TC_OPCREDS_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97858,7 +97923,8 @@ class Test_TC_OPCREDS_3_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97914,7 +97980,8 @@ class Test_TC_OPCREDS_3_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -97969,7 +98036,8 @@ class Test_TC_CNET_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98024,7 +98092,8 @@ class Test_TC_CNET_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98079,7 +98148,8 @@ class Test_TC_CNET_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98134,7 +98204,8 @@ class Test_TC_CNET_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98189,7 +98260,8 @@ class Test_TC_CNET_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98244,7 +98316,8 @@ class Test_TC_CNET_4_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98299,7 +98372,8 @@ class Test_TC_CNET_4_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98354,7 +98428,8 @@ class Test_TC_CNET_4_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98409,7 +98484,8 @@ class Test_TC_CNET_4_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98464,7 +98540,8 @@ class Test_TC_CNET_4_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98519,7 +98596,8 @@ class Test_TC_CNET_4_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98574,7 +98652,8 @@ class Test_TC_CNET_4_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98629,7 +98708,8 @@ class Test_TC_CNET_4_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98684,7 +98764,8 @@ class Test_TC_CNET_4_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98739,7 +98820,8 @@ class Test_TC_CNET_4_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98794,7 +98876,8 @@ class Test_TC_CNET_4_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98849,7 +98932,8 @@ class Test_TC_CNET_4_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98904,7 +98988,8 @@ class Test_TC_CNET_4_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -98959,7 +99044,8 @@ class Test_TC_CNET_4_21Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99014,7 +99100,8 @@ class Test_TC_CNET_4_22Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99069,7 +99156,8 @@ class Test_TC_DLOG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99124,12 +99212,15 @@ class Test_TC_DLOG_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; class Test_TC_DLOG_3_1Suite : public TestCommand +<<<<<<< HEAD +======= { public: Test_TC_DLOG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_3_1", 0, credsIssuerConfig) @@ -99179,7 +99270,65 @@ class Test_TC_DLOG_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_DESC_2_1Suite : public TestCommand +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) +{ +public: + Test_TC_DLOG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_3_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_DLOG_3_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } return CHIP_NO_ERROR; } }; @@ -99234,7 +99383,8 @@ class Test_TC_DESC_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99289,7 +99439,8 @@ class Test_TC_DGETH_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99344,7 +99495,8 @@ class Test_TC_CGEN_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99399,7 +99551,8 @@ class Test_TC_DGGEN_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99454,7 +99607,8 @@ class Test_TC_DGGEN_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99509,7 +99663,8 @@ class Test_TC_DGGEN_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99564,7 +99719,8 @@ class Test_TC_I_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99619,7 +99775,8 @@ class Test_TC_ILL_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99674,7 +99831,8 @@ class Test_TC_IDM_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99729,7 +99887,8 @@ class Test_TC_IDM_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99784,7 +99943,8 @@ class Test_TC_IDM_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99839,7 +99999,8 @@ class Test_TC_IDM_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99894,7 +100055,8 @@ class Test_TC_IDM_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -99949,7 +100111,8 @@ class Test_TC_IDM_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100004,7 +100167,8 @@ class Test_TC_IDM_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100059,7 +100223,8 @@ class Test_TC_IDM_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100114,7 +100279,8 @@ class Test_TC_IDM_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100169,7 +100335,8 @@ class Test_TC_IDM_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100224,7 +100391,8 @@ class Test_TC_IDM_5_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100279,7 +100447,8 @@ class Test_TC_IDM_5_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100334,7 +100503,8 @@ class Test_TC_IDM_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100389,7 +100559,8 @@ class Test_TC_IDM_6_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100444,7 +100615,8 @@ class Test_TC_IDM_6_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100499,7 +100671,8 @@ class Test_TC_IDM_6_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100554,7 +100727,8 @@ class Test_TC_IDM_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100609,7 +100783,8 @@ class Test_TC_IDM_8_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100665,7 +100840,8 @@ class Test_TC_LOWPOWER_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100721,7 +100897,8 @@ class Test_TC_APPLAUNCHER_3_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100777,7 +100954,8 @@ class Test_TC_APPLAUNCHER_3_8_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100833,7 +101011,8 @@ class Test_TC_APPLAUNCHER_3_9_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100889,7 +101068,8 @@ class Test_TC_MEDIAINPUT_3_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -100945,7 +101125,8 @@ class Test_TC_MEDIAINPUT_3_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101001,7 +101182,8 @@ class Test_TC_MEDIAINPUT_3_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101057,7 +101239,8 @@ class Test_TC_MEDIAINPUT_3_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101113,7 +101296,8 @@ class Test_TC_CHANNEL_5_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101169,7 +101353,8 @@ class Test_TC_CHANNEL_5_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101225,7 +101410,8 @@ class Test_TC_CHANNEL_5_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101281,7 +101467,8 @@ class Test_TC_KEYPADINPUT_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101337,7 +101524,8 @@ class Test_TC_MEDIAPLAYBACK_6_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101393,7 +101581,8 @@ class Test_TC_MEDIAPLAYBACK_6_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101449,7 +101638,8 @@ class Test_TC_AUDIOOUTPUT_7_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101505,7 +101695,8 @@ class Test_TC_AUDIOOUTPUT_7_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101561,7 +101752,8 @@ class Test_TC_CONTENTLAUNCHER_10_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101617,7 +101809,8 @@ class Test_TC_CONTENTLAUNCHER_10_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101673,7 +101866,8 @@ class Test_TC_CONTENTLAUNCHER_10_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101729,7 +101923,8 @@ class Test_TC_CONTENTLAUNCHER_10_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101784,7 +101979,8 @@ class Test_TC_MC_11_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101839,7 +102035,8 @@ class Test_TC_MC_11_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -101895,15 +102092,19 @@ class Test_TC_ALOGIN_12_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_CADMIN_1_1Suite : public TestCommand +<<<<<<< HEAD +======= +class Test_TC_WAKEONLAN_4_1Suite : public TestCommand { public: - Test_TC_CADMIN_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_1", 0, credsIssuerConfig) + Test_TC_WAKEONLAN_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : + TestCommand("Test_TC_WAKEONLAN_4_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -101911,7 +102112,7 @@ class Test_TC_CADMIN_1_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CADMIN_1_1Suite() {} + ~Test_TC_WAKEONLAN_4_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -101950,15 +102151,17 @@ class Test_TC_CADMIN_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_CADMIN_1_2Suite : public TestCommand +class Test_TC_ALOGIN_12_1Suite : public TestCommand { public: - Test_TC_CADMIN_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_2", 0, credsIssuerConfig) + Test_TC_ALOGIN_12_1Suite(CredentialIssuerCommands * credsIssuerConfig) : + TestCommand("Test_TC_ALOGIN_12_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -101966,7 +102169,7 @@ class Test_TC_CADMIN_1_2Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CADMIN_1_2Suite() {} + ~Test_TC_ALOGIN_12_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -102005,15 +102208,17 @@ class Test_TC_CADMIN_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_CADMIN_1_7Suite : public TestCommand +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) +class Test_TC_CADMIN_1_1Suite : public TestCommand { public: - Test_TC_CADMIN_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_7", 0, credsIssuerConfig) + Test_TC_CADMIN_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -102021,7 +102226,7 @@ class Test_TC_CADMIN_1_7Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CADMIN_1_7Suite() {} + ~Test_TC_CADMIN_1_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -102060,15 +102265,16 @@ class Test_TC_CADMIN_1_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_CADMIN_1_8Suite : public TestCommand +class Test_TC_CADMIN_1_2Suite : public TestCommand { public: - Test_TC_CADMIN_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_8", 0, credsIssuerConfig) + Test_TC_CADMIN_1_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_2", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -102076,7 +102282,7 @@ class Test_TC_CADMIN_1_8Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CADMIN_1_8Suite() {} + ~Test_TC_CADMIN_1_2Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -102115,16 +102321,16 @@ class Test_TC_CADMIN_1_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_CADMIN_1_11Suite : public TestCommand +class Test_TC_CADMIN_1_7Suite : public TestCommand { public: - Test_TC_CADMIN_1_11Suite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("Test_TC_CADMIN_1_11", 0, credsIssuerConfig) + Test_TC_CADMIN_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_7", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -102132,7 +102338,7 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CADMIN_1_11Suite() {} + ~Test_TC_CADMIN_1_7Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -102171,7 +102377,121 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_CADMIN_1_8Suite : public TestCommand +{ +public: + Test_TC_CADMIN_1_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CADMIN_1_8", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_CADMIN_1_8Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_CADMIN_1_11Suite : public TestCommand +{ +public: + Test_TC_CADMIN_1_11Suite(CredentialIssuerCommands * credsIssuerConfig) : + TestCommand("Test_TC_CADMIN_1_11", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_CADMIN_1_11Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } return CHIP_NO_ERROR; } }; @@ -102227,7 +102547,8 @@ class Test_TC_CADMIN_1_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -102283,7 +102604,8 @@ class Test_TC_CADMIN_1_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -102339,7 +102661,8 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -102863,7 +103186,8 @@ class Test_TC_CADMIN_1_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -102919,7 +103243,8 @@ class Test_TC_CADMIN_1_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -102975,7 +103300,8 @@ class Test_TC_CADMIN_1_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -103031,7 +103357,8 @@ class Test_TC_CADMIN_1_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -103462,7 +103789,8 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -103979,7 +104307,8 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -104410,7 +104739,8 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -104957,7 +105287,8 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -105388,7 +105719,8 @@ class Test_TC_MOD_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -105443,7 +105775,8 @@ class Test_TC_MOD_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -105498,7 +105831,8 @@ class Test_TC_MOD_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -105553,7 +105887,8 @@ class Test_TC_MOD_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -105608,7 +105943,8 @@ class Test_TC_MOD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -105663,12 +105999,15 @@ class Test_TC_MOD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; class Test_TC_MOD_3_3Suite : public TestCommand +<<<<<<< HEAD +======= { public: Test_TC_MOD_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MOD_3_3", 0, credsIssuerConfig) @@ -105718,7 +106057,8 @@ class Test_TC_MOD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -105773,15 +106113,17 @@ class Test_TC_MOD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; class Test_TC_SU_1_1Suite : public TestCommand +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) { public: - Test_TC_SU_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_1_1", 0, credsIssuerConfig) + Test_TC_MOD_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MOD_3_3", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -105789,7 +106131,7 @@ class Test_TC_SU_1_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_1_1Suite() {} + ~Test_TC_MOD_3_3Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -105828,15 +106170,16 @@ class Test_TC_SU_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_1Suite : public TestCommand +class Test_TC_MOD_3_4Suite : public TestCommand { public: - Test_TC_SU_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_1", 0, credsIssuerConfig) + Test_TC_MOD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MOD_3_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -105844,7 +106187,7 @@ class Test_TC_SU_2_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_1Suite() {} + ~Test_TC_MOD_3_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -105883,15 +106226,16 @@ class Test_TC_SU_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_2Suite : public TestCommand +class Test_TC_SU_1_1Suite : public TestCommand { public: - Test_TC_SU_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_2", 0, credsIssuerConfig) + Test_TC_SU_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_1_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -105899,7 +106243,7 @@ class Test_TC_SU_2_2Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_2Suite() {} + ~Test_TC_SU_1_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -105938,15 +106282,16 @@ class Test_TC_SU_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_3Suite : public TestCommand +class Test_TC_SU_2_1Suite : public TestCommand { public: - Test_TC_SU_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_3", 0, credsIssuerConfig) + Test_TC_SU_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -105954,7 +106299,7 @@ class Test_TC_SU_2_3Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_3Suite() {} + ~Test_TC_SU_2_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -105993,15 +106338,16 @@ class Test_TC_SU_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_4Suite : public TestCommand +class Test_TC_SU_2_2Suite : public TestCommand { public: - Test_TC_SU_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_4", 0, credsIssuerConfig) + Test_TC_SU_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_2", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -106009,7 +106355,7 @@ class Test_TC_SU_2_4Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_4Suite() {} + ~Test_TC_SU_2_2Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -106048,15 +106394,16 @@ class Test_TC_SU_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_5Suite : public TestCommand +class Test_TC_SU_2_3Suite : public TestCommand { public: - Test_TC_SU_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_5", 0, credsIssuerConfig) + Test_TC_SU_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_3", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -106064,7 +106411,7 @@ class Test_TC_SU_2_5Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_5Suite() {} + ~Test_TC_SU_2_3Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -106103,15 +106450,16 @@ class Test_TC_SU_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_6Suite : public TestCommand +class Test_TC_SU_2_4Suite : public TestCommand { public: - Test_TC_SU_2_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_6", 0, credsIssuerConfig) + Test_TC_SU_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -106119,7 +106467,7 @@ class Test_TC_SU_2_6Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_6Suite() {} + ~Test_TC_SU_2_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -106158,15 +106506,16 @@ class Test_TC_SU_2_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_7Suite : public TestCommand +class Test_TC_SU_2_5Suite : public TestCommand { public: - Test_TC_SU_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_7", 0, credsIssuerConfig) + Test_TC_SU_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_5", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -106174,7 +106523,7 @@ class Test_TC_SU_2_7Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_7Suite() {} + ~Test_TC_SU_2_5Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -106213,15 +106562,16 @@ class Test_TC_SU_2_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_2_8Suite : public TestCommand +class Test_TC_SU_2_6Suite : public TestCommand { public: - Test_TC_SU_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_8", 0, credsIssuerConfig) + Test_TC_SU_2_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_6", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -106229,7 +106579,7 @@ class Test_TC_SU_2_8Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_8Suite() {} + ~Test_TC_SU_2_6Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -106268,15 +106618,16 @@ class Test_TC_SU_2_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; -class Test_TC_SU_3_1Suite : public TestCommand +class Test_TC_SU_2_7Suite : public TestCommand { public: - Test_TC_SU_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_1", 0, credsIssuerConfig) + Test_TC_SU_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_7", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -106284,7 +106635,7 @@ class Test_TC_SU_3_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_3_1Suite() {} + ~Test_TC_SU_2_7Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -106323,7 +106674,120 @@ class Test_TC_SU_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_SU_2_8Suite : public TestCommand +{ +public: + Test_TC_SU_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_8", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_SU_2_8Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_SU_3_1Suite : public TestCommand +{ +public: + Test_TC_SU_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_SU_3_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } return CHIP_NO_ERROR; } }; @@ -106378,7 +106842,8 @@ class Test_TC_SU_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106433,7 +106898,8 @@ class Test_TC_SU_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106488,7 +106954,8 @@ class Test_TC_SU_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106543,7 +107010,8 @@ class Test_TC_SU_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106598,7 +107066,8 @@ class Test_TC_SU_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106653,7 +107122,8 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106708,7 +107178,8 @@ class Test_TC_SC_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106763,7 +107234,8 @@ class Test_TC_SC_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106818,7 +107290,8 @@ class Test_TC_SC_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106873,7 +107346,8 @@ class Test_TC_SC_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106928,7 +107402,8 @@ class Test_TC_SC_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -106983,7 +107458,8 @@ class Test_TC_SC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107038,7 +107514,8 @@ class Test_TC_SC_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107093,7 +107570,8 @@ class Test_TC_SC_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107148,7 +107626,8 @@ class Test_TC_SC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107203,7 +107682,8 @@ class Test_TC_SC_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107258,7 +107738,8 @@ class Test_TC_SC_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107313,7 +107794,8 @@ class Test_TC_SC_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107368,7 +107850,8 @@ class Test_TC_SC_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107423,7 +107906,8 @@ class Test_TC_SC_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107478,7 +107962,8 @@ class Test_TC_SC_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107533,7 +108018,8 @@ class Test_TC_SC_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107588,7 +108074,8 @@ class Test_TC_SC_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107643,7 +108130,8 @@ class Test_TC_SC_4_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107698,7 +108186,8 @@ class Test_TC_SC_4_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107753,7 +108242,8 @@ class Test_TC_SC_4_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107808,7 +108298,8 @@ class Test_TC_SC_4_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107863,7 +108354,8 @@ class Test_TC_SC_4_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107918,7 +108410,8 @@ class Test_TC_SC_5_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -107973,62 +108466,64 @@ class Test_TC_SC_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_DGSW_2_1Suite : public TestCommand -{ -public: - Test_TC_DGSW_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGSW_2_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_DGSW_2_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) { - ContinueOnChipMainThread(CHIP_NO_ERROR); } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} + return CHIP_NO_ERROR; + } +}; + +class Test_TC_DGSW_2_1Suite : public TestCommand +{ +public: + Test_TC_DGSW_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGSW_2_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_DGSW_2_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } return CHIP_NO_ERROR; } }; @@ -108083,7 +108578,8 @@ class Test_TC_DGSW_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108138,7 +108634,8 @@ class Test_TC_DGSW_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108193,7 +108690,8 @@ class Test_TC_DGSW_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108248,7 +108746,8 @@ class Test_TC_DGWIFI_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108303,7 +108802,8 @@ class Test_TC_DGWIFI_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108358,7 +108858,8 @@ class Test_TC_WNCV_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108413,7 +108914,8 @@ class Test_TC_WNCV_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108535,6 +109037,65 @@ class Test_TC_FLW_2_2Suite : public TestCommand } }; +<<<<<<< HEAD +======= +class Test_TC_FLW_3_1Suite : public TestCommand +{ +public: + Test_TC_FLW_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLW_3_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_FLW_3_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } + return CHIP_NO_ERROR; + } +}; + +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) class Test_TC_OCC_3_1Suite : public TestCommand { public: @@ -108696,11 +109257,71 @@ class Test_TC_PS_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; +<<<<<<< HEAD +======= +class Test_TC_PS_3_1Suite : public TestCommand +{ +public: + Test_TC_PS_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PS_3_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_PS_3_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } + return CHIP_NO_ERROR; + } +}; + +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) class Test_TC_BOOL_2_2Suite : public TestCommand { public: @@ -108751,11 +109372,71 @@ class Test_TC_BOOL_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; +<<<<<<< HEAD +======= +class Test_TC_BOOL_3_1Suite : public TestCommand +{ +public: + Test_TC_BOOL_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_3_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_BOOL_3_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } + return CHIP_NO_ERROR; + } +}; + +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) class Test_TC_CC_2_2Suite : public TestCommand { public: @@ -108806,7 +109487,8 @@ class Test_TC_CC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108861,7 +109543,8 @@ class Test_TC_CC_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108916,7 +109599,8 @@ class Test_TC_CC_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -108971,7 +109655,8 @@ class Test_TC_CC_5_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -109026,7 +109711,8 @@ class Test_TC_CC_6_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -109081,7 +109767,8 @@ class Test_TC_CC_7_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -109136,7 +109823,8 @@ class Test_TC_CC_9_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113033,7 +113721,8 @@ class Test_TC_DRLK_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113088,7 +113777,8 @@ class Test_TC_DRLK_2_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113143,7 +113833,8 @@ class Test_TC_DRLK_2_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113198,7 +113889,8 @@ class Test_TC_DRLK_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113253,7 +113945,8 @@ class Test_TC_DRLK_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113308,7 +114001,8 @@ class Test_TC_DRLK_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113363,7 +114057,8 @@ class Test_TC_LCFG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113418,7 +114113,8 @@ class Test_TC_LVL_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113473,7 +114169,8 @@ class Test_TC_LVL_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -113528,7 +114225,8 @@ class Test_TC_LVL_8_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -115414,7 +116112,8 @@ class Test_TC_OO_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -115469,7 +116168,8 @@ class Test_TC_OO_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -115671,11 +116371,71 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } + return CHIP_NO_ERROR; + } +}; + +<<<<<<< HEAD +======= +class Test_TC_SWTCH_3_1Suite : public TestCommand +{ +public: + Test_TC_SWTCH_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_3_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_SWTCH_3_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } return CHIP_NO_ERROR; } }; +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) class Test_TC_SWTCH_3_2Suite : public TestCommand { public: @@ -115726,7 +116486,8 @@ class Test_TC_SWTCH_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -115930,7 +116691,8 @@ class Test_TC_TMP_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -115985,7 +116747,8 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116040,7 +116803,8 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116095,7 +116859,8 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116151,7 +116916,8 @@ class Test_TC_DGTHREAD_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116207,7 +116973,8 @@ class Test_TC_DGTHREAD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116263,7 +117030,8 @@ class Test_TC_DGTHREAD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116319,12 +117087,15 @@ class Test_TC_DGTHREAD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; class Test_TC_DGTHREAD_3_4Suite : public TestCommand +<<<<<<< HEAD +======= { public: Test_TC_DGTHREAD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : @@ -116375,7 +117146,65 @@ class Test_TC_DGTHREAD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_DGTHREAD_3_5Suite : public TestCommand +{ +public: + Test_TC_DGTHREAD_3_5Suite(CredentialIssuerCommands * credsIssuerConfig) : + TestCommand("Test_TC_DGTHREAD_3_5", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_DGTHREAD_3_5Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } return CHIP_NO_ERROR; } }; @@ -116430,7 +117259,8 @@ class Test_TC_ACT_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116485,7 +117315,178 @@ class Test_TC_ACT_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_ACT_3_1Suite : public TestCommand +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) +{ +public: + Test_TC_DGTHREAD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : + TestCommand("Test_TC_DGTHREAD_3_4", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_DGTHREAD_3_4Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_ACT_2_1Suite : public TestCommand +{ +public: + Test_TC_ACT_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_2_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_ACT_2_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_ACT_2_2Suite : public TestCommand +{ +public: + Test_TC_ACT_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_2_2", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_ACT_2_2Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + } return CHIP_NO_ERROR; } }; @@ -116540,7 +117541,8 @@ class Test_TC_ACT_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116595,7 +117597,8 @@ class Test_TC_LTIME_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116650,7 +117653,8 @@ class Test_TC_LTIME_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116705,7 +117709,8 @@ class Test_TC_BIND_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -116815,7 +117820,8 @@ class Test_TC_BIND_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117061,6 +118067,7 @@ class Test_TC_S_1_1Suite : public TestCommand using namespace chip::app::Clusters; switch (testIndex) { +<<<<<<< HEAD case 0: { LogStep(0, "Commission DUT to TH (can be skipped if done in a preceding test)"); ListFreer listFreer; @@ -117126,6 +118133,7 @@ class Test_TC_S_1_1Suite : public TestCommand return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Scenes::Id, Scenes::Attributes::AcceptedCommandList::Id, true, chip::NullOptional); } +<<<<<<< HEAD case 11: { LogStep(11, "Read GeneratedCommandList (global attribute 65528)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Scenes::Id, Scenes::Attributes::GeneratedCommandList::Id, true, @@ -117149,6 +118157,10 @@ class Test_TC_S_1_1Suite : public TestCommand return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Scenes::Id, Scenes::Attributes::GeneratedCommandList::Id, true, chip::NullOptional); } +======= +======= +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) +>>>>>>> 4f9ddf3be4 (MediaClusters: Update SkipChannel per issue 26104) } return CHIP_NO_ERROR; } @@ -117204,7 +118216,8 @@ class Test_TC_S_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117259,7 +118272,8 @@ class Test_TC_S_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117314,7 +118328,8 @@ class Test_TC_S_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117369,7 +118384,8 @@ class Test_TC_S_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117424,7 +118440,8 @@ class Test_TC_PCC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117479,7 +118496,8 @@ class Test_TC_ACL_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117534,7 +118552,8 @@ class Test_TC_ACL_2_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117590,7 +118609,8 @@ class Test_TC_BRBINFO_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117646,7 +118666,8 @@ class Test_TC_BRBINFO_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; @@ -117701,7 +118722,8 @@ class Test_TC_ACE_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - {} + { + } return CHIP_NO_ERROR; } }; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index b69c3ef1dcbf1b..520ff1615daf13 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -84346,7 +84346,7 @@ class ChannelSkipChannel : public ClusterCommand { ChannelSkipChannel() : ClusterCommand("skip-channel") { - AddArgument("Count", 0, UINT16_MAX, &mRequest.count); + AddArgument("Count", INT16_MIN, INT16_MAX, &mRequest.count); ClusterCommand::AddArguments(); } @@ -84359,7 +84359,7 @@ class ChannelSkipChannel : public ClusterCommand { __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.count = [NSNumber numberWithUnsignedShort:mRequest.count]; + params.count = [NSNumber numberWithShort:mRequest.count]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 589e59669133b4..af1775889ef2af 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -49337,7 +49337,7 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithUnsignedShort:1U]; + params.count = [NSNumber numberWithShort:1]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { NSLog(@"Sends a SkipChannel command to the DUT Error: %@", err); @@ -83810,7 +83810,7 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithUnsignedShort:1U]; + params.count = [NSNumber numberWithShort:1]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { NSLog(@"Skip Channel Command Error: %@", err); diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index 2a1289be1113cc..c0e6a9384d2e57 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -35,7 +35,9 @@ namespace app { // Cluster specific command parsing -namespace Clusters {} // namespace Clusters +namespace Clusters { + +} // namespace Clusters void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h index 345ab29adbfc03..3a1ea88267ba5f 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h @@ -28,11 +28,13 @@ // Separate block is generated for big-endian and little-endian cases. #if BIGENDIAN_CPU #define GENERATED_DEFAULTS \ - {} + { \ + } #else // !BIGENDIAN_CPU #define GENERATED_DEFAULTS \ - {} + { \ + } #endif // BIGENDIAN_CPU @@ -41,12 +43,14 @@ // This is an array of EmberAfAttributeMinMaxValue structures. #define GENERATED_MIN_MAX_DEFAULT_COUNT 0 #define GENERATED_MIN_MAX_DEFAULTS \ - {} + { \ + } // This is an array of EmberAfAttributeMetadata structures. #define GENERATED_ATTRIBUTE_COUNT 0 #define GENERATED_ATTRIBUTES \ - {} + { \ + } // clang-format off #define GENERATED_EVENT_COUNT 0 From 9d848ab67bba60bb86c9cfbdec0e9d0cf350a871 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Thu, 11 May 2023 11:30:55 +0200 Subject: [PATCH 02/23] Update delegate methods --- examples/tv-app/android/java/ChannelManager.cpp | 2 +- examples/tv-app/android/java/ChannelManager.h | 2 +- examples/tv-app/linux/include/channel/ChannelManager.cpp | 4 ++-- examples/tv-app/linux/include/channel/ChannelManager.h | 2 +- src/app/clusters/channel-server/channel-delegate.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp index 84b13eea5a55be..4a8c3524431fd3 100644 --- a/examples/tv-app/android/java/ChannelManager.cpp +++ b/examples/tv-app/android/java/ChannelManager.cpp @@ -330,7 +330,7 @@ bool ChannelManager::HandleChangeChannelByNumber(const uint16_t & majorNumber, c return static_cast(ret); } -bool ChannelManager::HandleSkipChannel(const uint16_t & count) +bool ChannelManager::HandleSkipChannel(const int16_t & count) { jboolean ret = JNI_FALSE; JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); diff --git a/examples/tv-app/android/java/ChannelManager.h b/examples/tv-app/android/java/ChannelManager.h index 0439900f7c37f2..77221069c30fc1 100644 --- a/examples/tv-app/android/java/ChannelManager.h +++ b/examples/tv-app/android/java/ChannelManager.h @@ -38,7 +38,7 @@ class ChannelManager : public ChannelDelegate void HandleChangeChannel(CommandResponseHelper & helper, const CharSpan & match) override; bool HandleChangeChannelByNumber(const uint16_t & majorNumber, const uint16_t & minorNumber) override; - bool HandleSkipChannel(const uint16_t & count) override; + bool HandleSkipChannel(const int16_t & count) override; uint32_t GetFeatureMap(chip::EndpointId endpoint) override; diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index bc517928e80e4a..aaa2a901a09c4e 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -167,10 +167,10 @@ bool ChannelManager::HandleChangeChannelByNumber(const uint16_t & majorNumber, c return channelChanged; } -bool ChannelManager::HandleSkipChannel(const uint16_t & count) +bool ChannelManager::HandleSkipChannel(const int16_t & count) { // TODO: Insert code here - uint16_t newChannelIndex = static_cast((count + mCurrentChannelIndex) % mChannels.size()); + uint16_t newChannelIndex = static_cast((count + mCurrentChannelIndex) % mChannels.size()); mCurrentChannelIndex = newChannelIndex; mCurrentChannel = mChannels[mCurrentChannelIndex]; return true; diff --git a/examples/tv-app/linux/include/channel/ChannelManager.h b/examples/tv-app/linux/include/channel/ChannelManager.h index 0557624a3c408a..326edddc53cc77 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.h +++ b/examples/tv-app/linux/include/channel/ChannelManager.h @@ -39,7 +39,7 @@ class ChannelManager : public ChannelDelegate void HandleChangeChannel(CommandResponseHelper & helper, const CharSpan & match) override; bool HandleChangeChannelByNumber(const uint16_t & majorNumber, const uint16_t & minorNumber) override; - bool HandleSkipChannel(const uint16_t & count) override; + bool HandleSkipChannel(const int16_t & count) override; uint32_t GetFeatureMap(chip::EndpointId endpoint) override; diff --git a/src/app/clusters/channel-server/channel-delegate.h b/src/app/clusters/channel-server/channel-delegate.h index 60f5aba15af1c3..866b6ca66ee704 100644 --- a/src/app/clusters/channel-server/channel-delegate.h +++ b/src/app/clusters/channel-server/channel-delegate.h @@ -42,7 +42,7 @@ class Delegate virtual void HandleChangeChannel(CommandResponseHelper & helper, const chip::CharSpan & match) = 0; virtual bool HandleChangeChannelByNumber(const uint16_t & majorNumber, const uint16_t & minorNumber) = 0; - virtual bool HandleSkipChannel(const uint16_t & count) = 0; + virtual bool HandleSkipChannel(const int16_t & count) = 0; bool HasFeature(chip::EndpointId endpoint, ChannelFeature feature); virtual uint32_t GetFeatureMap(chip::EndpointId endpoint) = 0; From 9d4dc7b5aa769fa8ac37b11a523f4f44b1de18f9 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Thu, 11 May 2023 11:36:55 +0200 Subject: [PATCH 03/23] Apply restyle fix --- src/app/clusters/channel-server/channel-delegate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/clusters/channel-server/channel-delegate.h b/src/app/clusters/channel-server/channel-delegate.h index 866b6ca66ee704..bf2326dfe51aa4 100644 --- a/src/app/clusters/channel-server/channel-delegate.h +++ b/src/app/clusters/channel-server/channel-delegate.h @@ -42,7 +42,7 @@ class Delegate virtual void HandleChangeChannel(CommandResponseHelper & helper, const chip::CharSpan & match) = 0; virtual bool HandleChangeChannelByNumber(const uint16_t & majorNumber, const uint16_t & minorNumber) = 0; - virtual bool HandleSkipChannel(const int16_t & count) = 0; + virtual bool HandleSkipChannel(const int16_t & count) = 0; bool HasFeature(chip::EndpointId endpoint, ChannelFeature feature); virtual uint32_t GetFeatureMap(chip::EndpointId endpoint) = 0; From ea42a61ac0ff97f6e9171dd8339bf95a34607365 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Mon, 15 May 2023 11:59:46 +0200 Subject: [PATCH 04/23] Update cast issue --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index aaa2a901a09c4e..379b8081d9a713 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -170,7 +170,7 @@ bool ChannelManager::HandleChangeChannelByNumber(const uint16_t & majorNumber, c bool ChannelManager::HandleSkipChannel(const int16_t & count) { // TODO: Insert code here - uint16_t newChannelIndex = static_cast((count + mCurrentChannelIndex) % mChannels.size()); + uint16_t newChannelIndex = static_cast((count + mCurrentChannelIndex) % mChannels.size()); mCurrentChannelIndex = newChannelIndex; mCurrentChannel = mChannels[mCurrentChannelIndex]; return true; From 5fe02acd02ce346d9a0d1b78584cecfa755bdd96 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Mon, 15 May 2023 16:44:13 +0200 Subject: [PATCH 05/23] Update the generated files --- .../app-templates/endpoint_config.h | 10 +- .../app-templates/endpoint_config.h | 5 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 6 +- .../CHIP/zap-generated/MTRClusters.mm | 6 +- .../app-common/zap-generated/cluster-enums.h | 73 +- .../zap-generated/cluster-objects.cpp | 826 ++++++++++--- .../chip-tool/zap-generated/test/Commands.h | 1090 +++++++---------- .../zap-generated/IMClusterCommandHandler.cpp | 4 +- .../zap-generated/endpoint_config.h | 12 +- 9 files changed, 1145 insertions(+), 887 deletions(-) diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 94ba74bb4f188c..befeed9758c537 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -347,7 +347,10 @@ { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 }, /* nullable_range_restricted_int16u */ \ { (uint16_t) -0x64, (uint16_t) -0x96, (uint16_t) 0xC8 }, /* nullable_range_restricted_int16s */ \ \ - /* Endpoint: 2, Cluster: On/Off (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 } /* StartUpOnOff */ \ + /* Endpoint: 2, Cluster: On/Off (server) */ \ + { \ + (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 \ + } /* StartUpOnOff */ \ } // This is an array of EmberAfAttributeMetadata structures. @@ -2981,7 +2984,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, { 0xF002, 1 } \ + { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, \ + { \ + 0xF002, 1 \ + } \ } // Array of device type offsets diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h index 6a1b74207e1c62..43598a42835cd6 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h @@ -1186,7 +1186,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0101, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x0101, 1 \ + } \ } // Array of device type offsets diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index f8824de91a3023..2d4cd5b362a8d8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -36,11 +36,11 @@ using chip::Callback::Callback; using chip::Callback::Cancelable; using namespace chip::app::Clusters; -using chip::Messaging::ExchangeManager; -using chip::SessionHandle; using chip::Optional; -using chip::System::Clock::Timeout; +using chip::SessionHandle; +using chip::Messaging::ExchangeManager; using chip::System::Clock::Seconds16; +using chip::System::Clock::Timeout; // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects. @implementation MTRBaseClusterIdentify diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 28c5d31d8a4aed..518e1951426d64 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -36,11 +36,11 @@ using chip::Callback::Callback; using chip::Callback::Cancelable; using namespace chip::app::Clusters; -using chip::Messaging::ExchangeManager; -using chip::SessionHandle; using chip::Optional; -using chip::System::Clock::Timeout; +using chip::SessionHandle; +using chip::Messaging::ExchangeManager; using chip::System::Clock::Seconds16; +using chip::System::Clock::Timeout; static void MTRClustersLogEnqueue(NSString * logPrefix, MTRAsyncCallbackWorkQueue * workQueue) { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 8f2a13957ffe52..c712723396a1b7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -184,8 +184,7 @@ enum class OnOffFeature : uint32_t }; } // namespace OnOff -namespace OnOffSwitchConfiguration { -} // namespace OnOffSwitchConfiguration +namespace OnOffSwitchConfiguration {} // namespace OnOffSwitchConfiguration namespace LevelControl { @@ -243,17 +242,13 @@ enum class LevelControlOptions : uint8_t }; } // namespace LevelControl -namespace BinaryInputBasic { -} // namespace BinaryInputBasic +namespace BinaryInputBasic {} // namespace BinaryInputBasic -namespace PulseWidthModulation { -} // namespace PulseWidthModulation +namespace PulseWidthModulation {} // namespace PulseWidthModulation -namespace Descriptor { -} // namespace Descriptor +namespace Descriptor {} // namespace Descriptor -namespace Binding { -} // namespace Binding +namespace Binding {} // namespace Binding namespace AccessControl { @@ -519,8 +514,7 @@ enum class OTAUpdateStateEnum : uint8_t }; } // namespace OtaSoftwareUpdateRequestor -namespace LocalizationConfiguration { -} // namespace LocalizationConfiguration +namespace LocalizationConfiguration {} // namespace LocalizationConfiguration namespace TimeFormatLocalization { @@ -581,8 +575,7 @@ enum class UnitLocalizationFeature : uint32_t }; } // namespace UnitLocalization -namespace PowerSourceConfiguration { -} // namespace PowerSourceConfiguration +namespace PowerSourceConfiguration {} // namespace PowerSourceConfiguration namespace PowerSource { @@ -1481,23 +1474,17 @@ enum class GroupKeySecurityPolicyEnum : uint8_t }; } // namespace GroupKeyManagement -namespace FixedLabel { -} // namespace FixedLabel +namespace FixedLabel {} // namespace FixedLabel -namespace UserLabel { -} // namespace UserLabel +namespace UserLabel {} // namespace UserLabel -namespace ProxyConfiguration { -} // namespace ProxyConfiguration +namespace ProxyConfiguration {} // namespace ProxyConfiguration -namespace ProxyDiscovery { -} // namespace ProxyDiscovery +namespace ProxyDiscovery {} // namespace ProxyDiscovery -namespace ProxyValid { -} // namespace ProxyValid +namespace ProxyValid {} // namespace ProxyValid -namespace BooleanState { -} // namespace BooleanState +namespace BooleanState {} // namespace BooleanState namespace IcdManagement { @@ -2696,8 +2683,7 @@ enum class WindowCoveringFeature : uint32_t }; } // namespace WindowCovering -namespace BarrierControl { -} // namespace BarrierControl +namespace BarrierControl {} // namespace BarrierControl namespace PumpConfigurationAndControl { @@ -2920,8 +2906,7 @@ enum class WindSupportMask : uint8_t }; } // namespace FanControl -namespace ThermostatUserInterfaceConfiguration { -} // namespace ThermostatUserInterfaceConfiguration +namespace ThermostatUserInterfaceConfiguration {} // namespace ThermostatUserInterfaceConfiguration namespace ColorControl { @@ -3064,8 +3049,7 @@ enum class ColorLoopUpdateFlags : uint8_t }; } // namespace ColorControl -namespace BallastConfiguration { -} // namespace BallastConfiguration +namespace BallastConfiguration {} // namespace BallastConfiguration namespace IlluminanceMeasurement { @@ -3082,8 +3066,7 @@ enum class LightSensorType : uint8_t }; } // namespace IlluminanceMeasurement -namespace TemperatureMeasurement { -} // namespace TemperatureMeasurement +namespace TemperatureMeasurement {} // namespace TemperatureMeasurement namespace PressureMeasurement { @@ -3094,11 +3077,9 @@ enum class PressureMeasurementFeature : uint32_t }; } // namespace PressureMeasurement -namespace FlowMeasurement { -} // namespace FlowMeasurement +namespace FlowMeasurement {} // namespace FlowMeasurement -namespace RelativeHumidityMeasurement { -} // namespace RelativeHumidityMeasurement +namespace RelativeHumidityMeasurement {} // namespace RelativeHumidityMeasurement namespace OccupancySensing { @@ -3131,8 +3112,7 @@ enum class OccupancySensorTypeBitmap : uint8_t }; } // namespace OccupancySensing -namespace WakeOnLan { -} // namespace WakeOnLan +namespace WakeOnLan {} // namespace WakeOnLan namespace Channel { @@ -3255,8 +3235,7 @@ enum class MediaInputFeature : uint32_t }; } // namespace MediaInput -namespace LowPower { -} // namespace LowPower +namespace LowPower {} // namespace LowPower namespace KeypadInput { @@ -3508,16 +3487,18 @@ enum class ApplicationStatusEnum : uint8_t }; } // namespace ApplicationBasic -namespace AccountLogin { -} // namespace AccountLogin +namespace AccountLogin {} // namespace AccountLogin -namespace ElectricalMeasurement { -} // namespace ElectricalMeasurement +namespace ElectricalMeasurement {} // namespace ElectricalMeasurement +<<<<<<< HEAD <<<<<<< HEAD ======= namespace ClientMonitoring { } // namespace ClientMonitoring +======= +namespace ClientMonitoring {} // namespace ClientMonitoring +>>>>>>> 527fe00c24 (Update the generated files) >>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) namespace UnitTesting { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 3b325d58f6df97..05f97add4899f9 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -237,8 +237,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Identify namespace Groups { @@ -674,8 +673,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Groups namespace Scenes { @@ -1693,8 +1691,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Scenes namespace OnOff { @@ -1966,14 +1963,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OnOff namespace OnOffSwitchConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2012,8 +2007,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OnOffSwitchConfiguration namespace LevelControl { @@ -2515,14 +2509,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace LevelControl namespace BinaryInputBasic { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2582,14 +2574,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace BinaryInputBasic namespace PulseWidthModulation { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2622,8 +2612,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PulseWidthModulation namespace Descriptor { @@ -2674,8 +2663,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace DeviceTypeStruct } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2720,8 +2708,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Descriptor namespace Binding { @@ -2797,8 +2784,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace TargetStruct } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2834,8 +2820,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Binding namespace AccessControl { @@ -3033,8 +3018,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace AccessControlExtensionStruct } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -4620,8 +4604,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OtaSoftwareUpdateProvider namespace OtaSoftwareUpdateRequestor { @@ -4933,8 +4916,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace OtaSoftwareUpdateRequestor namespace LocalizationConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -4973,14 +4955,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace LocalizationConfiguration namespace TimeFormatLocalization { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5022,14 +5002,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TimeFormatLocalization namespace UnitLocalization { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5065,14 +5043,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace UnitLocalization namespace PowerSourceConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5108,8 +5084,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PowerSourceConfiguration namespace PowerSource { @@ -5248,8 +5223,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace WiredFaultChangeType } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5843,8 +5817,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace GeneralCommissioning namespace NetworkCommissioning { @@ -6474,8 +6447,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace NetworkCommissioning namespace DiagnosticLogs { @@ -6608,8 +6580,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace DiagnosticLogs namespace GeneralDiagnostics { @@ -8101,8 +8072,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace EthernetNetworkDiagnostics namespace TimeSynchronization { @@ -8829,8 +8799,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace ProductAppearanceStruct } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -9057,8 +9026,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace BridgedDeviceBasicInformation namespace Switch { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -9541,8 +9509,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace AdministratorCommissioning namespace OperationalCredentials { @@ -10226,8 +10193,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OperationalCredentials namespace GroupKeyManagement { @@ -10696,16 +10662,13 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace GroupKeyManagement namespace FixedLabel { -namespace Structs { -} // namespace Structs +namespace Structs {} // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10741,16 +10704,13 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace FixedLabel namespace UserLabel { -namespace Structs { -} // namespace Structs +namespace Structs {} // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10786,14 +10746,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace UserLabel namespace ProxyConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10826,14 +10784,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ProxyConfiguration namespace ProxyDiscovery { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10866,14 +10822,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ProxyDiscovery namespace ProxyValid { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10906,14 +10860,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ProxyValid namespace BooleanState { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -11281,8 +11233,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace IcdManagement namespace ModeSelect { @@ -14077,8 +14028,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace ClearUser. namespace SetCredential { +======= +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace WindowCovering +namespace BarrierControl { + +namespace Commands { +namespace BarrierControlGoToPercent { +>>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -14221,9 +14184,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace GetCredentialStatus. namespace GetCredentialStatusResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +======= +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace BarrierControl +namespace PumpConfigurationAndControl { + +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +>>>>>>> 527fe00c24 (Update the generated files) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -15661,82 +15638,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) +<<<<<<< HEAD +======= ======= - switch (path.mAttributeId) - { - case Attributes::FanMode::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, fanMode)); - break; - case Attributes::FanModeSequence::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, fanModeSequence)); - break; - case Attributes::PercentSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, percentSetting)); - break; - case Attributes::PercentCurrent::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, percentCurrent)); - break; - case Attributes::SpeedMax::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, speedMax)); - break; - case Attributes::SpeedSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, speedSetting)); - break; - case Attributes::SpeedCurrent::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, speedCurrent)); - break; - case Attributes::RockSupport::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, rockSupport)); - break; - case Attributes::RockSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, rockSetting)); - break; - case Attributes::WindSupport::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, windSupport)); - break; - case Attributes::WindSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, windSetting)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; - } - - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace FanControl -namespace ThermostatUserInterfaceConfiguration { - -namespace Commands { -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) { if (!TLV::IsContextTag(reader.GetTag())) { @@ -15753,14 +15657,294 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -} // namespace ElectronicTemperatureHigh. -namespace PumpBlocked { -======= -} // namespace Attributes +} // namespace ClearWeeklySchedule. +} // namespace Commands -namespace Events { -} // namespace Events +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::LocalTemperature::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, localTemperature)); + break; + case Attributes::OutdoorTemperature::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, outdoorTemperature)); + break; + case Attributes::Occupancy::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupancy)); + break; + case Attributes::AbsMinHeatSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, absMinHeatSetpointLimit)); + break; + case Attributes::AbsMaxHeatSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, absMaxHeatSetpointLimit)); + break; + case Attributes::AbsMinCoolSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, absMinCoolSetpointLimit)); + break; + case Attributes::AbsMaxCoolSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, absMaxCoolSetpointLimit)); + break; + case Attributes::PICoolingDemand::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PICoolingDemand)); + break; + case Attributes::PIHeatingDemand::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIHeatingDemand)); + break; + case Attributes::HVACSystemTypeConfiguration::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, HVACSystemTypeConfiguration)); + break; + case Attributes::LocalTemperatureCalibration::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, localTemperatureCalibration)); + break; + case Attributes::OccupiedCoolingSetpoint::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedCoolingSetpoint)); + break; + case Attributes::OccupiedHeatingSetpoint::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedHeatingSetpoint)); + break; + case Attributes::UnoccupiedCoolingSetpoint::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedCoolingSetpoint)); + break; + case Attributes::UnoccupiedHeatingSetpoint::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedHeatingSetpoint)); + break; + case Attributes::MinHeatSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, minHeatSetpointLimit)); + break; + case Attributes::MaxHeatSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, maxHeatSetpointLimit)); + break; + case Attributes::MinCoolSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, minCoolSetpointLimit)); + break; + case Attributes::MaxCoolSetpointLimit::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, maxCoolSetpointLimit)); + break; + case Attributes::MinSetpointDeadBand::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, minSetpointDeadBand)); + break; + case Attributes::RemoteSensing::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, remoteSensing)); + break; + case Attributes::ControlSequenceOfOperation::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, controlSequenceOfOperation)); + break; + case Attributes::SystemMode::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, systemMode)); + break; + case Attributes::ThermostatRunningMode::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningMode)); + break; + case Attributes::StartOfWeek::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, startOfWeek)); + break; + case Attributes::NumberOfWeeklyTransitions::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, numberOfWeeklyTransitions)); + break; + case Attributes::NumberOfDailyTransitions::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, numberOfDailyTransitions)); + break; + case Attributes::TemperatureSetpointHold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHold)); + break; + case Attributes::TemperatureSetpointHoldDuration::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHoldDuration)); + break; + case Attributes::ThermostatProgrammingOperationMode::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, thermostatProgrammingOperationMode)); + break; + case Attributes::ThermostatRunningState::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningState)); + break; + case Attributes::SetpointChangeSource::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSource)); + break; + case Attributes::SetpointChangeAmount::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeAmount)); + break; + case Attributes::SetpointChangeSourceTimestamp::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSourceTimestamp)); + break; + case Attributes::OccupiedSetback::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetback)); + break; + case Attributes::OccupiedSetbackMin::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMin)); + break; + case Attributes::OccupiedSetbackMax::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMax)); + break; + case Attributes::UnoccupiedSetback::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetback)); + break; + case Attributes::UnoccupiedSetbackMin::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMin)); + break; + case Attributes::UnoccupiedSetbackMax::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMax)); + break; + case Attributes::EmergencyHeatDelta::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, emergencyHeatDelta)); + break; + case Attributes::ACType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACType)); + break; + case Attributes::ACCapacity::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacity)); + break; + case Attributes::ACRefrigerantType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACRefrigerantType)); + break; + case Attributes::ACCompressorType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCompressorType)); + break; + case Attributes::ACErrorCode::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACErrorCode)); + break; + case Attributes::ACLouverPosition::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACLouverPosition)); + break; + case Attributes::ACCoilTemperature::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCoilTemperature)); + break; + case Attributes::ACCapacityformat::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacityformat)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace Thermostat +namespace FanControl { + +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ +>>>>>>> 527fe00c24 (Update the generated files) + switch (path.mAttributeId) + { + case Attributes::FanMode::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, fanMode)); + break; + case Attributes::FanModeSequence::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, fanModeSequence)); + break; + case Attributes::PercentSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, percentSetting)); + break; + case Attributes::PercentCurrent::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, percentCurrent)); + break; + case Attributes::SpeedMax::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, speedMax)); + break; + case Attributes::SpeedSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, speedSetting)); + break; + case Attributes::SpeedCurrent::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, speedCurrent)); + break; + case Attributes::RockSupport::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, rockSupport)); + break; + case Attributes::RockSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, rockSetting)); + break; + case Attributes::WindSupport::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, windSupport)); + break; + case Attributes::WindSetting::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, windSetting)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace FanControl +namespace ThermostatUserInterfaceConfiguration { + +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) +>>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} +<<<<<<< HEAD +} // namespace ElectronicTemperatureHigh. +namespace PumpBlocked { +======= +} // namespace Attributes + +namespace Events {} // namespace Events } // namespace ThermostatUserInterfaceConfiguration namespace ColorControl { @@ -16605,9 +16789,16 @@ namespace Events {} // namespace Events } // namespace ThermostatUserInterfaceConfiguration namespace ColorControl { +<<<<<<< HEAD namespace Commands { namespace MoveToHue { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +======= +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +>>>>>>> 527fe00c24 (Update the generated files) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -16620,7 +16811,19 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const return CHIP_NO_ERROR; } +<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +======= +namespace Events {} // namespace Events + +} // namespace TemperatureMeasurement +namespace PressureMeasurement { + +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +>>>>>>> 527fe00c24 (Update the generated files) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; @@ -16658,9 +16861,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace MoveToHue. namespace MoveHue { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +======= +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace PressureMeasurement +namespace FlowMeasurement { + +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +>>>>>>> 527fe00c24 (Update the generated files) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -16671,8 +16888,22 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +======= +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace FlowMeasurement +namespace RelativeHumidityMeasurement { + +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +>>>>>>> 527fe00c24 (Update the generated files) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; @@ -16721,6 +16952,17 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace RelativeHumidityMeasurement +namespace OccupancySensing { + +namespace Commands {} // namespace Commands +>>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16730,6 +16972,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { +<<<<<<< HEAD if (!TLV::IsContextTag(reader.GetTag())) { continue; @@ -16754,14 +16997,124 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) default: break; } +======= + case Attributes::Occupancy::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupancy)); + break; + case Attributes::OccupancySensorType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorType)); + break; + case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap)); + break; + case Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIROccupiedToUnoccupiedDelay)); + break; + case Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedDelay)); + break; + case Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedThreshold)); + break; + case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay)); + break; + case Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedDelay)); + break; + case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedThreshold)); + break; + case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactOccupiedToUnoccupiedDelay)); + break; + case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedDelay)); + break; + case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedThreshold)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace OccupancySensing +namespace WakeOnLan { + +namespace Commands {} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::MACAddress::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, MACAddress)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::EventList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; +>>>>>>> 527fe00c24 (Update the generated files) } VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD } // namespace StepHue. namespace MoveToSaturation { +======= +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace WakeOnLan +namespace Channel { +namespace Structs { +namespace ChannelInfoStruct { +>>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -17111,8 +17464,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ======= } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TemperatureMeasurement namespace PressureMeasurement { @@ -17330,8 +17682,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OccupancySensing namespace WakeOnLan { @@ -18056,8 +18407,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre <<<<<<< HEAD ======= -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TargetNavigator namespace MediaPlayback { @@ -18219,6 +18569,22 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } // namespace Attributes namespace Events {} // namespace Events +<<<<<<< HEAD +======= + +} // namespace MediaInput +namespace LowPower { + +namespace Commands { +namespace Sleep { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} +>>>>>>> 527fe00c24 (Update the generated files) } // namespace BallastConfiguration namespace IlluminanceMeasurement { @@ -18272,6 +18638,60 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } // namespace Attributes namespace Events {} // namespace Events +<<<<<<< HEAD +======= + +} // namespace LowPower +namespace KeypadInput { + +namespace Commands { +namespace SendKey { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kKeyCode), keyCode)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kKeyCode): + ReturnErrorOnFailure(DataModel::Decode(reader, keyCode)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} +} // namespace SendKey. +namespace SendKeyResponse { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kStatus), status)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} +>>>>>>> 527fe00c24 (Update the generated files) } // namespace IlluminanceMeasurement namespace TemperatureMeasurement { @@ -18916,8 +19336,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Channel namespace TargetNavigator { @@ -19097,8 +19516,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TargetNavigator namespace MediaPlayback { @@ -19323,6 +19741,18 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } +<<<<<<< HEAD +======= +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace ApplicationLauncher +namespace ApplicationBasic { +namespace Structs {} // namespace Structs + +namespace Commands {} // namespace Commands +>>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -19357,6 +19787,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const return CHIP_NO_ERROR; } +<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -19375,6 +19806,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) break; } } +======= +namespace Events {} // namespace Events +>>>>>>> 527fe00c24 (Update the generated files) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); @@ -19632,8 +20066,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace MediaPlayback namespace MediaInput { @@ -21026,8 +21459,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ApplicationBasic namespace AccountLogin { @@ -21822,8 +22254,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ElectricalMeasurement namespace UnitTesting { @@ -24270,8 +24701,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace FaultInjection diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 1153c00e5bb2af..51f78f9f3d387d 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -2865,8 +2865,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -2902,12 +2902,12 @@ class Test_TC_ACL_2_3Suite : public TestCommand ? mDOkFull.Value() : chip::ByteSpan(chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20" - "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" - "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" - "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x31\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" - "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" - "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x00\x18"), - 128); + "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" + "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" + "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x31\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" + "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" + "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x00\x18"), + 128); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; value = chip::app::DataModel::List( @@ -2942,12 +2942,12 @@ class Test_TC_ACL_2_3Suite : public TestCommand ? mDBadLength.Value() : chip::ByteSpan(chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20" - "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" - "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" - "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x32\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" - "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" - "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x2E\x00\x18"), - 129); + "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65" + "\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72" + "\x69\x6E\x67\x00\xD0\x00\x00\xF1\xFF\x02\x00\x32\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C" + "\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C" + "\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x2E\x00\x18"), + 129); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; value = chip::app::DataModel::List( @@ -2999,8 +2999,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x37\x01\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68" - "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69" - "\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69" + "\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 72); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -3029,9 +3029,9 @@ class Test_TC_ACL_2_3Suite : public TestCommand ? mDBadElem.Value() : chip::ByteSpan(chip::Uint8::from_const_char( "\x17\x10\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69\x73\x20\x69" - "\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), - 65); + "\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + 65); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; value = chip::app::DataModel::List( @@ -3060,8 +3060,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18\xFF"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18\xFF"), 72); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -3091,8 +3091,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00"), 70); listHolder_0->mList[0].fabricIndex = CurrentFabricIndex; @@ -3151,8 +3151,8 @@ class Test_TC_ACL_2_3Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[1].fabricIndex = CurrentFabricIndex; @@ -6053,8 +6053,8 @@ class Test_TC_ACL_2_7Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = TH2FabricIndex; @@ -7548,8 +7548,8 @@ class Test_TC_ACL_2_10Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = TH2FabricIndex; @@ -7671,8 +7671,8 @@ class Test_TC_ACL_2_10Suite : public TestCommand : chip::ByteSpan( chip::Uint8::from_const_char( "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69" - "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" - "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + "\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76" + "\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), 71); listHolder_0->mList[0].fabricIndex = TH2FabricIndex; @@ -34421,8 +34421,7 @@ class Test_TC_TGTNAV_8_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -93877,8 +93876,7 @@ class Test_TC_DD_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -93933,8 +93931,7 @@ class Test_TC_DD_1_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -93989,8 +93986,7 @@ class Test_TC_DD_1_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94045,8 +94041,7 @@ class Test_TC_DD_1_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94101,8 +94096,7 @@ class Test_TC_DD_1_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94157,8 +94151,7 @@ class Test_TC_DD_1_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94213,8 +94206,7 @@ class Test_TC_DD_1_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94269,8 +94261,7 @@ class Test_TC_DD_1_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94325,8 +94316,7 @@ class Test_TC_DD_1_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94381,8 +94371,7 @@ class Test_TC_DD_1_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94437,8 +94426,7 @@ class Test_TC_DD_1_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94493,8 +94481,7 @@ class Test_TC_DD_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94549,8 +94536,7 @@ class Test_TC_DD_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94605,8 +94591,7 @@ class Test_TC_DD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94661,8 +94646,7 @@ class Test_TC_DD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94717,8 +94701,7 @@ class Test_TC_DD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94773,8 +94756,7 @@ class Test_TC_DD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94829,8 +94811,7 @@ class Test_TC_DD_3_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94885,8 +94866,7 @@ class Test_TC_DD_3_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94941,8 +94921,7 @@ class Test_TC_DD_3_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -94997,8 +94976,7 @@ class Test_TC_DD_3_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95053,8 +95031,7 @@ class Test_TC_DD_3_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95109,8 +95086,7 @@ class Test_TC_DD_3_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95165,8 +95141,7 @@ class Test_TC_DD_3_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95221,8 +95196,7 @@ class Test_TC_DD_3_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95277,8 +95251,7 @@ class Test_TC_DD_3_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95333,8 +95306,7 @@ class Test_TC_DD_3_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95389,8 +95361,7 @@ class Test_TC_DD_3_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95445,8 +95416,7 @@ class Test_TC_DD_3_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95501,8 +95471,7 @@ class Test_TC_DD_3_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95557,8 +95526,7 @@ class Test_TC_DD_3_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95613,8 +95581,7 @@ class Test_TC_DD_3_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95669,8 +95636,7 @@ class Test_TC_DD_3_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -95725,8 +95691,7 @@ class Test_TC_DD_3_21Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96238,8 +96203,7 @@ class Test_TC_G_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96294,8 +96258,7 @@ class Test_TC_G_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96350,8 +96313,7 @@ class Test_TC_G_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96406,8 +96368,7 @@ class Test_TC_BDX_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96462,8 +96423,7 @@ class Test_TC_BDX_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96518,8 +96478,7 @@ class Test_TC_BDX_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96574,8 +96533,7 @@ class Test_TC_BDX_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96630,8 +96588,7 @@ class Test_TC_BDX_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96686,8 +96643,7 @@ class Test_TC_BDX_1_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96742,8 +96698,7 @@ class Test_TC_BDX_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96798,8 +96753,7 @@ class Test_TC_BDX_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96854,8 +96808,7 @@ class Test_TC_BDX_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96910,8 +96863,7 @@ class Test_TC_BDX_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -96966,8 +96918,7 @@ class Test_TC_BDX_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97022,8 +96973,7 @@ class Test_TC_BR_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97078,8 +97028,7 @@ class Test_TC_BR_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97134,8 +97083,7 @@ class Test_TC_BR_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97190,8 +97138,7 @@ class Test_TC_BR_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97246,8 +97193,7 @@ class Test_TC_DA_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97302,8 +97248,7 @@ class Test_TC_DA_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97358,8 +97303,7 @@ class Test_TC_DA_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97414,8 +97358,7 @@ class Test_TC_DA_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97470,8 +97413,7 @@ class Test_TC_DA_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97526,8 +97468,7 @@ class Test_TC_DA_1_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97582,8 +97523,7 @@ class Test_TC_BINFO_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97638,8 +97578,7 @@ class Test_TC_BINFO_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97695,8 +97634,7 @@ class Test_TC_OPCREDS_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97752,8 +97690,7 @@ class Test_TC_OPCREDS_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97809,8 +97746,7 @@ class Test_TC_OPCREDS_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97866,8 +97802,7 @@ class Test_TC_OPCREDS_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97923,8 +97858,7 @@ class Test_TC_OPCREDS_3_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -97980,8 +97914,7 @@ class Test_TC_OPCREDS_3_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98036,64 +97969,62 @@ class Test_TC_CNET_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) + {} + return CHIP_NO_ERROR; + } +}; + +class Test_TC_CNET_4_2Suite : public TestCommand +{ +public: + Test_TC_CNET_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CNET_4_2", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_CNET_4_2Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); } - return CHIP_NO_ERROR; - } -}; - -class Test_TC_CNET_4_2Suite : public TestCommand -{ -public: - Test_TC_CNET_4_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CNET_4_2", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_CNET_4_2Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - { - } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + {} return CHIP_NO_ERROR; } }; @@ -98148,8 +98079,7 @@ class Test_TC_CNET_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98204,8 +98134,7 @@ class Test_TC_CNET_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98260,8 +98189,7 @@ class Test_TC_CNET_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98316,8 +98244,7 @@ class Test_TC_CNET_4_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98372,8 +98299,7 @@ class Test_TC_CNET_4_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98428,8 +98354,7 @@ class Test_TC_CNET_4_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98484,8 +98409,7 @@ class Test_TC_CNET_4_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98540,8 +98464,7 @@ class Test_TC_CNET_4_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98596,8 +98519,7 @@ class Test_TC_CNET_4_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98652,8 +98574,7 @@ class Test_TC_CNET_4_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98708,8 +98629,7 @@ class Test_TC_CNET_4_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98764,8 +98684,7 @@ class Test_TC_CNET_4_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98820,8 +98739,7 @@ class Test_TC_CNET_4_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98876,8 +98794,7 @@ class Test_TC_CNET_4_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98932,8 +98849,7 @@ class Test_TC_CNET_4_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -98988,8 +98904,7 @@ class Test_TC_CNET_4_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99044,8 +98959,7 @@ class Test_TC_CNET_4_21Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99100,8 +99014,7 @@ class Test_TC_CNET_4_22Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99156,8 +99069,7 @@ class Test_TC_DLOG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99212,8 +99124,7 @@ class Test_TC_DLOG_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99270,8 +99181,7 @@ class Test_TC_DLOG_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99327,8 +99237,7 @@ class Test_TC_DESC_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99383,8 +99292,7 @@ class Test_TC_DESC_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99439,8 +99347,7 @@ class Test_TC_DGETH_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99495,8 +99402,7 @@ class Test_TC_CGEN_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99551,8 +99457,7 @@ class Test_TC_DGGEN_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99607,8 +99512,7 @@ class Test_TC_DGGEN_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99663,8 +99567,7 @@ class Test_TC_DGGEN_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99719,8 +99622,7 @@ class Test_TC_I_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99775,8 +99677,7 @@ class Test_TC_ILL_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99831,8 +99732,7 @@ class Test_TC_IDM_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99887,8 +99787,7 @@ class Test_TC_IDM_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99943,8 +99842,7 @@ class Test_TC_IDM_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -99999,8 +99897,7 @@ class Test_TC_IDM_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100055,8 +99952,7 @@ class Test_TC_IDM_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100111,8 +100007,7 @@ class Test_TC_IDM_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100167,8 +100062,7 @@ class Test_TC_IDM_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100223,8 +100117,7 @@ class Test_TC_IDM_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100279,8 +100172,7 @@ class Test_TC_IDM_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100335,8 +100227,7 @@ class Test_TC_IDM_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100391,8 +100282,7 @@ class Test_TC_IDM_5_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100447,8 +100337,7 @@ class Test_TC_IDM_5_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100503,8 +100392,7 @@ class Test_TC_IDM_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100559,8 +100447,7 @@ class Test_TC_IDM_6_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100615,8 +100502,7 @@ class Test_TC_IDM_6_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100671,8 +100557,7 @@ class Test_TC_IDM_6_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100727,8 +100612,7 @@ class Test_TC_IDM_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100783,8 +100667,7 @@ class Test_TC_IDM_8_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100840,8 +100723,7 @@ class Test_TC_LOWPOWER_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100897,8 +100779,7 @@ class Test_TC_APPLAUNCHER_3_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -100954,8 +100835,7 @@ class Test_TC_APPLAUNCHER_3_8_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101011,8 +100891,7 @@ class Test_TC_APPLAUNCHER_3_9_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101068,8 +100947,7 @@ class Test_TC_MEDIAINPUT_3_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101125,8 +101003,7 @@ class Test_TC_MEDIAINPUT_3_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101182,8 +101059,7 @@ class Test_TC_MEDIAINPUT_3_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101239,8 +101115,7 @@ class Test_TC_MEDIAINPUT_3_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101296,8 +101171,7 @@ class Test_TC_CHANNEL_5_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101353,8 +101227,7 @@ class Test_TC_CHANNEL_5_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101410,8 +101283,7 @@ class Test_TC_CHANNEL_5_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101467,8 +101339,7 @@ class Test_TC_KEYPADINPUT_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101524,8 +101395,7 @@ class Test_TC_MEDIAPLAYBACK_6_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101581,8 +101451,7 @@ class Test_TC_MEDIAPLAYBACK_6_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101638,8 +101507,7 @@ class Test_TC_AUDIOOUTPUT_7_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101695,8 +101563,7 @@ class Test_TC_AUDIOOUTPUT_7_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101752,8 +101619,7 @@ class Test_TC_CONTENTLAUNCHER_10_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101809,8 +101675,7 @@ class Test_TC_CONTENTLAUNCHER_10_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101866,8 +101731,7 @@ class Test_TC_CONTENTLAUNCHER_10_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101923,8 +101787,7 @@ class Test_TC_CONTENTLAUNCHER_10_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -101979,8 +101842,7 @@ class Test_TC_MC_11_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102035,8 +101897,7 @@ class Test_TC_MC_11_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102092,8 +101953,7 @@ class Test_TC_ALOGIN_12_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102151,8 +102011,7 @@ class Test_TC_WAKEONLAN_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102208,8 +102067,7 @@ class Test_TC_ALOGIN_12_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102265,8 +102123,7 @@ class Test_TC_CADMIN_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102321,8 +102178,7 @@ class Test_TC_CADMIN_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102377,8 +102233,7 @@ class Test_TC_CADMIN_1_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102433,8 +102288,7 @@ class Test_TC_CADMIN_1_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102490,8 +102344,7 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102547,8 +102400,7 @@ class Test_TC_CADMIN_1_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102604,8 +102456,7 @@ class Test_TC_CADMIN_1_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -102661,8 +102512,7 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -103186,8 +103036,7 @@ class Test_TC_CADMIN_1_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -103243,8 +103092,7 @@ class Test_TC_CADMIN_1_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -103300,8 +103148,7 @@ class Test_TC_CADMIN_1_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -103357,8 +103204,7 @@ class Test_TC_CADMIN_1_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -103789,8 +103635,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -104307,8 +104152,7 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -104739,8 +104583,7 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -105287,8 +105130,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -105719,8 +105561,7 @@ class Test_TC_MOD_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -105775,8 +105616,7 @@ class Test_TC_MOD_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -105831,8 +105671,7 @@ class Test_TC_MOD_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -105887,8 +105726,7 @@ class Test_TC_MOD_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -105943,8 +105781,7 @@ class Test_TC_MOD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -105999,8 +105836,7 @@ class Test_TC_MOD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106057,8 +105893,7 @@ class Test_TC_MOD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106113,8 +105948,7 @@ class Test_TC_MOD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106170,8 +106004,7 @@ class Test_TC_SU_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106226,8 +106059,7 @@ class Test_TC_MOD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106282,8 +106114,7 @@ class Test_TC_SU_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106338,8 +106169,7 @@ class Test_TC_SU_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106394,8 +106224,7 @@ class Test_TC_SU_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106450,8 +106279,7 @@ class Test_TC_SU_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106506,8 +106334,7 @@ class Test_TC_SU_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106562,8 +106389,7 @@ class Test_TC_SU_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106618,8 +106444,7 @@ class Test_TC_SU_2_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106674,8 +106499,7 @@ class Test_TC_SU_2_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106730,8 +106554,7 @@ class Test_TC_SU_2_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106786,8 +106609,7 @@ class Test_TC_SU_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106842,8 +106664,7 @@ class Test_TC_SU_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106898,8 +106719,7 @@ class Test_TC_SU_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -106954,8 +106774,7 @@ class Test_TC_SU_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107010,8 +106829,7 @@ class Test_TC_SU_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107066,8 +106884,7 @@ class Test_TC_SU_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107122,8 +106939,7 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107178,8 +106994,7 @@ class Test_TC_SC_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107234,8 +107049,7 @@ class Test_TC_SC_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107290,8 +107104,7 @@ class Test_TC_SC_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107346,8 +107159,7 @@ class Test_TC_SC_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107402,8 +107214,7 @@ class Test_TC_SC_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107458,8 +107269,7 @@ class Test_TC_SC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107514,8 +107324,7 @@ class Test_TC_SC_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107570,8 +107379,7 @@ class Test_TC_SC_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107626,8 +107434,7 @@ class Test_TC_SC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107682,8 +107489,7 @@ class Test_TC_SC_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107738,8 +107544,7 @@ class Test_TC_SC_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107794,8 +107599,7 @@ class Test_TC_SC_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107850,8 +107654,7 @@ class Test_TC_SC_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107906,8 +107709,7 @@ class Test_TC_SC_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -107962,8 +107764,7 @@ class Test_TC_SC_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108018,8 +107819,7 @@ class Test_TC_SC_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108074,8 +107874,7 @@ class Test_TC_SC_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108130,8 +107929,7 @@ class Test_TC_SC_4_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108186,8 +107984,7 @@ class Test_TC_SC_4_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108242,8 +108039,7 @@ class Test_TC_SC_4_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108298,8 +108094,7 @@ class Test_TC_SC_4_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108354,8 +108149,7 @@ class Test_TC_SC_4_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108410,8 +108204,7 @@ class Test_TC_SC_5_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108466,8 +108259,7 @@ class Test_TC_SC_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108522,8 +108314,7 @@ class Test_TC_DGSW_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108578,8 +108369,7 @@ class Test_TC_DGSW_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108634,8 +108424,7 @@ class Test_TC_DGSW_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108690,8 +108479,7 @@ class Test_TC_DGSW_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108746,8 +108534,7 @@ class Test_TC_DGWIFI_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108802,8 +108589,7 @@ class Test_TC_DGWIFI_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108858,8 +108644,7 @@ class Test_TC_WNCV_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -108914,8 +108699,7 @@ class Test_TC_WNCV_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109089,8 +108873,7 @@ class Test_TC_FLW_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109257,8 +109040,7 @@ class Test_TC_PS_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109315,8 +109097,7 @@ class Test_TC_PS_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109372,8 +109153,7 @@ class Test_TC_BOOL_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109430,8 +109210,7 @@ class Test_TC_BOOL_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109487,8 +109266,7 @@ class Test_TC_CC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109543,8 +109321,7 @@ class Test_TC_CC_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109599,8 +109376,7 @@ class Test_TC_CC_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109655,8 +109431,7 @@ class Test_TC_CC_5_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109711,8 +109486,7 @@ class Test_TC_CC_6_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109767,8 +109541,7 @@ class Test_TC_CC_7_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -109823,8 +109596,7 @@ class Test_TC_CC_9_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -113721,8 +113493,7 @@ class Test_TC_DRLK_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -113777,8 +113548,7 @@ class Test_TC_DRLK_2_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -113833,8 +113603,7 @@ class Test_TC_DRLK_2_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -113889,8 +113658,7 @@ class Test_TC_DRLK_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -113945,8 +113713,7 @@ class Test_TC_DRLK_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -114001,8 +113768,7 @@ class Test_TC_DRLK_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -114057,8 +113823,7 @@ class Test_TC_LCFG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -114113,8 +113878,7 @@ class Test_TC_LVL_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -114169,8 +113933,7 @@ class Test_TC_LVL_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -114225,8 +113988,7 @@ class Test_TC_LVL_8_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116112,8 +115874,7 @@ class Test_TC_OO_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116168,8 +115929,7 @@ class Test_TC_OO_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116371,8 +116131,7 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116429,8 +116188,7 @@ class Test_TC_SWTCH_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116486,8 +116244,7 @@ class Test_TC_SWTCH_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116691,8 +116448,7 @@ class Test_TC_TMP_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116747,8 +116503,7 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116803,8 +116558,7 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116859,8 +116613,7 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116916,8 +116669,7 @@ class Test_TC_DGTHREAD_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -116973,8 +116725,7 @@ class Test_TC_DGTHREAD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117030,8 +116781,7 @@ class Test_TC_DGTHREAD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117087,8 +116837,7 @@ class Test_TC_DGTHREAD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117146,8 +116895,7 @@ class Test_TC_DGTHREAD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117203,8 +116951,7 @@ class Test_TC_DGTHREAD_3_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117259,8 +117006,7 @@ class Test_TC_ACT_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117315,8 +117061,7 @@ class Test_TC_ACT_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117485,8 +117230,7 @@ class Test_TC_ACT_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117541,8 +117285,7 @@ class Test_TC_ACT_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117597,8 +117340,7 @@ class Test_TC_LTIME_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117653,8 +117395,7 @@ class Test_TC_LTIME_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117709,8 +117450,7 @@ class Test_TC_BIND_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -117820,8 +117560,7 @@ class Test_TC_BIND_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118216,8 +117955,7 @@ class Test_TC_S_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118272,8 +118010,7 @@ class Test_TC_S_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118328,8 +118065,7 @@ class Test_TC_S_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118384,8 +118120,7 @@ class Test_TC_S_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118440,8 +118175,7 @@ class Test_TC_PCC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118496,8 +118230,7 @@ class Test_TC_ACL_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118552,12 +118285,126 @@ class Test_TC_ACL_2_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) + {} + return CHIP_NO_ERROR; + } +}; + +<<<<<<< HEAD +======= +class Test_TC_BRBINFO_1_1Suite : public TestCommand +{ +public: + Test_TC_BRBINFO_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : + TestCommand("Test_TC_BRBINFO_1_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_BRBINFO_1_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + {} + return CHIP_NO_ERROR; + } +}; + +class Test_TC_BRBINFO_2_1Suite : public TestCommand +{ +public: + Test_TC_BRBINFO_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : + TestCommand("Test_TC_BRBINFO_2_1", 0, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_BRBINFO_2_1Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) { + ContinueOnChipMainThread(CHIP_NO_ERROR); } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + {} return CHIP_NO_ERROR; } }; +>>>>>>> 527fe00c24 (Update the generated files) class Test_TC_BRBINFO_2_2Suite : public TestCommand { public: @@ -118609,8 +118456,7 @@ class Test_TC_BRBINFO_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118666,8 +118512,7 @@ class Test_TC_BRBINFO_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -118722,8 +118567,7 @@ class Test_TC_ACE_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index c0e6a9384d2e57..2a1289be1113cc 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -35,9 +35,7 @@ namespace app { // Cluster specific command parsing -namespace Clusters { - -} // namespace Clusters +namespace Clusters {} // namespace Clusters void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h index 3a1ea88267ba5f..345ab29adbfc03 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h @@ -28,13 +28,11 @@ // Separate block is generated for big-endian and little-endian cases. #if BIGENDIAN_CPU #define GENERATED_DEFAULTS \ - { \ - } + {} #else // !BIGENDIAN_CPU #define GENERATED_DEFAULTS \ - { \ - } + {} #endif // BIGENDIAN_CPU @@ -43,14 +41,12 @@ // This is an array of EmberAfAttributeMinMaxValue structures. #define GENERATED_MIN_MAX_DEFAULT_COUNT 0 #define GENERATED_MIN_MAX_DEFAULTS \ - { \ - } + {} // This is an array of EmberAfAttributeMetadata structures. #define GENERATED_ATTRIBUTE_COUNT 0 #define GENERATED_ATTRIBUTES \ - { \ - } + {} // clang-format off #define GENERATED_EVENT_COUNT 0 From 3793dba3c257ce50da7ac6713ca2495c0ec10704 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Mon, 15 May 2023 21:37:12 +0200 Subject: [PATCH 06/23] Update logic & tests --- .../linux/include/channel/ChannelManager.cpp | 15 +- src/app/tests/suites/TV_ChannelCluster.yaml | 53 ++++++ .../chip-tool/zap-generated/test/Commands.h | 100 +++++++++- .../zap-generated/test/Commands.h | 173 +++++++++++++++++- 4 files changed, 336 insertions(+), 5 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 379b8081d9a713..991eabbb90745e 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -169,9 +169,18 @@ bool ChannelManager::HandleChangeChannelByNumber(const uint16_t & majorNumber, c bool ChannelManager::HandleSkipChannel(const int16_t & count) { - // TODO: Insert code here - uint16_t newChannelIndex = static_cast((count + mCurrentChannelIndex) % mChannels.size()); - mCurrentChannelIndex = newChannelIndex; + int16_t newChannelIndex = count + static_cast(mCurrentChannelIndex); + int16_t channelsSize = static_cast(mChannels.size()); + + if (newChannelIndex >= channelsSize) { + newChannelIndex = newChannelIndex % channelsSize; + } + + if (newChannelIndex < 0) { + newChannelIndex = channelsSize + (newChannelIndex % channelsSize); + } + + mCurrentChannelIndex = static_cast(newChannelIndex); mCurrentChannel = mChannels[mCurrentChannelIndex]; return true; } diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index 93a01cdc207629..afe4ce069538c2 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -117,3 +117,56 @@ tests: values: - name: "Count" value: 1 + + - label: "Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 1, + Name: "PBS", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + - label: "Skip Channel Command" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 108 + + - label: "Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 1, + Name: "PBS", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + - label: "Skip Channel Command" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -18 + + - label: "Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 3, + Name: "World Channel", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } \ No newline at end of file diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 51f78f9f3d387d..15f7fbd6142854 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -60634,7 +60634,7 @@ class TV_MediaPlaybackClusterSuite : public TestCommand class TV_ChannelClusterSuite : public TestCommand { public: - TV_ChannelClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ChannelCluster", 7, credsIssuerConfig) + TV_ChannelClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ChannelCluster", 12, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -60782,6 +60782,69 @@ class TV_ChannelClusterSuite : public TestCommand case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 7: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 9: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 10: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 3U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("World Channel", 13))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; default: LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); } @@ -60850,6 +60913,41 @@ class TV_ChannelClusterSuite : public TestCommand ); } + case 7: { + LogStep(7, "Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 8: { + LogStep(8, "Skip Channel Command"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 108; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 9: { + LogStep(9, "Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 10: { + LogStep(10, "Skip Channel Command"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -18; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 11: { + LogStep(11, "Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } } return CHIP_NO_ERROR; } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index af1775889ef2af..a81b869a76d1b7 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -83573,6 +83573,26 @@ class TV_ChannelCluster : public TestCommandBridge { ChipLogProgress(chipTool, " ***** Test Step 6 : Skip Channel Command\n"); err = TestSkipChannelCommand_6(); break; + case 7: + ChipLogProgress(chipTool, " ***** Test Step 7 : Verify that Skip Channel Command set correct current channel\n"); + err = TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_7(); + break; + case 8: + ChipLogProgress(chipTool, " ***** Test Step 8 : Skip Channel Command\n"); + err = TestSkipChannelCommand_8(); + break; + case 9: + ChipLogProgress(chipTool, " ***** Test Step 9 : Verify that Skip Channel Command set correct current channel\n"); + err = TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_9(); + break; + case 10: + ChipLogProgress(chipTool, " ***** Test Step 10 : Skip Channel Command\n"); + err = TestSkipChannelCommand_10(); + break; + case 11: + ChipLogProgress(chipTool, " ***** Test Step 11 : Verify that Skip Channel Command set correct current channel\n"); + err = TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_11(); + break; } if (CHIP_NO_ERROR != err) { @@ -83605,6 +83625,21 @@ class TV_ChannelCluster : public TestCommandBridge { case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 7: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 9: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 10: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -83618,7 +83653,7 @@ class TV_ChannelCluster : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 7; + const uint16_t mTestCount = 12; chip::Optional mNodeId; chip::Optional mCluster; @@ -83822,6 +83857,142 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } + + CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_7() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestSkipChannelCommand_8() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:108]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Skip Channel Command Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_9() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestSkipChannelCommand_10() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-18]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Skip Channel Command Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_11() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 3U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"World Channel")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } }; class TV_LowPowerCluster : public TestCommandBridge { From 02384242ec1cce7393c488215b2de7806fd05370 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Mon, 15 May 2023 21:40:55 +0200 Subject: [PATCH 07/23] Apply restyle --- .../linux/include/channel/ChannelManager.cpp | 14 ++++++++------ src/app/tests/suites/TV_ChannelCluster.yaml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 991eabbb90745e..d1e2042b93cd3e 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -169,19 +169,21 @@ bool ChannelManager::HandleChangeChannelByNumber(const uint16_t & majorNumber, c bool ChannelManager::HandleSkipChannel(const int16_t & count) { - int16_t newChannelIndex = count + static_cast(mCurrentChannelIndex); - int16_t channelsSize = static_cast(mChannels.size()); + int16_t newChannelIndex = count + static_cast(mCurrentChannelIndex); + int16_t channelsSize = static_cast(mChannels.size()); - if (newChannelIndex >= channelsSize) { + if (newChannelIndex >= channelsSize) + { newChannelIndex = newChannelIndex % channelsSize; } - if (newChannelIndex < 0) { + if (newChannelIndex < 0) + { newChannelIndex = channelsSize + (newChannelIndex % channelsSize); } - mCurrentChannelIndex = static_cast(newChannelIndex); - mCurrentChannel = mChannels[mCurrentChannelIndex]; + mCurrentChannelIndex = static_cast(newChannelIndex); + mCurrentChannel = mChannels[mCurrentChannelIndex]; return true; } diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index afe4ce069538c2..79ab79375dc98a 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -169,4 +169,4 @@ tests: Name: "World Channel", CallSign: "KCTS-TV", AffiliateCallSign: "KCTS", - } \ No newline at end of file + } From aad98b09c4263869d738975256ced412844572b9 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Mon, 15 May 2023 23:29:18 +0200 Subject: [PATCH 08/23] Updated code again --- .../linux/include/channel/ChannelManager.cpp | 4 ++-- src/app/tests/suites/TV_ChannelCluster.yaml | 16 ++++++++-------- .../chip-tool/zap-generated/test/Commands.h | 16 ++++++++-------- .../zap-generated/test/Commands.h | 17 ++++++++--------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index d1e2042b93cd3e..be75ae9bef3cee 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -169,8 +169,8 @@ bool ChannelManager::HandleChangeChannelByNumber(const uint16_t & majorNumber, c bool ChannelManager::HandleSkipChannel(const int16_t & count) { - int16_t newChannelIndex = count + static_cast(mCurrentChannelIndex); - int16_t channelsSize = static_cast(mChannels.size()); + int32_t newChannelIndex = static_cast(count) + static_cast(mCurrentChannelIndex); + uint16_t channelsSize = static_cast(mChannels.size()); if (newChannelIndex >= channelsSize) { diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index 79ab79375dc98a..43c0c689116b0b 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -125,8 +125,8 @@ tests: value: { MajorNumber: 9, - MinorNumber: 1, - Name: "PBS", + MinorNumber: 2, + Name: "PBS Kids", CallSign: "KCTS-TV", AffiliateCallSign: "KCTS", } @@ -136,7 +136,7 @@ tests: arguments: values: - name: "Count" - value: 108 + value: 123 - label: "Verify that Skip Channel Command set correct current channel" command: "readAttribute" @@ -145,8 +145,8 @@ tests: value: { MajorNumber: 9, - MinorNumber: 1, - Name: "PBS", + MinorNumber: 2, + Name: "PBS Kids", CallSign: "KCTS-TV", AffiliateCallSign: "KCTS", } @@ -156,7 +156,7 @@ tests: arguments: values: - name: "Count" - value: -18 + value: -123 - label: "Verify that Skip Channel Command set correct current channel" command: "readAttribute" @@ -165,8 +165,8 @@ tests: value: { MajorNumber: 9, - MinorNumber: 3, - Name: "World Channel", + MinorNumber: 2, + Name: "PBS Kids", CallSign: "KCTS-TV", AffiliateCallSign: "KCTS", } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 15f7fbd6142854..c09977a5461fbb 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -60789,10 +60789,10 @@ class TV_ChannelClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); - VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), - chip::CharSpan("PBS", 3))); + chip::CharSpan("PBS Kids", 8))); VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), chip::CharSpan("KCTS-TV", 7))); @@ -60811,10 +60811,10 @@ class TV_ChannelClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); - VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), - chip::CharSpan("PBS", 3))); + chip::CharSpan("PBS Kids", 8))); VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), chip::CharSpan("KCTS-TV", 7))); @@ -60833,10 +60833,10 @@ class TV_ChannelClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); - VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 3U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), - chip::CharSpan("World Channel", 13))); + chip::CharSpan("PBS Kids", 8))); VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), chip::CharSpan("KCTS-TV", 7))); @@ -60922,7 +60922,7 @@ class TV_ChannelClusterSuite : public TestCommand LogStep(8, "Skip Channel Command"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = 108; + value.count = 123; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional @@ -60937,7 +60937,7 @@ class TV_ChannelClusterSuite : public TestCommand LogStep(10, "Skip Channel Command"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -18; + value.count = -123; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index a81b869a76d1b7..72d60b1e2fe6f3 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -83875,8 +83875,8 @@ class TV_ChannelCluster : public TestCommandBridge { id actualValue = value; VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); VerifyOrReturn( CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( @@ -83897,7 +83897,7 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithShort:108]; + params.count = [NSNumber numberWithShort:123]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { NSLog(@"Skip Channel Command Error: %@", err); @@ -83927,8 +83927,8 @@ class TV_ChannelCluster : public TestCommandBridge { id actualValue = value; VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); VerifyOrReturn( CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( @@ -83949,7 +83949,7 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithShort:-18]; + params.count = [NSNumber numberWithShort:-123]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { NSLog(@"Skip Channel Command Error: %@", err); @@ -83979,9 +83979,8 @@ class TV_ChannelCluster : public TestCommandBridge { id actualValue = value; VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 3U)); - VerifyOrReturn( - CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"World Channel")); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); VerifyOrReturn( CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( From 7d7f1fb38387d88414ff660865e0e26e983b2a92 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Tue, 16 May 2023 00:16:55 +0200 Subject: [PATCH 09/23] Updated tests --- src/app/tests/suites/TV_ChannelCluster.yaml | 4 ++-- zzz_generated/chip-tool/zap-generated/test/Commands.h | 4 ++-- .../darwin-framework-tool/zap-generated/test/Commands.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index 43c0c689116b0b..dfc097b34a4214 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -145,8 +145,8 @@ tests: value: { MajorNumber: 9, - MinorNumber: 2, - Name: "PBS Kids", + MinorNumber: 1, + Name: "PBS", CallSign: "KCTS-TV", AffiliateCallSign: "KCTS", } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index c09977a5461fbb..d634db07b0e85e 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -60811,10 +60811,10 @@ class TV_ChannelClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); - VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), - chip::CharSpan("PBS Kids", 8))); + chip::CharSpan("PBS", 3))); VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), chip::CharSpan("KCTS-TV", 7))); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 72d60b1e2fe6f3..8bfd4d083e6601 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -83927,8 +83927,8 @@ class TV_ChannelCluster : public TestCommandBridge { id actualValue = value; VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); VerifyOrReturn( CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( From 6ffc3d94910cd4af3555ab6a1d0439166cf47d23 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Tue, 16 May 2023 00:26:23 +0200 Subject: [PATCH 10/23] Adding random comments just to retrigger restyle --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index be75ae9bef3cee..1a81db250a50fd 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -172,11 +172,13 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count) int32_t newChannelIndex = static_cast(count) + static_cast(mCurrentChannelIndex); uint16_t channelsSize = static_cast(mChannels.size()); + // handle larger than maximum -> channel size case if (newChannelIndex >= channelsSize) { newChannelIndex = newChannelIndex % channelsSize; } + // handle smaller than 0 if (newChannelIndex < 0) { newChannelIndex = channelsSize + (newChannelIndex % channelsSize); From 335e475bd9ed332a0951a82e0223bad64006659a Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Tue, 16 May 2023 00:28:25 +0200 Subject: [PATCH 11/23] Restyle fix --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 1a81db250a50fd..cacb22457e0e01 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -178,7 +178,7 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count) newChannelIndex = newChannelIndex % channelsSize; } - // handle smaller than 0 + // handle smaller than 0 if (newChannelIndex < 0) { newChannelIndex = channelsSize + (newChannelIndex % channelsSize); From 7f7c815909ffca2a909ccbcf7d4427427d8f8097 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Wed, 17 May 2023 12:41:39 +0200 Subject: [PATCH 12/23] Update tests --- src/app/tests/suites/TV_ChannelCluster.yaml | 567 +++++ .../chip-tool/zap-generated/test/Commands.h | 1012 ++++++++- .../zap-generated/test/Commands.h | 1955 ++++++++++++++++- 3 files changed, 3376 insertions(+), 158 deletions(-) diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index dfc097b34a4214..d43200190a8f0a 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -170,3 +170,570 @@ tests: CallSign: "KCTS-TV", AffiliateCallSign: "KCTS", } + + ############################# + # Test Skip Channel Up 1..8 # + ############################# + + - label: "Test 1.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 1.2 - Skip Up By 1" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 1 + + - label: "Test 1.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 3, + Name: "World Channel", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Up 2 # + + - label: "Test 2.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 2.2 - Skip Up By 2" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 2 + + - label: "Test 2.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 6, + MinorNumber: 0, + Name: "ABC", + CallSign: "KAAL-TV", + AffiliateCallSign: "KAAL", + } + + # Test Skip Channel Up 3 # + + - label: "Test 3.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 3.2 - Skip Up By 3" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 3 + + - label: "Test 3.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 1, + Name: "PBS", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Up 4 # + + - label: "Test 4.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 4.2 - Skip Up By 4" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 4 + + - label: "Test 4.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 2, + Name: "PBS Kids", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Up 5 # + + - label: "Test 5.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 5.2 - Skip Up By 5" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 5 + + - label: "Test 5.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 3, + Name: "World Channel", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Up 6 # + + - label: "Test 6.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 6.2 - Skip Up By 6" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 6 + + - label: "Test 6.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 6, + MinorNumber: 0, + Name: "ABC", + CallSign: "KAAL-TV", + AffiliateCallSign: "KAAL", + } + + # Test Skip Channel Up 7 # + + - label: "Test 7.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 7.2 - Skip Up By 7" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 7 + + - label: "Test 7.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 1, + Name: "PBS", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Up 8 # + + - label: "Test 8.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 8.2 - Skip Up By 8" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 8 + + - label: "Test 8.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 2, + Name: "PBS Kids", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + ############################### + # Test Skip Channel Down 1..8 # + ############################### + + - label: "Test 1.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 1.2 - Skip Down By 1" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -1 + + - label: "Test 1.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 1, + Name: "PBS", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Down 2 # + + - label: "Test 2.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 2.2 - Skip Down By 2" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -2 + + - label: "Test 2.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 6, + MinorNumber: 0, + Name: "ABC", + CallSign: "KAAL-TV", + AffiliateCallSign: "KAAL", + } + + # Test Skip Channel Down 3 # + + - label: "Test 3.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 3.2 - Skip Down By 3" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -3 + + - label: "Test 3.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 3, + Name: "World Channel", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Down 4 # + + - label: "Test 4.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 4.2 - Skip Down By 4" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -4 + + - label: "Test 4.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 2, + Name: "PBS Kids", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Down 5 # + + - label: "Test 5.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 5.2 - Skip Down By 5" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -5 + + - label: "Test 5.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 1, + Name: "PBS", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Down 6 # + + - label: "Test 6.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 6.2 - Skip Down By 6" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -6 + + - label: "Test 6.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 6, + MinorNumber: 0, + Name: "ABC", + CallSign: "KAAL-TV", + AffiliateCallSign: "KAAL", + } + + # Test Skip Channel Down 7 # + + - label: "Test 7.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 7.2 - Skip Down By 7" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -7 + + - label: "Test 7.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 3, + Name: "World Channel", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + # Test Skip Channel Down 8 # + + - label: "Test 8.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 8.2 - Skip Down By 8" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -8 + + - label: "Test 8.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 2, + Name: "PBS Kids", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + ############################### + # Test Skip Channel Up 32,767 # + ############################### + + - label: "Test 1.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 1.2 - Skip Up By 32,767" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: 32767 + + - label: "Test 1.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 2, + Name: "PBS Kids", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } + + + ################################# + # Test Skip Channel Down 32,768 # + ################################# + + - label: "Test 1.1 - Start from Channel 3" + command: "ChangeChannelByNumber" + arguments: + values: + - name: "MajorNumber" + value: 9 + - name: "MinorNumber" + value: 2 + + - label: "Test 1.2 - Skip Down By 32,768" + command: "SkipChannel" + arguments: + values: + - name: "Count" + value: -32768 + + - label: "Test 1.3 - Verify that Skip Channel Command set correct current channel" + command: "readAttribute" + attribute: "CurrentChannel" + response: + value: + { + MajorNumber: 9, + MinorNumber: 3, + Name: "World Channel", + CallSign: "KCTS-TV", + AffiliateCallSign: "KCTS", + } \ No newline at end of file diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index d634db07b0e85e..f6a1d969232d38 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -60634,7 +60634,7 @@ class TV_MediaPlaybackClusterSuite : public TestCommand class TV_ChannelClusterSuite : public TestCommand { public: - TV_ChannelClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ChannelCluster", 12, credsIssuerConfig) + TV_ChannelClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ChannelCluster", 66, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -60845,106 +60845,1024 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; + case 12: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 13: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 14: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 3U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("World Channel", 13))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 15: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 16: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 17: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 6U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 0U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("ABC", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KAAL-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); + } + break; + case 18: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 19: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 20: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 21: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 22: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 23: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS Kids", 8))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 24: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 25: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 26: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 3U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("World Channel", 13))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 27: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 28: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 29: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 6U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 0U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("ABC", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KAAL-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); + } + break; + case 30: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 31: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 32: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 33: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 34: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 35: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS Kids", 8))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 36: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 37: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 38: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 39: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 40: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 41: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 6U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 0U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("ABC", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KAAL-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); + } + break; + case 42: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 43: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 44: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 3U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("World Channel", 13))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 45: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 46: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 47: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS Kids", 8))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 48: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 49: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 50: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 1U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 51: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 52: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 53: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 6U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 0U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("ABC", 3))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KAAL-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); + } + break; + case 54: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 55: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 56: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 3U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("World Channel", 13))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 57: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 58: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 59: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS Kids", 8))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 60: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 61: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 62: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("PBS Kids", 8))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; + case 63: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 64: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 65: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("currentChannel", value)); + VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); + VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 3U)); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), + chip::CharSpan("World Channel", 13))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), + chip::CharSpan("KCTS-TV", 7))); + VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); + VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", + value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); + } + break; default: LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); } - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + case 0: { + LogStep(0, "Wait for the commissioned device to be retrieved"); + ListFreer listFreer; + chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; + value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; + return WaitForCommissionee(kIdentityAlpha, value); + } + case 1: { + LogStep(1, "Read attribute Channel list"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::ChannelList::Id, true, + chip::NullOptional); + } + case 2: { + LogStep(2, "Read attribute channel lineup"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::Lineup::Id, true, + chip::NullOptional); + } + case 3: { + LogStep(3, "Read attribute current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 4: { + LogStep(4, "Change Channel Command"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannel::Type value; + value.match = chip::Span("PBSgarbage: not in length on purpose", 3); + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannel::Id, value, + chip::NullOptional + + ); + } + case 5: { + LogStep(5, "Change Channel By Number Command"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 6U; + value.minorNumber = 0U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 6: { + LogStep(6, "Skip Channel Command"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 1; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 7: { + LogStep(7, "Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 8: { + LogStep(8, "Skip Channel Command"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 123; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 9: { + LogStep(9, "Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 10: { + LogStep(10, "Skip Channel Command"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -123; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 11: { + LogStep(11, "Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 12: { + LogStep(12, "Test 1.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 13: { + LogStep(13, "Test 1.2 - Skip Up By 1"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 1; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 14: { + LogStep(14, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 15: { + LogStep(15, "Test 2.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 16: { + LogStep(16, "Test 2.2 - Skip Up By 2"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 2; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 17: { + LogStep(17, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 18: { + LogStep(18, "Test 3.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 19: { + LogStep(19, "Test 3.2 - Skip Up By 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 3; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 20: { + LogStep(20, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 21: { + LogStep(21, "Test 4.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 22: { + LogStep(22, "Test 4.2 - Skip Up By 4"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 4; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 23: { + LogStep(23, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 24: { + LogStep(24, "Test 5.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 25: { + LogStep(25, "Test 5.2 - Skip Up By 5"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 5; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 26: { + LogStep(26, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 27: { + LogStep(27, "Test 6.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); } - } + case 28: { + LogStep(28, "Test 6.2 - Skip Up By 6"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 6; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - { - case 0: { - LogStep(0, "Wait for the commissioned device to be retrieved"); + ); + } + case 29: { + LogStep(29, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 30: { + LogStep(30, "Test 7.1 - Start from Channel 3"); ListFreer listFreer; - chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; - value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; - return WaitForCommissionee(kIdentityAlpha, value); + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); } - case 1: { - LogStep(1, "Read attribute Channel list"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::ChannelList::Id, true, + case 31: { + LogStep(31, "Test 7.2 - Skip Up By 7"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 7; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 32: { + LogStep(32, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 2: { - LogStep(2, "Read attribute channel lineup"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::Lineup::Id, true, + case 33: { + LogStep(33, "Test 8.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 34: { + LogStep(34, "Test 8.2 - Skip Up By 8"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 8; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 35: { + LogStep(35, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 3: { - LogStep(3, "Read attribute current channel"); + case 36: { + LogStep(36, "Test 1.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 37: { + LogStep(37, "Test 1.2 - Skip Down By 1"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -1; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 38: { + LogStep(38, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 4: { - LogStep(4, "Change Channel Command"); + case 39: { + LogStep(39, "Test 2.1 - Start from Channel 3"); ListFreer listFreer; - chip::app::Clusters::Channel::Commands::ChangeChannel::Type value; - value.match = chip::Span("PBSgarbage: not in length on purpose", 3); - return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannel::Id, value, + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, chip::NullOptional ); } - case 5: { - LogStep(5, "Change Channel By Number Command"); + case 40: { + LogStep(40, "Test 2.2 - Skip Down By 2"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -2; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 41: { + LogStep(41, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 42: { + LogStep(42, "Test 3.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; - value.majorNumber = 6U; - value.minorNumber = 0U; + value.majorNumber = 9U; + value.minorNumber = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, chip::NullOptional ); } - case 6: { - LogStep(6, "Skip Channel Command"); + case 43: { + LogStep(43, "Test 3.2 - Skip Down By 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = 1; + value.count = -3; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } - case 7: { - LogStep(7, "Verify that Skip Channel Command set correct current channel"); + case 44: { + LogStep(44, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 8: { - LogStep(8, "Skip Channel Command"); + case 45: { + LogStep(45, "Test 4.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 46: { + LogStep(46, "Test 4.2 - Skip Down By 4"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = 123; + value.count = -4; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } - case 9: { - LogStep(9, "Verify that Skip Channel Command set correct current channel"); + case 47: { + LogStep(47, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "Skip Channel Command"); + case 48: { + LogStep(48, "Test 5.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 49: { + LogStep(49, "Test 5.2 - Skip Down By 5"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -123; + value.count = -5; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } - case 11: { - LogStep(11, "Verify that Skip Channel Command set correct current channel"); + case 50: { + LogStep(50, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 51: { + LogStep(51, "Test 6.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 52: { + LogStep(52, "Test 6.2 - Skip Down By 6"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -6; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 53: { + LogStep(53, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 54: { + LogStep(54, "Test 7.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 55: { + LogStep(55, "Test 7.2 - Skip Down By 7"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -7; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 56: { + LogStep(56, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 57: { + LogStep(57, "Test 8.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 58: { + LogStep(58, "Test 8.2 - Skip Down By 8"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -8; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 59: { + LogStep(59, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 60: { + LogStep(60, "Test 1.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 61: { + LogStep(61, "Test 1.2 - Skip Up By 32,767"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = 32767; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 62: { + LogStep(62, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 63: { + LogStep(63, "Test 1.1 - Start from Channel 3"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; + value.majorNumber = 9U; + value.minorNumber = 2U; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, + chip::NullOptional + + ); + } + case 64: { + LogStep(64, "Test 1.2 - Skip Down By 32,768"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -32768; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } + case 65: { + LogStep(65, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 8bfd4d083e6601..8a9002ef508bbe 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -83593,6 +83593,240 @@ class TV_ChannelCluster : public TestCommandBridge { ChipLogProgress(chipTool, " ***** Test Step 11 : Verify that Skip Channel Command set correct current channel\n"); err = TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_11(); break; + case 12: + ChipLogProgress(chipTool, " ***** Test Step 12 : Test 1.1 - Start from Channel 3\n"); + err = TestTest11StartFromChannel3_12(); + break; + case 13: + ChipLogProgress(chipTool, " ***** Test Step 13 : Test 1.2 - Skip Up By 1\n"); + err = TestTest12SkipUpBy1_13(); + break; + case 14: + ChipLogProgress( + chipTool, " ***** Test Step 14 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_14(); + break; + case 15: + ChipLogProgress(chipTool, " ***** Test Step 15 : Test 2.1 - Start from Channel 3\n"); + err = TestTest21StartFromChannel3_15(); + break; + case 16: + ChipLogProgress(chipTool, " ***** Test Step 16 : Test 2.2 - Skip Up By 2\n"); + err = TestTest22SkipUpBy2_16(); + break; + case 17: + ChipLogProgress( + chipTool, " ***** Test Step 17 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_17(); + break; + case 18: + ChipLogProgress(chipTool, " ***** Test Step 18 : Test 3.1 - Start from Channel 3\n"); + err = TestTest31StartFromChannel3_18(); + break; + case 19: + ChipLogProgress(chipTool, " ***** Test Step 19 : Test 3.2 - Skip Up By 3\n"); + err = TestTest32SkipUpBy3_19(); + break; + case 20: + ChipLogProgress( + chipTool, " ***** Test Step 20 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_20(); + break; + case 21: + ChipLogProgress(chipTool, " ***** Test Step 21 : Test 4.1 - Start from Channel 3\n"); + err = TestTest41StartFromChannel3_21(); + break; + case 22: + ChipLogProgress(chipTool, " ***** Test Step 22 : Test 4.2 - Skip Up By 4\n"); + err = TestTest42SkipUpBy4_22(); + break; + case 23: + ChipLogProgress( + chipTool, " ***** Test Step 23 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_23(); + break; + case 24: + ChipLogProgress(chipTool, " ***** Test Step 24 : Test 5.1 - Start from Channel 3\n"); + err = TestTest51StartFromChannel3_24(); + break; + case 25: + ChipLogProgress(chipTool, " ***** Test Step 25 : Test 5.2 - Skip Up By 5\n"); + err = TestTest52SkipUpBy5_25(); + break; + case 26: + ChipLogProgress( + chipTool, " ***** Test Step 26 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_26(); + break; + case 27: + ChipLogProgress(chipTool, " ***** Test Step 27 : Test 6.1 - Start from Channel 3\n"); + err = TestTest61StartFromChannel3_27(); + break; + case 28: + ChipLogProgress(chipTool, " ***** Test Step 28 : Test 6.2 - Skip Up By 6\n"); + err = TestTest62SkipUpBy6_28(); + break; + case 29: + ChipLogProgress( + chipTool, " ***** Test Step 29 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_29(); + break; + case 30: + ChipLogProgress(chipTool, " ***** Test Step 30 : Test 7.1 - Start from Channel 3\n"); + err = TestTest71StartFromChannel3_30(); + break; + case 31: + ChipLogProgress(chipTool, " ***** Test Step 31 : Test 7.2 - Skip Up By 7\n"); + err = TestTest72SkipUpBy7_31(); + break; + case 32: + ChipLogProgress( + chipTool, " ***** Test Step 32 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_32(); + break; + case 33: + ChipLogProgress(chipTool, " ***** Test Step 33 : Test 8.1 - Start from Channel 3\n"); + err = TestTest81StartFromChannel3_33(); + break; + case 34: + ChipLogProgress(chipTool, " ***** Test Step 34 : Test 8.2 - Skip Up By 8\n"); + err = TestTest82SkipUpBy8_34(); + break; + case 35: + ChipLogProgress( + chipTool, " ***** Test Step 35 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35(); + break; + case 36: + ChipLogProgress(chipTool, " ***** Test Step 36 : Test 1.1 - Start from Channel 3\n"); + err = TestTest11StartFromChannel3_36(); + break; + case 37: + ChipLogProgress(chipTool, " ***** Test Step 37 : Test 1.2 - Skip Down By 1\n"); + err = TestTest12SkipDownBy1_37(); + break; + case 38: + ChipLogProgress( + chipTool, " ***** Test Step 38 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38(); + break; + case 39: + ChipLogProgress(chipTool, " ***** Test Step 39 : Test 2.1 - Start from Channel 3\n"); + err = TestTest21StartFromChannel3_39(); + break; + case 40: + ChipLogProgress(chipTool, " ***** Test Step 40 : Test 2.2 - Skip Down By 2\n"); + err = TestTest22SkipDownBy2_40(); + break; + case 41: + ChipLogProgress( + chipTool, " ***** Test Step 41 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41(); + break; + case 42: + ChipLogProgress(chipTool, " ***** Test Step 42 : Test 3.1 - Start from Channel 3\n"); + err = TestTest31StartFromChannel3_42(); + break; + case 43: + ChipLogProgress(chipTool, " ***** Test Step 43 : Test 3.2 - Skip Down By 3\n"); + err = TestTest32SkipDownBy3_43(); + break; + case 44: + ChipLogProgress( + chipTool, " ***** Test Step 44 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44(); + break; + case 45: + ChipLogProgress(chipTool, " ***** Test Step 45 : Test 4.1 - Start from Channel 3\n"); + err = TestTest41StartFromChannel3_45(); + break; + case 46: + ChipLogProgress(chipTool, " ***** Test Step 46 : Test 4.2 - Skip Down By 4\n"); + err = TestTest42SkipDownBy4_46(); + break; + case 47: + ChipLogProgress( + chipTool, " ***** Test Step 47 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47(); + break; + case 48: + ChipLogProgress(chipTool, " ***** Test Step 48 : Test 5.1 - Start from Channel 3\n"); + err = TestTest51StartFromChannel3_48(); + break; + case 49: + ChipLogProgress(chipTool, " ***** Test Step 49 : Test 5.2 - Skip Down By 5\n"); + err = TestTest52SkipDownBy5_49(); + break; + case 50: + ChipLogProgress( + chipTool, " ***** Test Step 50 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50(); + break; + case 51: + ChipLogProgress(chipTool, " ***** Test Step 51 : Test 6.1 - Start from Channel 3\n"); + err = TestTest61StartFromChannel3_51(); + break; + case 52: + ChipLogProgress(chipTool, " ***** Test Step 52 : Test 6.2 - Skip Down By 6\n"); + err = TestTest62SkipDownBy6_52(); + break; + case 53: + ChipLogProgress( + chipTool, " ***** Test Step 53 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53(); + break; + case 54: + ChipLogProgress(chipTool, " ***** Test Step 54 : Test 7.1 - Start from Channel 3\n"); + err = TestTest71StartFromChannel3_54(); + break; + case 55: + ChipLogProgress(chipTool, " ***** Test Step 55 : Test 7.2 - Skip Down By 7\n"); + err = TestTest72SkipDownBy7_55(); + break; + case 56: + ChipLogProgress( + chipTool, " ***** Test Step 56 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56(); + break; + case 57: + ChipLogProgress(chipTool, " ***** Test Step 57 : Test 8.1 - Start from Channel 3\n"); + err = TestTest81StartFromChannel3_57(); + break; + case 58: + ChipLogProgress(chipTool, " ***** Test Step 58 : Test 8.2 - Skip Down By 8\n"); + err = TestTest82SkipDownBy8_58(); + break; + case 59: + ChipLogProgress( + chipTool, " ***** Test Step 59 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_59(); + break; + case 60: + ChipLogProgress(chipTool, " ***** Test Step 60 : Test 1.1 - Start from Channel 3\n"); + err = TestTest11StartFromChannel3_60(); + break; + case 61: + ChipLogProgress(chipTool, " ***** Test Step 61 : Test 1.2 - Skip Up By 32,767\n"); + err = TestTest12SkipUpBy32767_61(); + break; + case 62: + ChipLogProgress( + chipTool, " ***** Test Step 62 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_62(); + break; + case 63: + ChipLogProgress(chipTool, " ***** Test Step 63 : Test 1.1 - Start from Channel 3\n"); + err = TestTest11StartFromChannel3_63(); + break; + case 64: + ChipLogProgress(chipTool, " ***** Test Step 64 : Test 1.2 - Skip Down By 32,768\n"); + err = TestTest12SkipDownBy32768_64(); + break; + case 65: + ChipLogProgress( + chipTool, " ***** Test Step 65 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_65(); + break; } if (CHIP_NO_ERROR != err) { @@ -83640,79 +83874,1478 @@ class TV_ChannelCluster : public TestCommandBridge { case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - } - - // Go on to the next test. - ContinueOnChipMainThread(CHIP_NO_ERROR); + case 12: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 13: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 14: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 15: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 16: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 17: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 18: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 19: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 20: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 21: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 22: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 23: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 24: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 25: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 26: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 27: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 28: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 29: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 30: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 31: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 32: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 33: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 34: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 35: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 36: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 37: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 38: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 39: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 40: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 41: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 42: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 43: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 44: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 45: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 46: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 47: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 48: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 49: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 50: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 51: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 52: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 53: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 54: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 55: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 56: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 57: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 58: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 59: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 60: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 61: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 62: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 63: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 64: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 65: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + } + + // Go on to the next test. + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + std::atomic_uint16_t mTestIndex; + const uint16_t mTestCount = 66; + + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + + CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() + { + + chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; + value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; + return WaitForCommissionee("alpha", value); + } + + CHIP_ERROR TestReadAttributeChannelList_1() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeChannelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute Channel list Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("ChannelList", [actualValue count], static_cast(4))); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).majorNumber, 6U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).minorNumber, 0U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).name, @"ABC")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).callSign, @"KAAL-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).affiliateCallSign, @"KAAL")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).name, @"PBS")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).affiliateCallSign, @"KCTS")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).minorNumber, 2U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).name, @"PBS Kids")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).affiliateCallSign, @"KCTS")); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).minorNumber, 3U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).name, @"World Channel")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadAttributeChannelLineup_2() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute channel lineup Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("Lineup", actualValue)); + VerifyOrReturn(CheckValueAsString( + "OperatorName", ((MTRChannelClusterLineupInfoStruct *) actualValue).operatorName, @"Comcast")); + VerifyOrReturn(CheckValueAsString( + "LineupName", ((MTRChannelClusterLineupInfoStruct *) actualValue).lineupName, @"Comcast King County")); + VerifyOrReturn( + CheckValueAsString("PostalCode", ((MTRChannelClusterLineupInfoStruct *) actualValue).postalCode, @"98052")); + VerifyOrReturn( + CheckValue("LineupInfoType", ((MTRChannelClusterLineupInfoStruct *) actualValue).lineupInfoType, 0U)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadAttributeCurrentChannel_3() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 6U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 0U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"ABC")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KAAL-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KAAL")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestChangeChannelCommand_4() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelParams alloc] init]; + params.match = @"PBS"; + [cluster + changeChannelWithParams:params + completion:^(MTRChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable err) { + NSLog(@"Change Channel Command Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = values.status; + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); + } + + { + id actualValue = values.data; + VerifyOrReturn(CheckValueAsString("Data", actualValue, @"data response")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestChangeChannelByNumberCommand_5() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:6U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:0U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Change Channel By Number Command Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestSkipChannelCommand_6() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:1]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Skip Channel Command Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_7() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestSkipChannelCommand_8() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:123]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Skip Channel Command Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_9() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestSkipChannelCommand_10() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-123]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Skip Channel Command Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_11() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest11StartFromChannel3_12() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest12SkipUpBy1_13() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:1]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 1.2 - Skip Up By 1 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_14() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 3U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"World Channel")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest21StartFromChannel3_15() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 2.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest22SkipUpBy2_16() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:2]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 2.2 - Skip Up By 2 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_17() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 6U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 0U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"ABC")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KAAL-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KAAL")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest31StartFromChannel3_18() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 3.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest32SkipUpBy3_19() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:3]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 3.2 - Skip Up By 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_20() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest41StartFromChannel3_21() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 4.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest42SkipUpBy4_22() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:4]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 4.2 - Skip Up By 4 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_23() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest51StartFromChannel3_24() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 5.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest52SkipUpBy5_25() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:5]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 5.2 - Skip Up By 5 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_26() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 3U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"World Channel")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest61StartFromChannel3_27() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 6.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest62SkipUpBy6_28() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:6]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 6.2 - Skip Up By 6 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_29() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 6U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 0U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"ABC")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KAAL-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KAAL")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest71StartFromChannel3_30() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 7.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest72SkipUpBy7_31() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:7]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 7.2 - Skip Up By 7 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_32() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest81StartFromChannel3_33() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 8.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest82SkipUpBy8_34() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:8]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 8.2 - Skip Up By 8 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest11StartFromChannel3_36() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest12SkipDownBy1_37() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-1]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 1.2 - Skip Down By 1 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest21StartFromChannel3_39() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 2.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest22SkipDownBy2_40() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-2]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 2.2 - Skip Down By 2 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 2.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 6U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 0U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"ABC")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KAAL-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KAAL")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest31StartFromChannel3_42() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 3.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest32SkipDownBy3_43() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-3]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 3.2 - Skip Down By 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 3.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 3U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"World Channel")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest41StartFromChannel3_45() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 4.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest42SkipDownBy4_46() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-4]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 4.2 - Skip Down By 4 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 4.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; } - chip::System::Clock::Timeout GetWaitDuration() const override + CHIP_ERROR TestTest51StartFromChannel3_48() { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } -private: - std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 12; + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 5.1 - Start from Channel 3 Error: %@", err); - CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest52SkipDownBy5_49() { - chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; - value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; - return WaitForCommissionee("alpha", value); + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-5]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 5.2 - Skip Down By 5 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeChannelList_1() + CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50() { MTRBaseDevice * device = GetDevice("alpha"); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeChannelListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Read attribute Channel list Error: %@", err); + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 5.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { id actualValue = value; - VerifyOrReturn(CheckValue("ChannelList", [actualValue count], static_cast(4))); - VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).majorNumber, 6U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).minorNumber, 0U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).name, @"ABC")); - VerifyOrReturn( - CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).callSign, @"KAAL-TV")); - VerifyOrReturn(CheckValueAsString( - "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[0]).affiliateCallSign, @"KAAL")); - VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).minorNumber, 1U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).name, @"PBS")); - VerifyOrReturn( - CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).callSign, @"KCTS-TV")); - VerifyOrReturn(CheckValueAsString( - "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[1]).affiliateCallSign, @"KCTS")); - VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).minorNumber, 2U)); - VerifyOrReturn( - CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).name, @"PBS Kids")); - VerifyOrReturn( - CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).callSign, @"KCTS-TV")); - VerifyOrReturn(CheckValueAsString( - "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[2]).affiliateCallSign, @"KCTS")); - VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).minorNumber, 3U)); - VerifyOrReturn( - CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).name, @"World Channel")); + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); VerifyOrReturn( - CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).callSign, @"KCTS-TV")); + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( - "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue[3]).affiliateCallSign, @"KCTS")); + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); } NextTest(); @@ -83721,38 +85354,50 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeChannelLineup_2() + CHIP_ERROR TestTest61StartFromChannel3_51() { MTRBaseDevice * device = GetDevice("alpha"); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeLineupWithCompletion:^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable err) { - NSLog(@"Read attribute channel lineup Error: %@", err); + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 6.1 - Start from Channel 3 Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = value; - VerifyOrReturn(CheckValueNonNull("Lineup", actualValue)); - VerifyOrReturn(CheckValueAsString( - "OperatorName", ((MTRChannelClusterLineupInfoStruct *) actualValue).operatorName, @"Comcast")); - VerifyOrReturn(CheckValueAsString( - "LineupName", ((MTRChannelClusterLineupInfoStruct *) actualValue).lineupName, @"Comcast King County")); - VerifyOrReturn( - CheckValueAsString("PostalCode", ((MTRChannelClusterLineupInfoStruct *) actualValue).postalCode, @"98052")); - VerifyOrReturn( - CheckValue("LineupInfoType", ((MTRChannelClusterLineupInfoStruct *) actualValue).lineupInfoType, 0U)); - } + NextTest(); + }]; - NextTest(); - }]; + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest62SkipDownBy6_52() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-6]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 6.2 - Skip Down By 6 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCurrentChannel_3() + CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83761,7 +85406,7 @@ class TV_ChannelCluster : public TestCommandBridge { [cluster readAttributeCurrentChannelWithCompletion:^( MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { - NSLog(@"Read attribute current channel Error: %@", err); + NSLog(@"Test 6.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83783,39 +85428,82 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeChannelCommand_4() + CHIP_ERROR TestTest71StartFromChannel3_54() { MTRBaseDevice * device = GetDevice("alpha"); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - __auto_type * params = [[MTRChannelClusterChangeChannelParams alloc] init]; - params.match = @"PBS"; - [cluster - changeChannelWithParams:params - completion:^(MTRChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable err) { - NSLog(@"Change Channel Command Error: %@", err); + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 7.1 - Start from Channel 3 Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = values.status; - VerifyOrReturn(CheckValue("Status", actualValue, 0U)); - } + NextTest(); + }]; - { - id actualValue = values.data; - VerifyOrReturn(CheckValueAsString("Data", actualValue, @"data response")); - } + return CHIP_NO_ERROR; + } - NextTest(); - }]; + CHIP_ERROR TestTest72SkipDownBy7_55() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; + params.count = [NSNumber numberWithShort:-7]; + [cluster skipChannelWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 7.2 - Skip Down By 7 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeChannelByNumberCommand_5() + CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentChannelWithCompletion:^( + MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { + NSLog(@"Test 7.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); + VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 3U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"World Channel")); + VerifyOrReturn( + CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); + VerifyOrReturn(CheckValueAsString( + "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest81StartFromChannel3_57() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83823,11 +85511,11 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; - params.majorNumber = [NSNumber numberWithUnsignedShort:6U]; - params.minorNumber = [NSNumber numberWithUnsignedShort:0U]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; [cluster changeChannelByNumberWithParams:params completion:^(NSError * _Nullable err) { - NSLog(@"Change Channel By Number Command Error: %@", err); + NSLog(@"Test 8.1 - Start from Channel 3 Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83837,7 +85525,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestSkipChannelCommand_6() + CHIP_ERROR TestTest82SkipDownBy8_58() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83845,10 +85533,10 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithShort:1]; + params.count = [NSNumber numberWithShort:-8]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { - NSLog(@"Skip Channel Command Error: %@", err); + NSLog(@"Test 8.2 - Skip Down By 8 Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83858,7 +85546,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_7() + CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_59() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83867,7 +85555,7 @@ class TV_ChannelCluster : public TestCommandBridge { [cluster readAttributeCurrentChannelWithCompletion:^( MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { - NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + NSLog(@"Test 8.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83889,7 +85577,29 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestSkipChannelCommand_8() + CHIP_ERROR TestTest11StartFromChannel3_60() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest12SkipUpBy32767_61() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83897,10 +85607,10 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithShort:123]; + params.count = [NSNumber numberWithShort:32767]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { - NSLog(@"Skip Channel Command Error: %@", err); + NSLog(@"Test 1.2 - Skip Up By 32,767 Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83910,7 +85620,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_9() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_62() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83919,7 +85629,7 @@ class TV_ChannelCluster : public TestCommandBridge { [cluster readAttributeCurrentChannelWithCompletion:^( MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { - NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83927,8 +85637,8 @@ class TV_ChannelCluster : public TestCommandBridge { id actualValue = value; VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 1U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS")); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); + VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); VerifyOrReturn( CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( @@ -83941,7 +85651,29 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestSkipChannelCommand_10() + CHIP_ERROR TestTest11StartFromChannel3_63() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; + params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; + params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; + [cluster changeChannelByNumberWithParams:params + completion:^(NSError * _Nullable err) { + NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestTest12SkipDownBy32768_64() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83949,10 +85681,10 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithShort:-123]; + params.count = [NSNumber numberWithShort:-32768]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { - NSLog(@"Skip Channel Command Error: %@", err); + NSLog(@"Test 1.2 - Skip Down By 32,768 Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83962,7 +85694,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_11() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_65() { MTRBaseDevice * device = GetDevice("alpha"); @@ -83971,7 +85703,7 @@ class TV_ChannelCluster : public TestCommandBridge { [cluster readAttributeCurrentChannelWithCompletion:^( MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { - NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); + NSLog(@"Test 1.3 - Verify that Skip Channel Command set correct current channel Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -83979,8 +85711,9 @@ class TV_ChannelCluster : public TestCommandBridge { id actualValue = value; VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); + VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 3U)); + VerifyOrReturn( + CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"World Channel")); VerifyOrReturn( CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); VerifyOrReturn(CheckValueAsString( From a099ed78a210e60be049195219c66cc1f665ff39 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Wed, 17 May 2023 12:49:13 +0200 Subject: [PATCH 13/23] Fix conflicts --- .../app-common/zap-generated/cluster-enums.h | 10 - .../zap-generated/cluster-objects.cpp | 1085 +---------------- .../zap-generated/cluster/Commands.h | 6 +- .../chip-tool/zap-generated/test/Commands.h | 1002 ++------------- 4 files changed, 115 insertions(+), 1988 deletions(-) diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index c712723396a1b7..baa6af449d6508 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -3491,16 +3491,6 @@ namespace AccountLogin {} // namespace AccountLogin namespace ElectricalMeasurement {} // namespace ElectricalMeasurement -<<<<<<< HEAD -<<<<<<< HEAD -======= -namespace ClientMonitoring { -} // namespace ClientMonitoring -======= -namespace ClientMonitoring {} // namespace ClientMonitoring ->>>>>>> 527fe00c24 (Update the generated files) - ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) namespace UnitTesting { // Enum for SimpleEnum diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 05f97add4899f9..faea894cbc0cc9 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -14028,20 +14028,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD } // namespace ClearUser. namespace SetCredential { -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace WindowCovering -namespace BarrierControl { - -namespace Commands { -namespace BarrierControlGoToPercent { ->>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -14110,7 +14098,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const return CHIP_NO_ERROR; } -<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -14138,10 +14125,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) break; } } -======= -namespace Events { -} // namespace Events ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); @@ -14184,23 +14167,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD } // namespace GetCredentialStatus. namespace GetCredentialStatusResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace BarrierControl -namespace PumpConfigurationAndControl { - -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) ->>>>>>> 527fe00c24 (Update the generated files) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -14372,33 +14341,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::NumberOfHolidaySchedulesSupported::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, numberOfHolidaySchedulesSupported)); break; -<<<<<<< HEAD case Attributes::MaxPINCodeLength::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, maxPINCodeLength)); -======= - } - - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace BarrierControl -namespace PumpConfigurationAndControl { - -namespace Commands { -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) - { - case Attributes::MaxPressure::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, maxPressure)); ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) break; case Attributes::MinPINCodeLength::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, minPINCodeLength)); @@ -15584,13 +15528,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events { -} // namespace Events ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -15611,7 +15548,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -<<<<<<< HEAD VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; @@ -15625,22 +15561,14 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -======= -namespace Commands { -} // namespace Commands ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { -<<<<<<< HEAD CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) -<<<<<<< HEAD -======= -======= { if (!TLV::IsContextTag(reader.GetTag())) { @@ -15657,330 +15585,37 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ClearWeeklySchedule. -} // namespace Commands +} // namespace ElectronicTemperatureHigh. +namespace PumpBlocked { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { - switch (path.mAttributeId) + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) { - case Attributes::LocalTemperature::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, localTemperature)); - break; - case Attributes::OutdoorTemperature::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, outdoorTemperature)); - break; - case Attributes::Occupancy::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupancy)); - break; - case Attributes::AbsMinHeatSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, absMinHeatSetpointLimit)); - break; - case Attributes::AbsMaxHeatSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, absMaxHeatSetpointLimit)); - break; - case Attributes::AbsMinCoolSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, absMinCoolSetpointLimit)); - break; - case Attributes::AbsMaxCoolSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, absMaxCoolSetpointLimit)); - break; - case Attributes::PICoolingDemand::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PICoolingDemand)); - break; - case Attributes::PIHeatingDemand::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PIHeatingDemand)); - break; - case Attributes::HVACSystemTypeConfiguration::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, HVACSystemTypeConfiguration)); - break; - case Attributes::LocalTemperatureCalibration::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, localTemperatureCalibration)); - break; - case Attributes::OccupiedCoolingSetpoint::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupiedCoolingSetpoint)); - break; - case Attributes::OccupiedHeatingSetpoint::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupiedHeatingSetpoint)); - break; - case Attributes::UnoccupiedCoolingSetpoint::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedCoolingSetpoint)); - break; - case Attributes::UnoccupiedHeatingSetpoint::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedHeatingSetpoint)); - break; - case Attributes::MinHeatSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, minHeatSetpointLimit)); - break; - case Attributes::MaxHeatSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, maxHeatSetpointLimit)); - break; - case Attributes::MinCoolSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, minCoolSetpointLimit)); - break; - case Attributes::MaxCoolSetpointLimit::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, maxCoolSetpointLimit)); - break; - case Attributes::MinSetpointDeadBand::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, minSetpointDeadBand)); - break; - case Attributes::RemoteSensing::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, remoteSensing)); - break; - case Attributes::ControlSequenceOfOperation::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, controlSequenceOfOperation)); - break; - case Attributes::SystemMode::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, systemMode)); - break; - case Attributes::ThermostatRunningMode::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningMode)); - break; - case Attributes::StartOfWeek::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, startOfWeek)); - break; - case Attributes::NumberOfWeeklyTransitions::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, numberOfWeeklyTransitions)); - break; - case Attributes::NumberOfDailyTransitions::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, numberOfDailyTransitions)); - break; - case Attributes::TemperatureSetpointHold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHold)); - break; - case Attributes::TemperatureSetpointHoldDuration::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, temperatureSetpointHoldDuration)); - break; - case Attributes::ThermostatProgrammingOperationMode::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, thermostatProgrammingOperationMode)); - break; - case Attributes::ThermostatRunningState::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, thermostatRunningState)); - break; - case Attributes::SetpointChangeSource::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSource)); - break; - case Attributes::SetpointChangeAmount::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeAmount)); - break; - case Attributes::SetpointChangeSourceTimestamp::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSourceTimestamp)); - break; - case Attributes::OccupiedSetback::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetback)); - break; - case Attributes::OccupiedSetbackMin::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMin)); - break; - case Attributes::OccupiedSetbackMax::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMax)); - break; - case Attributes::UnoccupiedSetback::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetback)); - break; - case Attributes::UnoccupiedSetbackMin::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMin)); - break; - case Attributes::UnoccupiedSetbackMax::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMax)); - break; - case Attributes::EmergencyHeatDelta::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, emergencyHeatDelta)); - break; - case Attributes::ACType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACType)); - break; - case Attributes::ACCapacity::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacity)); - break; - case Attributes::ACRefrigerantType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACRefrigerantType)); - break; - case Attributes::ACCompressorType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACCompressorType)); - break; - case Attributes::ACErrorCode::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACErrorCode)); - break; - case Attributes::ACLouverPosition::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACLouverPosition)); - break; - case Attributes::ACCoilTemperature::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACCoilTemperature)); - break; - case Attributes::ACCapacityformat::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacityformat)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + default: + break; + } } - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace Thermostat -namespace FanControl { - -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ ->>>>>>> 527fe00c24 (Update the generated files) - switch (path.mAttributeId) - { - case Attributes::FanMode::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, fanMode)); - break; - case Attributes::FanModeSequence::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, fanModeSequence)); - break; - case Attributes::PercentSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, percentSetting)); - break; - case Attributes::PercentCurrent::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, percentCurrent)); - break; - case Attributes::SpeedMax::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, speedMax)); - break; - case Attributes::SpeedSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, speedSetting)); - break; - case Attributes::SpeedCurrent::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, speedCurrent)); - break; - case Attributes::RockSupport::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, rockSupport)); - break; - case Attributes::RockSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, rockSetting)); - break; - case Attributes::WindSupport::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, windSupport)); - break; - case Attributes::WindSetting::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, windSetting)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; - } - - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace FanControl -namespace ThermostatUserInterfaceConfiguration { - -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -<<<<<<< HEAD -} // namespace ElectronicTemperatureHigh. -namespace PumpBlocked { -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace ThermostatUserInterfaceConfiguration -namespace ColorControl { - -namespace Commands { -namespace MoveToHue { ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } } // namespace PumpBlocked. @@ -16789,16 +16424,9 @@ namespace Events {} // namespace Events } // namespace ThermostatUserInterfaceConfiguration namespace ColorControl { -<<<<<<< HEAD namespace Commands { namespace MoveToHue { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -======= -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) ->>>>>>> 527fe00c24 (Update the generated files) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -16811,19 +16439,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre return CHIP_NO_ERROR; } -<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -======= -namespace Events {} // namespace Events - -} // namespace TemperatureMeasurement -namespace PressureMeasurement { - -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) ->>>>>>> 527fe00c24 (Update the generated files) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; @@ -16861,23 +16477,9 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD } // namespace MoveToHue. namespace MoveHue { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace PressureMeasurement -namespace FlowMeasurement { - -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) ->>>>>>> 527fe00c24 (Update the generated files) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -16888,22 +16490,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace FlowMeasurement -namespace RelativeHumidityMeasurement { - -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) ->>>>>>> 527fe00c24 (Update the generated files) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; @@ -16952,17 +16540,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace RelativeHumidityMeasurement -namespace OccupancySensing { - -namespace Commands {} // namespace Commands ->>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -16972,7 +16549,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { -<<<<<<< HEAD if (!TLV::IsContextTag(reader.GetTag())) { continue; @@ -16997,124 +16573,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) default: break; } -======= - case Attributes::Occupancy::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupancy)); - break; - case Attributes::OccupancySensorType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorType)); - break; - case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap)); - break; - case Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PIROccupiedToUnoccupiedDelay)); - break; - case Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedDelay)); - break; - case Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedThreshold)); - break; - case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay)); - break; - case Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedDelay)); - break; - case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedThreshold)); - break; - case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactOccupiedToUnoccupiedDelay)); - break; - case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedDelay)); - break; - case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedThreshold)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; - } - - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace OccupancySensing -namespace WakeOnLan { - -namespace Commands {} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) - { - case Attributes::MACAddress::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, MACAddress)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; ->>>>>>> 527fe00c24 (Update the generated files) } VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD } // namespace StepHue. namespace MoveToSaturation { -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace WakeOnLan -namespace Channel { -namespace Structs { -namespace ChannelInfoStruct { ->>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -17225,13 +16691,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events { -} // namespace Events ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -17267,7 +16726,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } -<<<<<<< HEAD VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; @@ -17286,10 +16744,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -======= -namespace Commands { -} // namespace Commands ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -17343,19 +16797,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace BallastConfiguration -namespace IlluminanceMeasurement { - -namespace Commands { -} // namespace Commands ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -17408,19 +16849,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace IlluminanceMeasurement -namespace TemperatureMeasurement { - -namespace Commands { -} // namespace Commands ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -17457,24 +16885,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD } // namespace MoveColor. namespace StepColor { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace TemperatureMeasurement -namespace PressureMeasurement { - -namespace Commands { -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); @@ -17486,19 +16899,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace PressureMeasurement -namespace FlowMeasurement { - -namespace Commands { -} // namespace Commands ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -17551,19 +16951,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace FlowMeasurement -namespace RelativeHumidityMeasurement { - -namespace Commands { -} // namespace Commands ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -17585,153 +16972,23 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kTransitionTime): ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime)); break; - case to_underlying(Fields::kOptionsMask): - ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask)); - break; - case to_underlying(Fields::kOptionsOverride): - ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -<<<<<<< HEAD -} // namespace MoveToColorTemperature. -namespace EnhancedMoveToHue { -======= -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace RelativeHumidityMeasurement -namespace OccupancySensing { - -namespace Commands { -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) - { - case Attributes::Occupancy::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupancy)); - break; - case Attributes::OccupancySensorType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorType)); - break; - case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap)); - break; - case Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PIROccupiedToUnoccupiedDelay)); - break; - case Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedDelay)); - break; - case Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedThreshold)); - break; - case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay)); - break; - case Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedDelay)); - break; - case Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicUnoccupiedToOccupiedThreshold)); - break; - case Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactOccupiedToUnoccupiedDelay)); - break; - case Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedDelay)); - break; - case Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, physicalContactUnoccupiedToOccupiedThreshold)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; - } - - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace OccupancySensing -namespace WakeOnLan { - -namespace Commands { -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) - { - case Attributes::MACAddress::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, MACAddress)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; + case to_underlying(Fields::kOptionsMask): + ReturnErrorOnFailure(DataModel::Decode(reader, optionsMask)); + break; + case to_underlying(Fields::kOptionsOverride): + ReturnErrorOnFailure(DataModel::Decode(reader, optionsOverride)); + break; + default: + break; + } } + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace WakeOnLan -namespace Channel { -namespace Structs { -namespace ChannelInfoStruct { ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) +} // namespace MoveToColorTemperature. +namespace EnhancedMoveToHue { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -17999,61 +17256,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD } // namespace ColorLoopSet. namespace StopMoveStep { -======= -} // namespace SkipChannel. -} // namespace Commands - -namespace Attributes { -CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) -{ - switch (path.mAttributeId) - { - case Attributes::ChannelList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, channelList)); - break; - case Attributes::Lineup::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, lineup)); - break; - case Attributes::CurrentChannel::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, currentChannel)); - break; - case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); - break; - case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); - break; - case Attributes::EventList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, eventList)); - break; - case Attributes::AttributeList::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); - break; - case Attributes::FeatureMap::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); - break; - case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); - break; - default: - break; - } - - return CHIP_NO_ERROR; -} -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace Channel -namespace TargetNavigator { -namespace Structs { -namespace TargetInfoStruct { ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -18404,89 +17608,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre return CHIP_NO_ERROR; } } // namespace Attributes -<<<<<<< HEAD -======= - -namespace Events {} // namespace Events - -} // namespace TargetNavigator -namespace MediaPlayback { -namespace Structs { -namespace PlaybackPositionStruct { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kUpdatedAt), updatedAt)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kPosition), position)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - err = reader.EnterContainer(outer); - ReturnErrorOnFailure(err); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kUpdatedAt): - ReturnErrorOnFailure(DataModel::Decode(reader, updatedAt)); - break; - case to_underlying(Fields::kPosition): - ReturnErrorOnFailure(DataModel::Decode(reader, position)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - - return CHIP_NO_ERROR; -} - -} // namespace PlaybackPositionStruct -} // namespace Structs - -namespace Commands { -namespace Play { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) namespace Events {} // namespace Events @@ -18569,22 +17690,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } // namespace Attributes namespace Events {} // namespace Events -<<<<<<< HEAD -======= - -} // namespace MediaInput -namespace LowPower { - -namespace Commands { -namespace Sleep { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} ->>>>>>> 527fe00c24 (Update the generated files) } // namespace BallastConfiguration namespace IlluminanceMeasurement { @@ -18638,60 +17743,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } // namespace Attributes namespace Events {} // namespace Events -<<<<<<< HEAD -======= - -} // namespace LowPower -namespace KeypadInput { - -namespace Commands { -namespace SendKey { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kKeyCode), keyCode)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kKeyCode): - ReturnErrorOnFailure(DataModel::Decode(reader, keyCode)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace SendKey. -namespace SendKeyResponse { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kStatus), status)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} ->>>>>>> 527fe00c24 (Update the generated files) } // namespace IlluminanceMeasurement namespace TemperatureMeasurement { @@ -18806,8 +17857,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PressureMeasurement namespace FlowMeasurement { @@ -19383,13 +18433,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events { -} // namespace Events ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) } // namespace TargetInfoStruct } // namespace Structs @@ -19741,18 +18784,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD -======= -} // namespace Attributes - -namespace Events {} // namespace Events - -} // namespace ApplicationLauncher -namespace ApplicationBasic { -namespace Structs {} // namespace Structs - -namespace Commands {} // namespace Commands ->>>>>>> 527fe00c24 (Update the generated files) CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { @@ -19787,7 +18818,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const return CHIP_NO_ERROR; } -<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -19806,9 +18836,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) break; } } -======= -namespace Events {} // namespace Events ->>>>>>> 527fe00c24 (Update the generated files) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); @@ -19884,20 +18911,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -<<<<<<< HEAD } // namespace SkipForward. namespace SkipBackward { -======= -} // namespace Attributes - -namespace Events { -} // namespace Events - -} // namespace ContentLauncher -namespace AudioOutput { -namespace Structs { -namespace OutputInfoStruct { ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20309,10 +19324,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events -<<<<<<< HEAD } // namespace MediaInput namespace LowPower { @@ -20350,14 +19363,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace Sleep. -======= -} // namespace ApplicationLauncher -namespace ApplicationBasic { -namespace Structs { -} // namespace Structs - -namespace Commands { ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) } // namespace Commands namespace Attributes { @@ -20391,8 +19396,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace LowPower namespace KeypadInput { @@ -20614,7 +19618,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const return CHIP_NO_ERROR; } -<<<<<<< HEAD CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -20643,10 +19646,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) break; } } -======= -namespace Events { -} // namespace Events ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 9f027e971a8162..d9f38d3d821d35 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -6529,15 +6529,11 @@ class ColorControlStepColor : public ClusterCommand public: ColorControlStepColor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("step-color", credsIssuerConfig) { -<<<<<<< HEAD AddArgument("StepX", INT16_MIN, INT16_MAX, &mRequest.stepX); AddArgument("StepY", INT16_MIN, INT16_MAX, &mRequest.stepY); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride); -======= - AddArgument("Count", INT16_MIN, INT16_MAX, &mRequest.count); ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) ClusterCommand::AddArguments(); } @@ -7145,7 +7141,7 @@ class ChannelSkipChannel : public ClusterCommand public: ChannelSkipChannel(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("skip-channel", credsIssuerConfig) { - AddArgument("Count", 0, UINT16_MAX, &mRequest.count); + AddArgument("Count", INT16_MIN, INT16_MAX, &mRequest.count); ClusterCommand::AddArguments(); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index f6a1d969232d38..04a7627f2e19ef 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -100146,64 +100146,6 @@ class Test_TC_DLOG_2_2Suite : public TestCommand }; class Test_TC_DLOG_3_1Suite : public TestCommand -<<<<<<< HEAD -======= -{ -public: - Test_TC_DLOG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_3_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_DLOG_3_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_DESC_2_1Suite : public TestCommand ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) { public: Test_TC_DLOG_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLOG_3_1", 0, credsIssuerConfig) @@ -102974,121 +102916,6 @@ class Test_TC_ALOGIN_12_2Suite : public TestCommand } }; -<<<<<<< HEAD -======= -class Test_TC_WAKEONLAN_4_1Suite : public TestCommand -{ -public: - Test_TC_WAKEONLAN_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("Test_TC_WAKEONLAN_4_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_WAKEONLAN_4_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_ALOGIN_12_1Suite : public TestCommand -{ -public: - Test_TC_ALOGIN_12_1Suite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("Test_TC_ALOGIN_12_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_ALOGIN_12_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) class Test_TC_CADMIN_1_1Suite : public TestCommand { public: @@ -106858,8 +106685,6 @@ class Test_TC_MOD_3_2Suite : public TestCommand }; class Test_TC_MOD_3_3Suite : public TestCommand -<<<<<<< HEAD -======= { public: Test_TC_MOD_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MOD_3_3", 0, credsIssuerConfig) @@ -106970,10 +106795,9 @@ class Test_TC_MOD_3_4Suite : public TestCommand }; class Test_TC_SU_1_1Suite : public TestCommand ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) { public: - Test_TC_MOD_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MOD_3_3", 0, credsIssuerConfig) + Test_TC_SU_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_1_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -106981,7 +106805,7 @@ class Test_TC_SU_1_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_MOD_3_3Suite() {} + ~Test_TC_SU_1_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107025,10 +106849,10 @@ class Test_TC_SU_1_1Suite : public TestCommand } }; -class Test_TC_MOD_3_4Suite : public TestCommand +class Test_TC_SU_2_1Suite : public TestCommand { public: - Test_TC_MOD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MOD_3_4", 0, credsIssuerConfig) + Test_TC_SU_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107036,7 +106860,7 @@ class Test_TC_MOD_3_4Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_MOD_3_4Suite() {} + ~Test_TC_SU_2_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107080,10 +106904,10 @@ class Test_TC_MOD_3_4Suite : public TestCommand } }; -class Test_TC_SU_1_1Suite : public TestCommand +class Test_TC_SU_2_2Suite : public TestCommand { public: - Test_TC_SU_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_1_1", 0, credsIssuerConfig) + Test_TC_SU_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_2", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107091,7 +106915,7 @@ class Test_TC_SU_1_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_1_1Suite() {} + ~Test_TC_SU_2_2Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107135,10 +106959,10 @@ class Test_TC_SU_1_1Suite : public TestCommand } }; -class Test_TC_SU_2_1Suite : public TestCommand +class Test_TC_SU_2_3Suite : public TestCommand { public: - Test_TC_SU_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_1", 0, credsIssuerConfig) + Test_TC_SU_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_3", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107146,7 +106970,7 @@ class Test_TC_SU_2_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_1Suite() {} + ~Test_TC_SU_2_3Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107190,10 +107014,10 @@ class Test_TC_SU_2_1Suite : public TestCommand } }; -class Test_TC_SU_2_2Suite : public TestCommand +class Test_TC_SU_2_4Suite : public TestCommand { public: - Test_TC_SU_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_2", 0, credsIssuerConfig) + Test_TC_SU_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107201,7 +107025,7 @@ class Test_TC_SU_2_2Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_2Suite() {} + ~Test_TC_SU_2_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107245,10 +107069,10 @@ class Test_TC_SU_2_2Suite : public TestCommand } }; -class Test_TC_SU_2_3Suite : public TestCommand +class Test_TC_SU_2_5Suite : public TestCommand { public: - Test_TC_SU_2_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_3", 0, credsIssuerConfig) + Test_TC_SU_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_5", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107256,7 +107080,7 @@ class Test_TC_SU_2_3Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_3Suite() {} + ~Test_TC_SU_2_5Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107300,10 +107124,10 @@ class Test_TC_SU_2_3Suite : public TestCommand } }; -class Test_TC_SU_2_4Suite : public TestCommand +class Test_TC_SU_2_6Suite : public TestCommand { public: - Test_TC_SU_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_4", 0, credsIssuerConfig) + Test_TC_SU_2_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_6", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107311,7 +107135,7 @@ class Test_TC_SU_2_4Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_4Suite() {} + ~Test_TC_SU_2_6Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107355,10 +107179,10 @@ class Test_TC_SU_2_4Suite : public TestCommand } }; -class Test_TC_SU_2_5Suite : public TestCommand +class Test_TC_SU_2_7Suite : public TestCommand { public: - Test_TC_SU_2_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_5", 0, credsIssuerConfig) + Test_TC_SU_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_7", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107366,7 +107190,7 @@ class Test_TC_SU_2_5Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_5Suite() {} + ~Test_TC_SU_2_7Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107410,10 +107234,10 @@ class Test_TC_SU_2_5Suite : public TestCommand } }; -class Test_TC_SU_2_6Suite : public TestCommand +class Test_TC_SU_2_8Suite : public TestCommand { public: - Test_TC_SU_2_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_6", 0, credsIssuerConfig) + Test_TC_SU_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_8", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107421,7 +107245,7 @@ class Test_TC_SU_2_6Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_6Suite() {} + ~Test_TC_SU_2_8Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107465,10 +107289,10 @@ class Test_TC_SU_2_6Suite : public TestCommand } }; -class Test_TC_SU_2_7Suite : public TestCommand +class Test_TC_SU_3_1Suite : public TestCommand { public: - Test_TC_SU_2_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_7", 0, credsIssuerConfig) + Test_TC_SU_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107476,7 +107300,7 @@ class Test_TC_SU_2_7Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_7Suite() {} + ~Test_TC_SU_3_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107520,10 +107344,10 @@ class Test_TC_SU_2_7Suite : public TestCommand } }; -class Test_TC_SU_2_8Suite : public TestCommand +class Test_TC_SU_3_2Suite : public TestCommand { public: - Test_TC_SU_2_8Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_2_8", 0, credsIssuerConfig) + Test_TC_SU_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_2", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107531,7 +107355,7 @@ class Test_TC_SU_2_8Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_2_8Suite() {} + ~Test_TC_SU_3_2Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107575,10 +107399,10 @@ class Test_TC_SU_2_8Suite : public TestCommand } }; -class Test_TC_SU_3_1Suite : public TestCommand +class Test_TC_SU_3_3Suite : public TestCommand { public: - Test_TC_SU_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_1", 0, credsIssuerConfig) + Test_TC_SU_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_3", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107586,7 +107410,7 @@ class Test_TC_SU_3_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_3_1Suite() {} + ~Test_TC_SU_3_3Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107630,10 +107454,10 @@ class Test_TC_SU_3_1Suite : public TestCommand } }; -class Test_TC_SU_3_2Suite : public TestCommand +class Test_TC_SU_3_4Suite : public TestCommand { public: - Test_TC_SU_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_2", 0, credsIssuerConfig) + Test_TC_SU_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107641,7 +107465,7 @@ class Test_TC_SU_3_2Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_3_2Suite() {} + ~Test_TC_SU_3_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -107685,10 +107509,10 @@ class Test_TC_SU_3_2Suite : public TestCommand } }; -class Test_TC_SU_3_3Suite : public TestCommand +class Test_TC_SU_4_1Suite : public TestCommand { public: - Test_TC_SU_3_3Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_3", 0, credsIssuerConfig) + Test_TC_SU_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_4_1", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -107696,117 +107520,7 @@ class Test_TC_SU_3_3Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_SU_3_3Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_SU_3_4Suite : public TestCommand -{ -public: - Test_TC_SU_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_3_4", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_SU_3_4Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_SU_4_1Suite : public TestCommand -{ -public: - Test_TC_SU_4_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SU_4_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_SU_4_1Suite() {} + ~Test_TC_SU_4_1Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -109837,64 +109551,6 @@ class Test_TC_FLW_2_2Suite : public TestCommand } }; -<<<<<<< HEAD -======= -class Test_TC_FLW_3_1Suite : public TestCommand -{ -public: - Test_TC_FLW_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLW_3_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_FLW_3_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) class Test_TC_OCC_3_1Suite : public TestCommand { public: @@ -110061,12 +109717,10 @@ class Test_TC_PS_2_2Suite : public TestCommand } }; -<<<<<<< HEAD -======= -class Test_TC_PS_3_1Suite : public TestCommand +class Test_TC_BOOL_2_2Suite : public TestCommand { public: - Test_TC_PS_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PS_3_1", 0, credsIssuerConfig) + Test_TC_BOOL_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_2_2", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110074,7 +109728,7 @@ class Test_TC_PS_3_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_PS_3_1Suite() {} + ~Test_TC_BOOL_2_2Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110118,11 +109772,10 @@ class Test_TC_PS_3_1Suite : public TestCommand } }; ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) -class Test_TC_BOOL_2_2Suite : public TestCommand +class Test_TC_CC_2_2Suite : public TestCommand { public: - Test_TC_BOOL_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_2_2", 0, credsIssuerConfig) + Test_TC_CC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_2_2", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110130,7 +109783,7 @@ class Test_TC_BOOL_2_2Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_BOOL_2_2Suite() {} + ~Test_TC_CC_2_2Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110174,12 +109827,10 @@ class Test_TC_BOOL_2_2Suite : public TestCommand } }; -<<<<<<< HEAD -======= -class Test_TC_BOOL_3_1Suite : public TestCommand +class Test_TC_CC_3_4Suite : public TestCommand { public: - Test_TC_BOOL_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_3_1", 0, credsIssuerConfig) + Test_TC_CC_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_3_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110187,7 +109838,7 @@ class Test_TC_BOOL_3_1Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_BOOL_3_1Suite() {} + ~Test_TC_CC_3_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110231,11 +109882,10 @@ class Test_TC_BOOL_3_1Suite : public TestCommand } }; ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) -class Test_TC_CC_2_2Suite : public TestCommand +class Test_TC_CC_4_5Suite : public TestCommand { public: - Test_TC_CC_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_2_2", 0, credsIssuerConfig) + Test_TC_CC_4_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_5", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110243,7 +109893,7 @@ class Test_TC_CC_2_2Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CC_2_2Suite() {} + ~Test_TC_CC_4_5Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110287,10 +109937,10 @@ class Test_TC_CC_2_2Suite : public TestCommand } }; -class Test_TC_CC_3_4Suite : public TestCommand +class Test_TC_CC_5_4Suite : public TestCommand { public: - Test_TC_CC_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_3_4", 0, credsIssuerConfig) + Test_TC_CC_5_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_5_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110298,7 +109948,7 @@ class Test_TC_CC_3_4Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CC_3_4Suite() {} + ~Test_TC_CC_5_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110342,10 +109992,10 @@ class Test_TC_CC_3_4Suite : public TestCommand } }; -class Test_TC_CC_4_5Suite : public TestCommand +class Test_TC_CC_6_4Suite : public TestCommand { public: - Test_TC_CC_4_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_5", 0, credsIssuerConfig) + Test_TC_CC_6_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_6_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110353,7 +110003,7 @@ class Test_TC_CC_4_5Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CC_4_5Suite() {} + ~Test_TC_CC_6_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110397,10 +110047,10 @@ class Test_TC_CC_4_5Suite : public TestCommand } }; -class Test_TC_CC_5_4Suite : public TestCommand +class Test_TC_CC_7_5Suite : public TestCommand { public: - Test_TC_CC_5_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_5_4", 0, credsIssuerConfig) + Test_TC_CC_7_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_7_5", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110408,7 +110058,7 @@ class Test_TC_CC_5_4Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CC_5_4Suite() {} + ~Test_TC_CC_7_5Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110452,10 +110102,10 @@ class Test_TC_CC_5_4Suite : public TestCommand } }; -class Test_TC_CC_6_4Suite : public TestCommand +class Test_TC_CC_9_4Suite : public TestCommand { public: - Test_TC_CC_6_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_6_4", 0, credsIssuerConfig) + Test_TC_CC_9_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_9_4", 0, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110463,7 +110113,7 @@ class Test_TC_CC_6_4Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CC_6_4Suite() {} + ~Test_TC_CC_9_4Suite() {} chip::System::Clock::Timeout GetWaitDuration() const override { @@ -110507,10 +110157,10 @@ class Test_TC_CC_6_4Suite : public TestCommand } }; -class Test_TC_CC_7_5Suite : public TestCommand +class Test_TC_CC_3_1Suite : public TestCommand { public: - Test_TC_CC_7_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_7_5", 0, credsIssuerConfig) + Test_TC_CC_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_3_1", 51, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -110518,119 +110168,9 @@ class Test_TC_CC_7_5Suite : public TestCommand AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } - ~Test_TC_CC_7_5Suite() {} + ~Test_TC_CC_3_1Suite() {} - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_CC_9_4Suite : public TestCommand -{ -public: - Test_TC_CC_9_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_9_4", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_CC_9_4Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_CC_3_1Suite : public TestCommand -{ -public: - Test_TC_CC_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_3_1", 51, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_CC_3_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(200)); } + chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(200)); } private: chip::Optional mNodeId; @@ -117152,64 +116692,6 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand } }; -<<<<<<< HEAD -======= -class Test_TC_SWTCH_3_1Suite : public TestCommand -{ -public: - Test_TC_SWTCH_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_3_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_SWTCH_3_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) class Test_TC_SWTCH_3_2Suite : public TestCommand { public: @@ -117859,8 +117341,6 @@ class Test_TC_DGTHREAD_3_3Suite : public TestCommand }; class Test_TC_DGTHREAD_3_4Suite : public TestCommand -<<<<<<< HEAD -======= { public: Test_TC_DGTHREAD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : @@ -117916,62 +117396,6 @@ class Test_TC_DGTHREAD_3_4Suite : public TestCommand } }; -class Test_TC_DGTHREAD_3_5Suite : public TestCommand -{ -public: - Test_TC_DGTHREAD_3_5Suite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("Test_TC_DGTHREAD_3_5", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_DGTHREAD_3_5Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - class Test_TC_ACT_2_1Suite : public TestCommand { public: @@ -118082,175 +117506,6 @@ class Test_TC_ACT_2_2Suite : public TestCommand } }; -class Test_TC_ACT_3_1Suite : public TestCommand ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) -{ -public: - Test_TC_DGTHREAD_3_4Suite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("Test_TC_DGTHREAD_3_4", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_DGTHREAD_3_4Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - { - } - return CHIP_NO_ERROR; - } -}; - -class Test_TC_ACT_2_1Suite : public TestCommand -{ -public: - Test_TC_ACT_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_2_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_ACT_2_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - { - } - return CHIP_NO_ERROR; - } -}; - -class Test_TC_ACT_2_2Suite : public TestCommand -{ -public: - Test_TC_ACT_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_2_2", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_ACT_2_2Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - class Test_TC_ACT_3_2Suite : public TestCommand { public: @@ -118822,7 +118077,6 @@ class Test_TC_S_1_1Suite : public TestCommand using namespace chip::app::Clusters; switch (testIndex) { -<<<<<<< HEAD case 0: { LogStep(0, "Commission DUT to TH (can be skipped if done in a preceding test)"); ListFreer listFreer; @@ -118888,6 +118142,7 @@ class Test_TC_S_1_1Suite : public TestCommand return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Scenes::Id, Scenes::Attributes::AcceptedCommandList::Id, true, chip::NullOptional); } +<<<<<<< HEAD <<<<<<< HEAD case 11: { LogStep(11, "Read GeneratedCommandList (global attribute 65528)"); @@ -118916,6 +118171,8 @@ class Test_TC_S_1_1Suite : public TestCommand ======= >>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) >>>>>>> 4f9ddf3be4 (MediaClusters: Update SkipChannel per issue 26104) +======= +>>>>>>> fd2e2672f7 (Fix conflicts) } return CHIP_NO_ERROR; } @@ -119306,121 +118563,6 @@ class Test_TC_ACL_2_6Suite : public TestCommand } }; -<<<<<<< HEAD -======= -class Test_TC_BRBINFO_1_1Suite : public TestCommand -{ -public: - Test_TC_BRBINFO_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("Test_TC_BRBINFO_1_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_BRBINFO_1_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - -class Test_TC_BRBINFO_2_1Suite : public TestCommand -{ -public: - Test_TC_BRBINFO_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("Test_TC_BRBINFO_2_1", 0, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_BRBINFO_2_1Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - {} - return CHIP_NO_ERROR; - } -}; - ->>>>>>> 527fe00c24 (Update the generated files) class Test_TC_BRBINFO_2_2Suite : public TestCommand { public: From 483ede5def195155e1c53cb929b8aeba666a34bb Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Wed, 17 May 2023 14:09:42 +0200 Subject: [PATCH 14/23] Update tests & code --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 9 ++++++--- src/app/tests/suites/TV_ChannelCluster.yaml | 8 ++++---- zzz_generated/chip-tool/zap-generated/test/Commands.h | 8 ++++---- .../darwin-framework-tool/zap-generated/test/Commands.h | 9 ++++----- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index cacb22457e0e01..f1ab1f3688f4dc 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -111,12 +111,15 @@ void ChannelManager::HandleChangeChannel(CommandResponseHelper Date: Wed, 17 May 2023 14:11:40 +0200 Subject: [PATCH 15/23] Restyle fix --- .../linux/include/channel/ChannelManager.cpp | 6 +- src/app/tests/suites/TV_ChannelCluster.yaml | 75 ++++++++++++++----- 2 files changed, 59 insertions(+), 22 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index f1ab1f3688f4dc..7671a47fb742a6 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -115,8 +115,10 @@ void ChannelManager::HandleChangeChannel(CommandResponseHelper Date: Wed, 17 May 2023 15:16:56 +0200 Subject: [PATCH 16/23] Update Test due to previous index calculation error --- src/app/tests/suites/TV_ChannelCluster.yaml | 2 +- zzz_generated/chip-tool/zap-generated/test/Commands.h | 2 +- .../darwin-framework-tool/zap-generated/test/Commands.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index a397631430260e..115fef470a0478 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -116,7 +116,7 @@ tests: arguments: values: - name: "Count" - value: 1 + value: 2 - label: "Verify that Skip Channel Command set correct current channel" command: "readAttribute" diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index b0b115cf0dde8a..667dd3455fcc10 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -61357,7 +61357,7 @@ class TV_ChannelClusterSuite : public TestCommand LogStep(6, "Skip Channel Command"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = 1; + value.count = 2; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 5fc1dacd55d469..f390509c5e8a3c 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -84241,7 +84241,7 @@ class TV_ChannelCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithShort:1]; + params.count = [NSNumber numberWithShort:2]; [cluster skipChannelWithParams:params completion:^(NSError * _Nullable err) { NSLog(@"Skip Channel Command Error: %@", err); From c6f8306f2f7f4310178a8c3b20eb0852a702a98b Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Wed, 17 May 2023 19:25:26 +0200 Subject: [PATCH 17/23] Add fix for tests --- src/app/tests/suites/TV_ChannelCluster.yaml | 38 -- .../chip-tool/zap-generated/test/Commands.h | 361 ++++++-------- .../zap-generated/test/Commands.h | 456 +++++++----------- 3 files changed, 314 insertions(+), 541 deletions(-) diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index 115fef470a0478..162dbf27c22c57 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -151,26 +151,6 @@ tests: AffiliateCallSign: "KCTS", } - - label: "Skip Channel Command" - command: "SkipChannel" - arguments: - values: - - name: "Count" - value: -123 - - - label: "Verify that Skip Channel Command set correct current channel" - command: "readAttribute" - attribute: "CurrentChannel" - response: - value: - { - MajorNumber: 9, - MinorNumber: 2, - Name: "PBS Kids", - CallSign: "KCTS-TV", - AffiliateCallSign: "KCTS", - } - ############################# # Test Skip Channel Up 1..8 # ############################# @@ -441,15 +421,6 @@ tests: # Test Skip Channel Down 1..8 # ############################### - - label: "Test 1.1 - Start from Channel 3" - command: "ChangeChannelByNumber" - arguments: - values: - - name: "MajorNumber" - value: 9 - - name: "MinorNumber" - value: 2 - - label: "Test 1.2 - Skip Down By 1" command: "SkipChannel" arguments: @@ -707,15 +678,6 @@ tests: # Test Skip Channel Up 32,767 # ############################### - - label: "Test 1.1 - Start from Channel 3" - command: "ChangeChannelByNumber" - arguments: - values: - - name: "MajorNumber" - value: 9 - - name: "MinorNumber" - value: 2 - - label: "Test 1.2 - Skip Up By 32,767" command: "SkipChannel" arguments: diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 667dd3455fcc10..35dccc7bcea537 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -60634,7 +60634,7 @@ class TV_MediaPlaybackClusterSuite : public TestCommand class TV_ChannelClusterSuite : public TestCommand { public: - TV_ChannelClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ChannelCluster", 66, credsIssuerConfig) + TV_ChannelClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ChannelCluster", 62, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -60828,30 +60828,8 @@ class TV_ChannelClusterSuite : public TestCommand break; case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - { - chip::app::DataModel::Nullable value; - VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValueNonNull("currentChannel", value)); - VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber, 9U)); - VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber, 2U)); - VerifyOrReturn(CheckValuePresent("currentChannel.Value().name", value.Value().name)); - VerifyOrReturn(CheckValueAsString("currentChannel.Value().name.Value()", value.Value().name.Value(), - chip::CharSpan("PBS Kids", 8))); - VerifyOrReturn(CheckValuePresent("currentChannel.Value().callSign", value.Value().callSign)); - VerifyOrReturn(CheckValueAsString("currentChannel.Value().callSign.Value()", value.Value().callSign.Value(), - chip::CharSpan("KCTS-TV", 7))); - VerifyOrReturn(CheckValuePresent("currentChannel.Value().affiliateCallSign", value.Value().affiliateCallSign)); - VerifyOrReturn(CheckValueAsString("currentChannel.Value().affiliateCallSign.Value()", - value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); - } break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60870,13 +60848,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 15: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 16: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 17: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60895,13 +60873,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); } break; - case 18: + case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 19: + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 20: + case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60920,13 +60898,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 21: + case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 22: + case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 23: + case 21: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60945,13 +60923,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 24: + case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 25: + case 23: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 26: + case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60970,13 +60948,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 27: + case 25: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 28: + case 26: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 29: + case 27: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60995,13 +60973,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); } break; - case 30: + case 28: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 31: + case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 32: + case 30: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61020,13 +60998,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 33: + case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 34: + case 32: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 35: + case 33: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61045,13 +61023,10 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 36: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 37: + case 34: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 38: + case 35: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61070,13 +61045,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 39: + case 36: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 40: + case 37: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 41: + case 38: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61095,13 +61070,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); } break; - case 42: + case 39: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 43: + case 40: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 44: + case 41: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61120,13 +61095,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 45: + case 42: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 46: + case 43: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 47: + case 44: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61145,13 +61120,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 48: + case 45: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 49: + case 46: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 50: + case 47: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61170,13 +61145,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 51: + case 48: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 52: + case 49: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 53: + case 50: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61195,13 +61170,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); } break; - case 54: + case 51: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 55: + case 52: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 56: + case 53: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61220,13 +61195,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 57: + case 54: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 58: + case 55: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 59: + case 56: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61245,13 +61220,10 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 60: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 61: + case 57: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 62: + case 58: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61270,13 +61242,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 63: + case 59: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 64: + case 60: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 65: + case 61: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61384,22 +61356,7 @@ class TV_ChannelClusterSuite : public TestCommand chip::NullOptional); } case 10: { - LogStep(10, "Skip Channel Command"); - ListFreer listFreer; - chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -123; - return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, - chip::NullOptional - - ); - } - case 11: { - LogStep(11, "Verify that Skip Channel Command set correct current channel"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, - chip::NullOptional); - } - case 12: { - LogStep(12, "Test 1.1 - Start from Channel 3"); + LogStep(10, "Test 1.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61409,8 +61366,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 13: { - LogStep(13, "Test 1.2 - Skip Up By 1"); + case 11: { + LogStep(11, "Test 1.2 - Skip Up By 1"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 1; @@ -61419,13 +61376,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 14: { - LogStep(14, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + case 12: { + LogStep(12, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 15: { - LogStep(15, "Test 2.1 - Start from Channel 3"); + case 13: { + LogStep(13, "Test 2.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61435,8 +61392,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 16: { - LogStep(16, "Test 2.2 - Skip Up By 2"); + case 14: { + LogStep(14, "Test 2.2 - Skip Up By 2"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 2; @@ -61445,13 +61402,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 17: { - LogStep(17, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); + case 15: { + LogStep(15, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 18: { - LogStep(18, "Test 3.1 - Start from Channel 3"); + case 16: { + LogStep(16, "Test 3.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61461,8 +61418,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 19: { - LogStep(19, "Test 3.2 - Skip Up By 3"); + case 17: { + LogStep(17, "Test 3.2 - Skip Up By 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 3; @@ -61471,13 +61428,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 20: { - LogStep(20, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); + case 18: { + LogStep(18, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 21: { - LogStep(21, "Test 4.1 - Start from Channel 3"); + case 19: { + LogStep(19, "Test 4.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61487,8 +61444,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 22: { - LogStep(22, "Test 4.2 - Skip Up By 4"); + case 20: { + LogStep(20, "Test 4.2 - Skip Up By 4"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 4; @@ -61497,13 +61454,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 23: { - LogStep(23, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); + case 21: { + LogStep(21, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 24: { - LogStep(24, "Test 5.1 - Start from Channel 3"); + case 22: { + LogStep(22, "Test 5.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61513,8 +61470,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 25: { - LogStep(25, "Test 5.2 - Skip Up By 5"); + case 23: { + LogStep(23, "Test 5.2 - Skip Up By 5"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 5; @@ -61523,13 +61480,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 26: { - LogStep(26, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); + case 24: { + LogStep(24, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 27: { - LogStep(27, "Test 6.1 - Start from Channel 3"); + case 25: { + LogStep(25, "Test 6.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61539,8 +61496,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 28: { - LogStep(28, "Test 6.2 - Skip Up By 6"); + case 26: { + LogStep(26, "Test 6.2 - Skip Up By 6"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 6; @@ -61549,13 +61506,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 29: { - LogStep(29, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); + case 27: { + LogStep(27, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 30: { - LogStep(30, "Test 7.1 - Start from Channel 3"); + case 28: { + LogStep(28, "Test 7.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61565,8 +61522,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 31: { - LogStep(31, "Test 7.2 - Skip Up By 7"); + case 29: { + LogStep(29, "Test 7.2 - Skip Up By 7"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 7; @@ -61575,13 +61532,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 32: { - LogStep(32, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); + case 30: { + LogStep(30, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 33: { - LogStep(33, "Test 8.1 - Start from Channel 3"); + case 31: { + LogStep(31, "Test 8.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61591,8 +61548,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 34: { - LogStep(34, "Test 8.2 - Skip Up By 8"); + case 32: { + LogStep(32, "Test 8.2 - Skip Up By 8"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 8; @@ -61601,13 +61558,28 @@ class TV_ChannelClusterSuite : public TestCommand ); } + case 33: { + LogStep(33, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, + chip::NullOptional); + } + case 34: { + LogStep(34, "Test 1.2 - Skip Down By 1"); + ListFreer listFreer; + chip::app::Clusters::Channel::Commands::SkipChannel::Type value; + value.count = -1; + return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, + chip::NullOptional + + ); + } case 35: { - LogStep(35, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(35, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 36: { - LogStep(36, "Test 1.1 - Start from Channel 3"); + LogStep(36, "Test 2.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61618,22 +61590,22 @@ class TV_ChannelClusterSuite : public TestCommand ); } case 37: { - LogStep(37, "Test 1.2 - Skip Down By 1"); + LogStep(37, "Test 2.2 - Skip Down By 2"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -1; + value.count = -2; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } case 38: { - LogStep(38, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(38, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 39: { - LogStep(39, "Test 2.1 - Start from Channel 3"); + LogStep(39, "Test 3.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61644,22 +61616,22 @@ class TV_ChannelClusterSuite : public TestCommand ); } case 40: { - LogStep(40, "Test 2.2 - Skip Down By 2"); + LogStep(40, "Test 3.2 - Skip Down By 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -2; + value.count = -3; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } case 41: { - LogStep(41, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(41, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 42: { - LogStep(42, "Test 3.1 - Start from Channel 3"); + LogStep(42, "Test 4.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61670,22 +61642,22 @@ class TV_ChannelClusterSuite : public TestCommand ); } case 43: { - LogStep(43, "Test 3.2 - Skip Down By 3"); + LogStep(43, "Test 4.2 - Skip Down By 4"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -3; + value.count = -4; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } case 44: { - LogStep(44, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(44, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 45: { - LogStep(45, "Test 4.1 - Start from Channel 3"); + LogStep(45, "Test 5.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61696,22 +61668,22 @@ class TV_ChannelClusterSuite : public TestCommand ); } case 46: { - LogStep(46, "Test 4.2 - Skip Down By 4"); + LogStep(46, "Test 5.2 - Skip Down By 5"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -4; + value.count = -5; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } case 47: { - LogStep(47, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(47, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 48: { - LogStep(48, "Test 5.1 - Start from Channel 3"); + LogStep(48, "Test 6.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61722,22 +61694,22 @@ class TV_ChannelClusterSuite : public TestCommand ); } case 49: { - LogStep(49, "Test 5.2 - Skip Down By 5"); + LogStep(49, "Test 6.2 - Skip Down By 6"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -5; + value.count = -6; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } case 50: { - LogStep(50, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(50, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 51: { - LogStep(51, "Test 6.1 - Start from Channel 3"); + LogStep(51, "Test 7.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61748,22 +61720,22 @@ class TV_ChannelClusterSuite : public TestCommand ); } case 52: { - LogStep(52, "Test 6.2 - Skip Down By 6"); + LogStep(52, "Test 7.2 - Skip Down By 7"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -6; + value.count = -7; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } case 53: { - LogStep(53, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(53, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 54: { - LogStep(54, "Test 7.1 - Start from Channel 3"); + LogStep(54, "Test 8.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61774,59 +61746,22 @@ class TV_ChannelClusterSuite : public TestCommand ); } case 55: { - LogStep(55, "Test 7.2 - Skip Down By 7"); + LogStep(55, "Test 8.2 - Skip Down By 8"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -7; + value.count = -8; return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, chip::NullOptional ); } case 56: { - LogStep(56, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); + LogStep(56, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } case 57: { - LogStep(57, "Test 8.1 - Start from Channel 3"); - ListFreer listFreer; - chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; - value.majorNumber = 9U; - value.minorNumber = 2U; - return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, - chip::NullOptional - - ); - } - case 58: { - LogStep(58, "Test 8.2 - Skip Down By 8"); - ListFreer listFreer; - chip::app::Clusters::Channel::Commands::SkipChannel::Type value; - value.count = -8; - return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::SkipChannel::Id, value, - chip::NullOptional - - ); - } - case 59: { - LogStep(59, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, - chip::NullOptional); - } - case 60: { - LogStep(60, "Test 1.1 - Start from Channel 3"); - ListFreer listFreer; - chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; - value.majorNumber = 9U; - value.minorNumber = 2U; - return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, - chip::NullOptional - - ); - } - case 61: { - LogStep(61, "Test 1.2 - Skip Up By 32,767"); + LogStep(57, "Test 1.2 - Skip Up By 32,767"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 32767; @@ -61835,13 +61770,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 62: { - LogStep(62, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + case 58: { + LogStep(58, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 63: { - LogStep(63, "Test 1.1 - Start from Channel 3"); + case 59: { + LogStep(59, "Test 1.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61851,8 +61786,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 64: { - LogStep(64, "Test 1.2 - Skip Down By 32,768"); + case 60: { + LogStep(60, "Test 1.2 - Skip Down By 32,768"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -32768; @@ -61861,8 +61796,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 65: { - LogStep(65, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + case 61: { + LogStep(61, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index f390509c5e8a3c..ebd9090296f96d 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -83586,246 +83586,230 @@ class TV_ChannelCluster : public TestCommandBridge { err = TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : Skip Channel Command\n"); - err = TestSkipChannelCommand_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : Test 1.1 - Start from Channel 3\n"); + err = TestTest11StartFromChannel3_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : Verify that Skip Channel Command set correct current channel\n"); - err = TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : Test 1.2 - Skip Up By 1\n"); + err = TestTest12SkipUpBy1_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : Test 1.1 - Start from Channel 3\n"); - err = TestTest11StartFromChannel3_12(); + ChipLogProgress( + chipTool, " ***** Test Step 12 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Test 1.2 - Skip Up By 1\n"); - err = TestTest12SkipUpBy1_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : Test 2.1 - Start from Channel 3\n"); + err = TestTest21StartFromChannel3_13(); break; case 14: - ChipLogProgress( - chipTool, " ***** Test Step 14 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : Test 2.2 - Skip Up By 2\n"); + err = TestTest22SkipUpBy2_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : Test 2.1 - Start from Channel 3\n"); - err = TestTest21StartFromChannel3_15(); + ChipLogProgress( + chipTool, " ***** Test Step 15 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_15(); break; case 16: - ChipLogProgress(chipTool, " ***** Test Step 16 : Test 2.2 - Skip Up By 2\n"); - err = TestTest22SkipUpBy2_16(); + ChipLogProgress(chipTool, " ***** Test Step 16 : Test 3.1 - Start from Channel 3\n"); + err = TestTest31StartFromChannel3_16(); break; case 17: - ChipLogProgress( - chipTool, " ***** Test Step 17 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_17(); + ChipLogProgress(chipTool, " ***** Test Step 17 : Test 3.2 - Skip Up By 3\n"); + err = TestTest32SkipUpBy3_17(); break; case 18: - ChipLogProgress(chipTool, " ***** Test Step 18 : Test 3.1 - Start from Channel 3\n"); - err = TestTest31StartFromChannel3_18(); + ChipLogProgress( + chipTool, " ***** Test Step 18 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_18(); break; case 19: - ChipLogProgress(chipTool, " ***** Test Step 19 : Test 3.2 - Skip Up By 3\n"); - err = TestTest32SkipUpBy3_19(); + ChipLogProgress(chipTool, " ***** Test Step 19 : Test 4.1 - Start from Channel 3\n"); + err = TestTest41StartFromChannel3_19(); break; case 20: - ChipLogProgress( - chipTool, " ***** Test Step 20 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_20(); + ChipLogProgress(chipTool, " ***** Test Step 20 : Test 4.2 - Skip Up By 4\n"); + err = TestTest42SkipUpBy4_20(); break; case 21: - ChipLogProgress(chipTool, " ***** Test Step 21 : Test 4.1 - Start from Channel 3\n"); - err = TestTest41StartFromChannel3_21(); + ChipLogProgress( + chipTool, " ***** Test Step 21 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_21(); break; case 22: - ChipLogProgress(chipTool, " ***** Test Step 22 : Test 4.2 - Skip Up By 4\n"); - err = TestTest42SkipUpBy4_22(); + ChipLogProgress(chipTool, " ***** Test Step 22 : Test 5.1 - Start from Channel 3\n"); + err = TestTest51StartFromChannel3_22(); break; case 23: - ChipLogProgress( - chipTool, " ***** Test Step 23 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_23(); + ChipLogProgress(chipTool, " ***** Test Step 23 : Test 5.2 - Skip Up By 5\n"); + err = TestTest52SkipUpBy5_23(); break; case 24: - ChipLogProgress(chipTool, " ***** Test Step 24 : Test 5.1 - Start from Channel 3\n"); - err = TestTest51StartFromChannel3_24(); + ChipLogProgress( + chipTool, " ***** Test Step 24 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_24(); break; case 25: - ChipLogProgress(chipTool, " ***** Test Step 25 : Test 5.2 - Skip Up By 5\n"); - err = TestTest52SkipUpBy5_25(); + ChipLogProgress(chipTool, " ***** Test Step 25 : Test 6.1 - Start from Channel 3\n"); + err = TestTest61StartFromChannel3_25(); break; case 26: - ChipLogProgress( - chipTool, " ***** Test Step 26 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_26(); + ChipLogProgress(chipTool, " ***** Test Step 26 : Test 6.2 - Skip Up By 6\n"); + err = TestTest62SkipUpBy6_26(); break; case 27: - ChipLogProgress(chipTool, " ***** Test Step 27 : Test 6.1 - Start from Channel 3\n"); - err = TestTest61StartFromChannel3_27(); + ChipLogProgress( + chipTool, " ***** Test Step 27 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : Test 6.2 - Skip Up By 6\n"); - err = TestTest62SkipUpBy6_28(); + ChipLogProgress(chipTool, " ***** Test Step 28 : Test 7.1 - Start from Channel 3\n"); + err = TestTest71StartFromChannel3_28(); break; case 29: - ChipLogProgress( - chipTool, " ***** Test Step 29 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_29(); + ChipLogProgress(chipTool, " ***** Test Step 29 : Test 7.2 - Skip Up By 7\n"); + err = TestTest72SkipUpBy7_29(); break; case 30: - ChipLogProgress(chipTool, " ***** Test Step 30 : Test 7.1 - Start from Channel 3\n"); - err = TestTest71StartFromChannel3_30(); + ChipLogProgress( + chipTool, " ***** Test Step 30 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_30(); break; case 31: - ChipLogProgress(chipTool, " ***** Test Step 31 : Test 7.2 - Skip Up By 7\n"); - err = TestTest72SkipUpBy7_31(); + ChipLogProgress(chipTool, " ***** Test Step 31 : Test 8.1 - Start from Channel 3\n"); + err = TestTest81StartFromChannel3_31(); break; case 32: - ChipLogProgress( - chipTool, " ***** Test Step 32 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_32(); + ChipLogProgress(chipTool, " ***** Test Step 32 : Test 8.2 - Skip Up By 8\n"); + err = TestTest82SkipUpBy8_32(); break; case 33: - ChipLogProgress(chipTool, " ***** Test Step 33 : Test 8.1 - Start from Channel 3\n"); - err = TestTest81StartFromChannel3_33(); + ChipLogProgress( + chipTool, " ***** Test Step 33 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_33(); break; case 34: - ChipLogProgress(chipTool, " ***** Test Step 34 : Test 8.2 - Skip Up By 8\n"); - err = TestTest82SkipUpBy8_34(); + ChipLogProgress(chipTool, " ***** Test Step 34 : Test 1.2 - Skip Down By 1\n"); + err = TestTest12SkipDownBy1_34(); break; case 35: ChipLogProgress( - chipTool, " ***** Test Step 35 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35(); + chipTool, " ***** Test Step 35 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35(); break; case 36: - ChipLogProgress(chipTool, " ***** Test Step 36 : Test 1.1 - Start from Channel 3\n"); - err = TestTest11StartFromChannel3_36(); + ChipLogProgress(chipTool, " ***** Test Step 36 : Test 2.1 - Start from Channel 3\n"); + err = TestTest21StartFromChannel3_36(); break; case 37: - ChipLogProgress(chipTool, " ***** Test Step 37 : Test 1.2 - Skip Down By 1\n"); - err = TestTest12SkipDownBy1_37(); + ChipLogProgress(chipTool, " ***** Test Step 37 : Test 2.2 - Skip Down By 2\n"); + err = TestTest22SkipDownBy2_37(); break; case 38: ChipLogProgress( - chipTool, " ***** Test Step 38 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38(); + chipTool, " ***** Test Step 38 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38(); break; case 39: - ChipLogProgress(chipTool, " ***** Test Step 39 : Test 2.1 - Start from Channel 3\n"); - err = TestTest21StartFromChannel3_39(); + ChipLogProgress(chipTool, " ***** Test Step 39 : Test 3.1 - Start from Channel 3\n"); + err = TestTest31StartFromChannel3_39(); break; case 40: - ChipLogProgress(chipTool, " ***** Test Step 40 : Test 2.2 - Skip Down By 2\n"); - err = TestTest22SkipDownBy2_40(); + ChipLogProgress(chipTool, " ***** Test Step 40 : Test 3.2 - Skip Down By 3\n"); + err = TestTest32SkipDownBy3_40(); break; case 41: ChipLogProgress( - chipTool, " ***** Test Step 41 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41(); + chipTool, " ***** Test Step 41 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41(); break; case 42: - ChipLogProgress(chipTool, " ***** Test Step 42 : Test 3.1 - Start from Channel 3\n"); - err = TestTest31StartFromChannel3_42(); + ChipLogProgress(chipTool, " ***** Test Step 42 : Test 4.1 - Start from Channel 3\n"); + err = TestTest41StartFromChannel3_42(); break; case 43: - ChipLogProgress(chipTool, " ***** Test Step 43 : Test 3.2 - Skip Down By 3\n"); - err = TestTest32SkipDownBy3_43(); + ChipLogProgress(chipTool, " ***** Test Step 43 : Test 4.2 - Skip Down By 4\n"); + err = TestTest42SkipDownBy4_43(); break; case 44: ChipLogProgress( - chipTool, " ***** Test Step 44 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44(); + chipTool, " ***** Test Step 44 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44(); break; case 45: - ChipLogProgress(chipTool, " ***** Test Step 45 : Test 4.1 - Start from Channel 3\n"); - err = TestTest41StartFromChannel3_45(); + ChipLogProgress(chipTool, " ***** Test Step 45 : Test 5.1 - Start from Channel 3\n"); + err = TestTest51StartFromChannel3_45(); break; case 46: - ChipLogProgress(chipTool, " ***** Test Step 46 : Test 4.2 - Skip Down By 4\n"); - err = TestTest42SkipDownBy4_46(); + ChipLogProgress(chipTool, " ***** Test Step 46 : Test 5.2 - Skip Down By 5\n"); + err = TestTest52SkipDownBy5_46(); break; case 47: ChipLogProgress( - chipTool, " ***** Test Step 47 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47(); + chipTool, " ***** Test Step 47 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47(); break; case 48: - ChipLogProgress(chipTool, " ***** Test Step 48 : Test 5.1 - Start from Channel 3\n"); - err = TestTest51StartFromChannel3_48(); + ChipLogProgress(chipTool, " ***** Test Step 48 : Test 6.1 - Start from Channel 3\n"); + err = TestTest61StartFromChannel3_48(); break; case 49: - ChipLogProgress(chipTool, " ***** Test Step 49 : Test 5.2 - Skip Down By 5\n"); - err = TestTest52SkipDownBy5_49(); + ChipLogProgress(chipTool, " ***** Test Step 49 : Test 6.2 - Skip Down By 6\n"); + err = TestTest62SkipDownBy6_49(); break; case 50: ChipLogProgress( - chipTool, " ***** Test Step 50 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50(); + chipTool, " ***** Test Step 50 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50(); break; case 51: - ChipLogProgress(chipTool, " ***** Test Step 51 : Test 6.1 - Start from Channel 3\n"); - err = TestTest61StartFromChannel3_51(); + ChipLogProgress(chipTool, " ***** Test Step 51 : Test 7.1 - Start from Channel 3\n"); + err = TestTest71StartFromChannel3_51(); break; case 52: - ChipLogProgress(chipTool, " ***** Test Step 52 : Test 6.2 - Skip Down By 6\n"); - err = TestTest62SkipDownBy6_52(); + ChipLogProgress(chipTool, " ***** Test Step 52 : Test 7.2 - Skip Down By 7\n"); + err = TestTest72SkipDownBy7_52(); break; case 53: ChipLogProgress( - chipTool, " ***** Test Step 53 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53(); + chipTool, " ***** Test Step 53 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53(); break; case 54: - ChipLogProgress(chipTool, " ***** Test Step 54 : Test 7.1 - Start from Channel 3\n"); - err = TestTest71StartFromChannel3_54(); + ChipLogProgress(chipTool, " ***** Test Step 54 : Test 8.1 - Start from Channel 3\n"); + err = TestTest81StartFromChannel3_54(); break; case 55: - ChipLogProgress(chipTool, " ***** Test Step 55 : Test 7.2 - Skip Down By 7\n"); - err = TestTest72SkipDownBy7_55(); + ChipLogProgress(chipTool, " ***** Test Step 55 : Test 8.2 - Skip Down By 8\n"); + err = TestTest82SkipDownBy8_55(); break; case 56: ChipLogProgress( - chipTool, " ***** Test Step 56 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56(); + chipTool, " ***** Test Step 56 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56(); break; case 57: - ChipLogProgress(chipTool, " ***** Test Step 57 : Test 8.1 - Start from Channel 3\n"); - err = TestTest81StartFromChannel3_57(); + ChipLogProgress(chipTool, " ***** Test Step 57 : Test 1.2 - Skip Up By 32,767\n"); + err = TestTest12SkipUpBy32767_57(); break; case 58: - ChipLogProgress(chipTool, " ***** Test Step 58 : Test 8.2 - Skip Down By 8\n"); - err = TestTest82SkipDownBy8_58(); + ChipLogProgress( + chipTool, " ***** Test Step 58 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_58(); break; case 59: - ChipLogProgress( - chipTool, " ***** Test Step 59 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_59(); + ChipLogProgress(chipTool, " ***** Test Step 59 : Test 1.1 - Start from Channel 3\n"); + err = TestTest11StartFromChannel3_59(); break; case 60: - ChipLogProgress(chipTool, " ***** Test Step 60 : Test 1.1 - Start from Channel 3\n"); - err = TestTest11StartFromChannel3_60(); + ChipLogProgress(chipTool, " ***** Test Step 60 : Test 1.2 - Skip Down By 32,768\n"); + err = TestTest12SkipDownBy32768_60(); break; case 61: - ChipLogProgress(chipTool, " ***** Test Step 61 : Test 1.2 - Skip Up By 32,767\n"); - err = TestTest12SkipUpBy32767_61(); - break; - case 62: - ChipLogProgress( - chipTool, " ***** Test Step 62 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_62(); - break; - case 63: - ChipLogProgress(chipTool, " ***** Test Step 63 : Test 1.1 - Start from Channel 3\n"); - err = TestTest11StartFromChannel3_63(); - break; - case 64: - ChipLogProgress(chipTool, " ***** Test Step 64 : Test 1.2 - Skip Down By 32,768\n"); - err = TestTest12SkipDownBy32768_64(); - break; - case 65: ChipLogProgress( - chipTool, " ***** Test Step 65 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_65(); + chipTool, " ***** Test Step 61 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_61(); break; } @@ -84024,18 +84008,6 @@ class TV_ChannelCluster : public TestCommandBridge { case 61: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 62: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 63: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 64: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 65: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; } // Go on to the next test. @@ -84049,7 +84021,7 @@ class TV_ChannelCluster : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 66; + const uint16_t mTestCount = 62; chip::Optional mNodeId; chip::Optional mCluster; @@ -84337,59 +84309,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestSkipChannelCommand_10() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - __auto_type * params = [[MTRChannelClusterSkipChannelParams alloc] init]; - params.count = [NSNumber numberWithShort:-123]; - [cluster skipChannelWithParams:params - completion:^(NSError * _Nullable err) { - NSLog(@"Skip Channel Command Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestVerifyThatSkipChannelCommandSetCorrectCurrentChannel_11() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeCurrentChannelWithCompletion:^( - MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable err) { - NSLog(@"Verify that Skip Channel Command set correct current channel Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - { - id actualValue = value; - VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue)); - VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber, 9U)); - VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber, 2U)); - VerifyOrReturn(CheckValueAsString("Name", ((MTRChannelClusterChannelInfoStruct *) actualValue).name, @"PBS Kids")); - VerifyOrReturn( - CheckValueAsString("CallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).callSign, @"KCTS-TV")); - VerifyOrReturn(CheckValueAsString( - "AffiliateCallSign", ((MTRChannelClusterChannelInfoStruct *) actualValue).affiliateCallSign, @"KCTS")); - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestTest11StartFromChannel3_12() + CHIP_ERROR TestTest11StartFromChannel3_10() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84411,7 +84331,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest12SkipUpBy1_13() + CHIP_ERROR TestTest12SkipUpBy1_11() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84432,7 +84352,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_14() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_12() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84464,7 +84384,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest21StartFromChannel3_15() + CHIP_ERROR TestTest21StartFromChannel3_13() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84486,7 +84406,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest22SkipUpBy2_16() + CHIP_ERROR TestTest22SkipUpBy2_14() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84507,7 +84427,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_17() + CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_15() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84538,7 +84458,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest31StartFromChannel3_18() + CHIP_ERROR TestTest31StartFromChannel3_16() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84560,7 +84480,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest32SkipUpBy3_19() + CHIP_ERROR TestTest32SkipUpBy3_17() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84581,7 +84501,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_20() + CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_18() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84612,7 +84532,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest41StartFromChannel3_21() + CHIP_ERROR TestTest41StartFromChannel3_19() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84634,7 +84554,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest42SkipUpBy4_22() + CHIP_ERROR TestTest42SkipUpBy4_20() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84655,7 +84575,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_23() + CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_21() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84686,7 +84606,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest51StartFromChannel3_24() + CHIP_ERROR TestTest51StartFromChannel3_22() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84708,7 +84628,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest52SkipUpBy5_25() + CHIP_ERROR TestTest52SkipUpBy5_23() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84729,7 +84649,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_26() + CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_24() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84761,7 +84681,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest61StartFromChannel3_27() + CHIP_ERROR TestTest61StartFromChannel3_25() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84783,7 +84703,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest62SkipUpBy6_28() + CHIP_ERROR TestTest62SkipUpBy6_26() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84804,7 +84724,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_29() + CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_27() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84835,7 +84755,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest71StartFromChannel3_30() + CHIP_ERROR TestTest71StartFromChannel3_28() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84857,7 +84777,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest72SkipUpBy7_31() + CHIP_ERROR TestTest72SkipUpBy7_29() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84878,7 +84798,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_32() + CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_30() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84909,7 +84829,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest81StartFromChannel3_33() + CHIP_ERROR TestTest81StartFromChannel3_31() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84931,7 +84851,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest82SkipUpBy8_34() + CHIP_ERROR TestTest82SkipUpBy8_32() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84952,7 +84872,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35() + CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_33() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84983,29 +84903,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest11StartFromChannel3_36() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; - params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; - params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; - [cluster changeChannelByNumberWithParams:params - completion:^(NSError * _Nullable err) { - NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestTest12SkipDownBy1_37() + CHIP_ERROR TestTest12SkipDownBy1_34() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85026,7 +84924,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85057,7 +84955,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest21StartFromChannel3_39() + CHIP_ERROR TestTest21StartFromChannel3_36() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85079,7 +84977,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest22SkipDownBy2_40() + CHIP_ERROR TestTest22SkipDownBy2_37() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85100,7 +84998,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41() + CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85131,7 +85029,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest31StartFromChannel3_42() + CHIP_ERROR TestTest31StartFromChannel3_39() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85153,7 +85051,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest32SkipDownBy3_43() + CHIP_ERROR TestTest32SkipDownBy3_40() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85174,7 +85072,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44() + CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85206,7 +85104,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest41StartFromChannel3_45() + CHIP_ERROR TestTest41StartFromChannel3_42() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85228,7 +85126,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest42SkipDownBy4_46() + CHIP_ERROR TestTest42SkipDownBy4_43() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85249,7 +85147,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47() + CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85280,7 +85178,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest51StartFromChannel3_48() + CHIP_ERROR TestTest51StartFromChannel3_45() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85302,7 +85200,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest52SkipDownBy5_49() + CHIP_ERROR TestTest52SkipDownBy5_46() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85323,7 +85221,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50() + CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85354,7 +85252,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest61StartFromChannel3_51() + CHIP_ERROR TestTest61StartFromChannel3_48() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85376,7 +85274,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest62SkipDownBy6_52() + CHIP_ERROR TestTest62SkipDownBy6_49() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85397,7 +85295,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53() + CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85428,7 +85326,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest71StartFromChannel3_54() + CHIP_ERROR TestTest71StartFromChannel3_51() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85450,7 +85348,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest72SkipDownBy7_55() + CHIP_ERROR TestTest72SkipDownBy7_52() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85471,7 +85369,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56() + CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85503,7 +85401,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest81StartFromChannel3_57() + CHIP_ERROR TestTest81StartFromChannel3_54() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85525,7 +85423,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest82SkipDownBy8_58() + CHIP_ERROR TestTest82SkipDownBy8_55() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85546,7 +85444,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_59() + CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85577,29 +85475,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest11StartFromChannel3_60() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; - params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; - params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; - [cluster changeChannelByNumberWithParams:params - completion:^(NSError * _Nullable err) { - NSLog(@"Test 1.1 - Start from Channel 3 Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestTest12SkipUpBy32767_61() + CHIP_ERROR TestTest12SkipUpBy32767_57() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85620,7 +85496,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_62() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_58() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85651,7 +85527,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest11StartFromChannel3_63() + CHIP_ERROR TestTest11StartFromChannel3_59() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85673,7 +85549,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest12SkipDownBy32768_64() + CHIP_ERROR TestTest12SkipDownBy32768_60() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85694,7 +85570,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_65() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_61() { MTRBaseDevice * device = GetDevice("alpha"); From 30ff9f0f200491c3745d1269a11be86ac5f02e0a Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Wed, 17 May 2023 22:21:14 +0200 Subject: [PATCH 18/23] Update test & suggestion by Boris --- .../linux/include/channel/ChannelManager.cpp | 5 +- src/app/tests/suites/TV_ChannelCluster.yaml | 18 - .../chip-tool/zap-generated/test/Commands.h | 252 +++++++------- .../zap-generated/test/Commands.h | 312 +++++++----------- 4 files changed, 242 insertions(+), 345 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 7671a47fb742a6..942b2aae903775 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -119,8 +119,9 @@ void ChannelManager::HandleChangeChannel(CommandResponseHelper value; @@ -60948,13 +60945,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 25: + case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 26: + case 25: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 27: + case 26: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60973,13 +60970,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); } break; - case 28: + case 27: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 29: + case 28: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 30: + case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -60998,13 +60995,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 31: + case 30: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 32: + case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 33: + case 32: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61023,10 +61020,10 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 34: + case 33: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 35: + case 34: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61045,13 +61042,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 36: + case 35: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 37: + case 36: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 38: + case 37: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61070,13 +61067,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); } break; - case 39: + case 38: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 40: + case 39: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 41: + case 40: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61095,13 +61092,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 42: + case 41: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 43: + case 42: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 44: + case 43: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61120,13 +61117,10 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 45: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 46: + case 44: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 47: + case 45: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61145,13 +61139,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 48: + case 46: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 49: + case 47: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 50: + case 48: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61170,13 +61164,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KAAL", 4))); } break; - case 51: + case 49: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 52: + case 50: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 53: + case 51: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61195,13 +61189,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 54: + case 52: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 55: + case 53: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 56: + case 54: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61220,10 +61214,10 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 57: + case 55: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 58: + case 56: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61242,13 +61236,13 @@ class TV_ChannelClusterSuite : public TestCommand value.Value().affiliateCallSign.Value(), chip::CharSpan("KCTS", 4))); } break; - case 59: + case 57: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 60: + case 58: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 61: + case 59: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -61460,18 +61454,7 @@ class TV_ChannelClusterSuite : public TestCommand chip::NullOptional); } case 22: { - LogStep(22, "Test 5.1 - Start from Channel 3"); - ListFreer listFreer; - chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; - value.majorNumber = 9U; - value.minorNumber = 2U; - return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, - chip::NullOptional - - ); - } - case 23: { - LogStep(23, "Test 5.2 - Skip Up By 5"); + LogStep(22, "Test 5.2 - Skip Up By 5"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 5; @@ -61480,13 +61463,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 24: { - LogStep(24, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); + case 23: { + LogStep(23, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 25: { - LogStep(25, "Test 6.1 - Start from Channel 3"); + case 24: { + LogStep(24, "Test 6.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61496,8 +61479,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 26: { - LogStep(26, "Test 6.2 - Skip Up By 6"); + case 25: { + LogStep(25, "Test 6.2 - Skip Up By 6"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 6; @@ -61506,13 +61489,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 27: { - LogStep(27, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); + case 26: { + LogStep(26, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 28: { - LogStep(28, "Test 7.1 - Start from Channel 3"); + case 27: { + LogStep(27, "Test 7.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61522,8 +61505,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 29: { - LogStep(29, "Test 7.2 - Skip Up By 7"); + case 28: { + LogStep(28, "Test 7.2 - Skip Up By 7"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 7; @@ -61532,13 +61515,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 30: { - LogStep(30, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); + case 29: { + LogStep(29, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 31: { - LogStep(31, "Test 8.1 - Start from Channel 3"); + case 30: { + LogStep(30, "Test 8.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61548,8 +61531,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 32: { - LogStep(32, "Test 8.2 - Skip Up By 8"); + case 31: { + LogStep(31, "Test 8.2 - Skip Up By 8"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 8; @@ -61558,13 +61541,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 33: { - LogStep(33, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); + case 32: { + LogStep(32, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 34: { - LogStep(34, "Test 1.2 - Skip Down By 1"); + case 33: { + LogStep(33, "Test 1.2 - Skip Down By 1"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -1; @@ -61573,13 +61556,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 35: { - LogStep(35, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + case 34: { + LogStep(34, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 36: { - LogStep(36, "Test 2.1 - Start from Channel 3"); + case 35: { + LogStep(35, "Test 2.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61589,8 +61572,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 37: { - LogStep(37, "Test 2.2 - Skip Down By 2"); + case 36: { + LogStep(36, "Test 2.2 - Skip Down By 2"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -2; @@ -61599,13 +61582,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 38: { - LogStep(38, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); + case 37: { + LogStep(37, "Test 2.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 39: { - LogStep(39, "Test 3.1 - Start from Channel 3"); + case 38: { + LogStep(38, "Test 3.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61615,8 +61598,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 40: { - LogStep(40, "Test 3.2 - Skip Down By 3"); + case 39: { + LogStep(39, "Test 3.2 - Skip Down By 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -3; @@ -61625,13 +61608,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 41: { - LogStep(41, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); + case 40: { + LogStep(40, "Test 3.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 42: { - LogStep(42, "Test 4.1 - Start from Channel 3"); + case 41: { + LogStep(41, "Test 4.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61641,8 +61624,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 43: { - LogStep(43, "Test 4.2 - Skip Down By 4"); + case 42: { + LogStep(42, "Test 4.2 - Skip Down By 4"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -4; @@ -61651,24 +61634,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 44: { - LogStep(44, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); + case 43: { + LogStep(43, "Test 4.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 45: { - LogStep(45, "Test 5.1 - Start from Channel 3"); - ListFreer listFreer; - chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; - value.majorNumber = 9U; - value.minorNumber = 2U; - return SendCommand(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Commands::ChangeChannelByNumber::Id, value, - chip::NullOptional - - ); - } - case 46: { - LogStep(46, "Test 5.2 - Skip Down By 5"); + case 44: { + LogStep(44, "Test 5.2 - Skip Down By 5"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -5; @@ -61677,13 +61649,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 47: { - LogStep(47, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); + case 45: { + LogStep(45, "Test 5.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 48: { - LogStep(48, "Test 6.1 - Start from Channel 3"); + case 46: { + LogStep(46, "Test 6.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61693,8 +61665,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 49: { - LogStep(49, "Test 6.2 - Skip Down By 6"); + case 47: { + LogStep(47, "Test 6.2 - Skip Down By 6"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -6; @@ -61703,13 +61675,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 50: { - LogStep(50, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); + case 48: { + LogStep(48, "Test 6.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 51: { - LogStep(51, "Test 7.1 - Start from Channel 3"); + case 49: { + LogStep(49, "Test 7.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61719,8 +61691,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 52: { - LogStep(52, "Test 7.2 - Skip Down By 7"); + case 50: { + LogStep(50, "Test 7.2 - Skip Down By 7"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -7; @@ -61729,13 +61701,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 53: { - LogStep(53, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); + case 51: { + LogStep(51, "Test 7.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 54: { - LogStep(54, "Test 8.1 - Start from Channel 3"); + case 52: { + LogStep(52, "Test 8.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61745,8 +61717,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 55: { - LogStep(55, "Test 8.2 - Skip Down By 8"); + case 53: { + LogStep(53, "Test 8.2 - Skip Down By 8"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -8; @@ -61755,13 +61727,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 56: { - LogStep(56, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); + case 54: { + LogStep(54, "Test 8.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 57: { - LogStep(57, "Test 1.2 - Skip Up By 32,767"); + case 55: { + LogStep(55, "Test 1.2 - Skip Up By 32,767"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = 32767; @@ -61770,13 +61742,13 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 58: { - LogStep(58, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + case 56: { + LogStep(56, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } - case 59: { - LogStep(59, "Test 1.1 - Start from Channel 3"); + case 57: { + LogStep(57, "Test 1.1 - Start from Channel 3"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type value; value.majorNumber = 9U; @@ -61786,8 +61758,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 60: { - LogStep(60, "Test 1.2 - Skip Down By 32,768"); + case 58: { + LogStep(58, "Test 1.2 - Skip Down By 32,768"); ListFreer listFreer; chip::app::Clusters::Channel::Commands::SkipChannel::Type value; value.count = -32768; @@ -61796,8 +61768,8 @@ class TV_ChannelClusterSuite : public TestCommand ); } - case 61: { - LogStep(61, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); + case 59: { + LogStep(59, "Test 1.3 - Verify that Skip Channel Command set correct current channel"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Channel::Id, Channel::Attributes::CurrentChannel::Id, true, chip::NullOptional); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index ebd9090296f96d..39eb96909bb5de 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -83638,178 +83638,170 @@ class TV_ChannelCluster : public TestCommandBridge { err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_21(); break; case 22: - ChipLogProgress(chipTool, " ***** Test Step 22 : Test 5.1 - Start from Channel 3\n"); - err = TestTest51StartFromChannel3_22(); + ChipLogProgress(chipTool, " ***** Test Step 22 : Test 5.2 - Skip Up By 5\n"); + err = TestTest52SkipUpBy5_22(); break; case 23: - ChipLogProgress(chipTool, " ***** Test Step 23 : Test 5.2 - Skip Up By 5\n"); - err = TestTest52SkipUpBy5_23(); + ChipLogProgress( + chipTool, " ***** Test Step 23 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_23(); break; case 24: - ChipLogProgress( - chipTool, " ***** Test Step 24 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_24(); + ChipLogProgress(chipTool, " ***** Test Step 24 : Test 6.1 - Start from Channel 3\n"); + err = TestTest61StartFromChannel3_24(); break; case 25: - ChipLogProgress(chipTool, " ***** Test Step 25 : Test 6.1 - Start from Channel 3\n"); - err = TestTest61StartFromChannel3_25(); + ChipLogProgress(chipTool, " ***** Test Step 25 : Test 6.2 - Skip Up By 6\n"); + err = TestTest62SkipUpBy6_25(); break; case 26: - ChipLogProgress(chipTool, " ***** Test Step 26 : Test 6.2 - Skip Up By 6\n"); - err = TestTest62SkipUpBy6_26(); + ChipLogProgress( + chipTool, " ***** Test Step 26 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_26(); break; case 27: - ChipLogProgress( - chipTool, " ***** Test Step 27 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_27(); + ChipLogProgress(chipTool, " ***** Test Step 27 : Test 7.1 - Start from Channel 3\n"); + err = TestTest71StartFromChannel3_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : Test 7.1 - Start from Channel 3\n"); - err = TestTest71StartFromChannel3_28(); + ChipLogProgress(chipTool, " ***** Test Step 28 : Test 7.2 - Skip Up By 7\n"); + err = TestTest72SkipUpBy7_28(); break; case 29: - ChipLogProgress(chipTool, " ***** Test Step 29 : Test 7.2 - Skip Up By 7\n"); - err = TestTest72SkipUpBy7_29(); + ChipLogProgress( + chipTool, " ***** Test Step 29 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_29(); break; case 30: - ChipLogProgress( - chipTool, " ***** Test Step 30 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_30(); + ChipLogProgress(chipTool, " ***** Test Step 30 : Test 8.1 - Start from Channel 3\n"); + err = TestTest81StartFromChannel3_30(); break; case 31: - ChipLogProgress(chipTool, " ***** Test Step 31 : Test 8.1 - Start from Channel 3\n"); - err = TestTest81StartFromChannel3_31(); + ChipLogProgress(chipTool, " ***** Test Step 31 : Test 8.2 - Skip Up By 8\n"); + err = TestTest82SkipUpBy8_31(); break; case 32: - ChipLogProgress(chipTool, " ***** Test Step 32 : Test 8.2 - Skip Up By 8\n"); - err = TestTest82SkipUpBy8_32(); + ChipLogProgress( + chipTool, " ***** Test Step 32 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_32(); break; case 33: - ChipLogProgress( - chipTool, " ***** Test Step 33 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_33(); + ChipLogProgress(chipTool, " ***** Test Step 33 : Test 1.2 - Skip Down By 1\n"); + err = TestTest12SkipDownBy1_33(); break; case 34: - ChipLogProgress(chipTool, " ***** Test Step 34 : Test 1.2 - Skip Down By 1\n"); - err = TestTest12SkipDownBy1_34(); + ChipLogProgress( + chipTool, " ***** Test Step 34 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_34(); break; case 35: - ChipLogProgress( - chipTool, " ***** Test Step 35 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35(); + ChipLogProgress(chipTool, " ***** Test Step 35 : Test 2.1 - Start from Channel 3\n"); + err = TestTest21StartFromChannel3_35(); break; case 36: - ChipLogProgress(chipTool, " ***** Test Step 36 : Test 2.1 - Start from Channel 3\n"); - err = TestTest21StartFromChannel3_36(); + ChipLogProgress(chipTool, " ***** Test Step 36 : Test 2.2 - Skip Down By 2\n"); + err = TestTest22SkipDownBy2_36(); break; case 37: - ChipLogProgress(chipTool, " ***** Test Step 37 : Test 2.2 - Skip Down By 2\n"); - err = TestTest22SkipDownBy2_37(); + ChipLogProgress( + chipTool, " ***** Test Step 37 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_37(); break; case 38: - ChipLogProgress( - chipTool, " ***** Test Step 38 : Test 2.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38(); + ChipLogProgress(chipTool, " ***** Test Step 38 : Test 3.1 - Start from Channel 3\n"); + err = TestTest31StartFromChannel3_38(); break; case 39: - ChipLogProgress(chipTool, " ***** Test Step 39 : Test 3.1 - Start from Channel 3\n"); - err = TestTest31StartFromChannel3_39(); + ChipLogProgress(chipTool, " ***** Test Step 39 : Test 3.2 - Skip Down By 3\n"); + err = TestTest32SkipDownBy3_39(); break; case 40: - ChipLogProgress(chipTool, " ***** Test Step 40 : Test 3.2 - Skip Down By 3\n"); - err = TestTest32SkipDownBy3_40(); + ChipLogProgress( + chipTool, " ***** Test Step 40 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_40(); break; case 41: - ChipLogProgress( - chipTool, " ***** Test Step 41 : Test 3.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41(); + ChipLogProgress(chipTool, " ***** Test Step 41 : Test 4.1 - Start from Channel 3\n"); + err = TestTest41StartFromChannel3_41(); break; case 42: - ChipLogProgress(chipTool, " ***** Test Step 42 : Test 4.1 - Start from Channel 3\n"); - err = TestTest41StartFromChannel3_42(); + ChipLogProgress(chipTool, " ***** Test Step 42 : Test 4.2 - Skip Down By 4\n"); + err = TestTest42SkipDownBy4_42(); break; case 43: - ChipLogProgress(chipTool, " ***** Test Step 43 : Test 4.2 - Skip Down By 4\n"); - err = TestTest42SkipDownBy4_43(); + ChipLogProgress( + chipTool, " ***** Test Step 43 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_43(); break; case 44: - ChipLogProgress( - chipTool, " ***** Test Step 44 : Test 4.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44(); + ChipLogProgress(chipTool, " ***** Test Step 44 : Test 5.2 - Skip Down By 5\n"); + err = TestTest52SkipDownBy5_44(); break; case 45: - ChipLogProgress(chipTool, " ***** Test Step 45 : Test 5.1 - Start from Channel 3\n"); - err = TestTest51StartFromChannel3_45(); + ChipLogProgress( + chipTool, " ***** Test Step 45 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_45(); break; case 46: - ChipLogProgress(chipTool, " ***** Test Step 46 : Test 5.2 - Skip Down By 5\n"); - err = TestTest52SkipDownBy5_46(); + ChipLogProgress(chipTool, " ***** Test Step 46 : Test 6.1 - Start from Channel 3\n"); + err = TestTest61StartFromChannel3_46(); break; case 47: - ChipLogProgress( - chipTool, " ***** Test Step 47 : Test 5.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47(); + ChipLogProgress(chipTool, " ***** Test Step 47 : Test 6.2 - Skip Down By 6\n"); + err = TestTest62SkipDownBy6_47(); break; case 48: - ChipLogProgress(chipTool, " ***** Test Step 48 : Test 6.1 - Start from Channel 3\n"); - err = TestTest61StartFromChannel3_48(); + ChipLogProgress( + chipTool, " ***** Test Step 48 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_48(); break; case 49: - ChipLogProgress(chipTool, " ***** Test Step 49 : Test 6.2 - Skip Down By 6\n"); - err = TestTest62SkipDownBy6_49(); + ChipLogProgress(chipTool, " ***** Test Step 49 : Test 7.1 - Start from Channel 3\n"); + err = TestTest71StartFromChannel3_49(); break; case 50: - ChipLogProgress( - chipTool, " ***** Test Step 50 : Test 6.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50(); + ChipLogProgress(chipTool, " ***** Test Step 50 : Test 7.2 - Skip Down By 7\n"); + err = TestTest72SkipDownBy7_50(); break; case 51: - ChipLogProgress(chipTool, " ***** Test Step 51 : Test 7.1 - Start from Channel 3\n"); - err = TestTest71StartFromChannel3_51(); + ChipLogProgress( + chipTool, " ***** Test Step 51 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_51(); break; case 52: - ChipLogProgress(chipTool, " ***** Test Step 52 : Test 7.2 - Skip Down By 7\n"); - err = TestTest72SkipDownBy7_52(); + ChipLogProgress(chipTool, " ***** Test Step 52 : Test 8.1 - Start from Channel 3\n"); + err = TestTest81StartFromChannel3_52(); break; case 53: - ChipLogProgress( - chipTool, " ***** Test Step 53 : Test 7.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53(); + ChipLogProgress(chipTool, " ***** Test Step 53 : Test 8.2 - Skip Down By 8\n"); + err = TestTest82SkipDownBy8_53(); break; case 54: - ChipLogProgress(chipTool, " ***** Test Step 54 : Test 8.1 - Start from Channel 3\n"); - err = TestTest81StartFromChannel3_54(); + ChipLogProgress( + chipTool, " ***** Test Step 54 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_54(); break; case 55: - ChipLogProgress(chipTool, " ***** Test Step 55 : Test 8.2 - Skip Down By 8\n"); - err = TestTest82SkipDownBy8_55(); + ChipLogProgress(chipTool, " ***** Test Step 55 : Test 1.2 - Skip Up By 32,767\n"); + err = TestTest12SkipUpBy32767_55(); break; case 56: ChipLogProgress( - chipTool, " ***** Test Step 56 : Test 8.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56(); + chipTool, " ***** Test Step 56 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56(); break; case 57: - ChipLogProgress(chipTool, " ***** Test Step 57 : Test 1.2 - Skip Up By 32,767\n"); - err = TestTest12SkipUpBy32767_57(); + ChipLogProgress(chipTool, " ***** Test Step 57 : Test 1.1 - Start from Channel 3\n"); + err = TestTest11StartFromChannel3_57(); break; case 58: - ChipLogProgress( - chipTool, " ***** Test Step 58 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_58(); + ChipLogProgress(chipTool, " ***** Test Step 58 : Test 1.2 - Skip Down By 32,768\n"); + err = TestTest12SkipDownBy32768_58(); break; case 59: - ChipLogProgress(chipTool, " ***** Test Step 59 : Test 1.1 - Start from Channel 3\n"); - err = TestTest11StartFromChannel3_59(); - break; - case 60: - ChipLogProgress(chipTool, " ***** Test Step 60 : Test 1.2 - Skip Down By 32,768\n"); - err = TestTest12SkipDownBy32768_60(); - break; - case 61: ChipLogProgress( - chipTool, " ***** Test Step 61 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); - err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_61(); + chipTool, " ***** Test Step 59 : Test 1.3 - Verify that Skip Channel Command set correct current channel\n"); + err = TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_59(); break; } @@ -84002,12 +83994,6 @@ class TV_ChannelCluster : public TestCommandBridge { case 59: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 60: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 61: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; } // Go on to the next test. @@ -84021,7 +84007,7 @@ class TV_ChannelCluster : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 62; + const uint16_t mTestCount = 60; chip::Optional mNodeId; chip::Optional mCluster; @@ -84606,29 +84592,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest51StartFromChannel3_22() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; - params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; - params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; - [cluster changeChannelByNumberWithParams:params - completion:^(NSError * _Nullable err) { - NSLog(@"Test 5.1 - Start from Channel 3 Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestTest52SkipUpBy5_23() + CHIP_ERROR TestTest52SkipUpBy5_22() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84649,7 +84613,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_24() + CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_23() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84681,7 +84645,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest61StartFromChannel3_25() + CHIP_ERROR TestTest61StartFromChannel3_24() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84703,7 +84667,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest62SkipUpBy6_26() + CHIP_ERROR TestTest62SkipUpBy6_25() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84724,7 +84688,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_27() + CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_26() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84755,7 +84719,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest71StartFromChannel3_28() + CHIP_ERROR TestTest71StartFromChannel3_27() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84777,7 +84741,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest72SkipUpBy7_29() + CHIP_ERROR TestTest72SkipUpBy7_28() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84798,7 +84762,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_30() + CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_29() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84829,7 +84793,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest81StartFromChannel3_31() + CHIP_ERROR TestTest81StartFromChannel3_30() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84851,7 +84815,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest82SkipUpBy8_32() + CHIP_ERROR TestTest82SkipUpBy8_31() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84872,7 +84836,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_33() + CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_32() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84903,7 +84867,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest12SkipDownBy1_34() + CHIP_ERROR TestTest12SkipDownBy1_33() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84924,7 +84888,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_35() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_34() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84955,7 +84919,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest21StartFromChannel3_36() + CHIP_ERROR TestTest21StartFromChannel3_35() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84977,7 +84941,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest22SkipDownBy2_37() + CHIP_ERROR TestTest22SkipDownBy2_36() { MTRBaseDevice * device = GetDevice("alpha"); @@ -84998,7 +84962,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_38() + CHIP_ERROR TestTest23VerifyThatSkipChannelCommandSetCorrectCurrentChannel_37() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85029,7 +84993,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest31StartFromChannel3_39() + CHIP_ERROR TestTest31StartFromChannel3_38() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85051,7 +85015,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest32SkipDownBy3_40() + CHIP_ERROR TestTest32SkipDownBy3_39() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85072,7 +85036,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_41() + CHIP_ERROR TestTest33VerifyThatSkipChannelCommandSetCorrectCurrentChannel_40() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85104,7 +85068,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest41StartFromChannel3_42() + CHIP_ERROR TestTest41StartFromChannel3_41() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85126,7 +85090,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest42SkipDownBy4_43() + CHIP_ERROR TestTest42SkipDownBy4_42() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85147,7 +85111,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_44() + CHIP_ERROR TestTest43VerifyThatSkipChannelCommandSetCorrectCurrentChannel_43() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85178,29 +85142,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest51StartFromChannel3_45() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - __auto_type * params = [[MTRChannelClusterChangeChannelByNumberParams alloc] init]; - params.majorNumber = [NSNumber numberWithUnsignedShort:9U]; - params.minorNumber = [NSNumber numberWithUnsignedShort:2U]; - [cluster changeChannelByNumberWithParams:params - completion:^(NSError * _Nullable err) { - NSLog(@"Test 5.1 - Start from Channel 3 Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestTest52SkipDownBy5_46() + CHIP_ERROR TestTest52SkipDownBy5_44() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85221,7 +85163,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_47() + CHIP_ERROR TestTest53VerifyThatSkipChannelCommandSetCorrectCurrentChannel_45() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85252,7 +85194,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest61StartFromChannel3_48() + CHIP_ERROR TestTest61StartFromChannel3_46() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85274,7 +85216,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest62SkipDownBy6_49() + CHIP_ERROR TestTest62SkipDownBy6_47() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85295,7 +85237,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_50() + CHIP_ERROR TestTest63VerifyThatSkipChannelCommandSetCorrectCurrentChannel_48() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85326,7 +85268,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest71StartFromChannel3_51() + CHIP_ERROR TestTest71StartFromChannel3_49() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85348,7 +85290,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest72SkipDownBy7_52() + CHIP_ERROR TestTest72SkipDownBy7_50() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85369,7 +85311,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_53() + CHIP_ERROR TestTest73VerifyThatSkipChannelCommandSetCorrectCurrentChannel_51() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85401,7 +85343,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest81StartFromChannel3_54() + CHIP_ERROR TestTest81StartFromChannel3_52() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85423,7 +85365,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest82SkipDownBy8_55() + CHIP_ERROR TestTest82SkipDownBy8_53() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85444,7 +85386,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56() + CHIP_ERROR TestTest83VerifyThatSkipChannelCommandSetCorrectCurrentChannel_54() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85475,7 +85417,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest12SkipUpBy32767_57() + CHIP_ERROR TestTest12SkipUpBy32767_55() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85496,7 +85438,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_58() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_56() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85527,7 +85469,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest11StartFromChannel3_59() + CHIP_ERROR TestTest11StartFromChannel3_57() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85549,7 +85491,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest12SkipDownBy32768_60() + CHIP_ERROR TestTest12SkipDownBy32768_58() { MTRBaseDevice * device = GetDevice("alpha"); @@ -85570,7 +85512,7 @@ class TV_ChannelCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_61() + CHIP_ERROR TestTest13VerifyThatSkipChannelCommandSetCorrectCurrentChannel_59() { MTRBaseDevice * device = GetDevice("alpha"); From a620240f9d2098936c42ec1cbf0ab468e1d18e4a Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Thu, 18 May 2023 00:16:47 +0200 Subject: [PATCH 19/23] Fix the issue with max value of channels --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 942b2aae903775..beb438d07c892d 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -187,7 +187,7 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count) // handle smaller than 0 if (newChannelIndex < 0) { - newChannelIndex = channelsSize + (newChannelIndex % channelsSize); + newChannelIndex = (channelsSize + (newChannelIndex % channelsSize)) % channelsSize; } mCurrentChannelIndex = static_cast(newChannelIndex); From ff5e9aa826799705526992d0dde7694612738c09 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Thu, 18 May 2023 00:48:52 +0200 Subject: [PATCH 20/23] Simplify the decrease channel formula --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index beb438d07c892d..5156cd3d096945 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -187,7 +187,7 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count) // handle smaller than 0 if (newChannelIndex < 0) { - newChannelIndex = (channelsSize + (newChannelIndex % channelsSize)) % channelsSize; + newChannelIndex = (newChannelIndex % channelsSize) % channelsSize; } mCurrentChannelIndex = static_cast(newChannelIndex); From dd4bcc9a8ff68e540e271a748c7c0a6cd55c3854 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Thu, 18 May 2023 00:59:23 +0200 Subject: [PATCH 21/23] Simplify the decrease channel formula --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 5156cd3d096945..3f49a3a81bf26e 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -179,15 +179,11 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count) uint16_t channelsSize = static_cast(mChannels.size()); // handle larger than maximum -> channel size case - if (newChannelIndex >= channelsSize) - { - newChannelIndex = newChannelIndex % channelsSize; - } + newChannelIndex = newChannelIndex % channelsSize; - // handle smaller than 0 if (newChannelIndex < 0) { - newChannelIndex = (newChannelIndex % channelsSize) % channelsSize; + newChannelIndex = (newChannelIndex + channelsSize) % channelsSize; } mCurrentChannelIndex = static_cast(newChannelIndex); From ab25822dcb352371657bb00882459d6a479dcc48 Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Fri, 19 May 2023 11:29:28 +0200 Subject: [PATCH 22/23] Rebase to the latest code + add Boris suggestion --- zzz_generated/chip-tool/zap-generated/test/Commands.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index b06424bf6ac455..89e38aeae44aff 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -118049,8 +118049,6 @@ class Test_TC_S_1_1Suite : public TestCommand return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Scenes::Id, Scenes::Attributes::AcceptedCommandList::Id, true, chip::NullOptional); } -<<<<<<< HEAD -<<<<<<< HEAD case 11: { LogStep(11, "Read GeneratedCommandList (global attribute 65528)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Scenes::Id, Scenes::Attributes::GeneratedCommandList::Id, true, @@ -118074,12 +118072,6 @@ class Test_TC_S_1_1Suite : public TestCommand return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Scenes::Id, Scenes::Attributes::GeneratedCommandList::Id, true, chip::NullOptional); } -======= -======= ->>>>>>> 3f95ee532c (MediaClusters: Update SkipChannel per issue 26104) ->>>>>>> 4f9ddf3be4 (MediaClusters: Update SkipChannel per issue 26104) -======= ->>>>>>> fd2e2672f7 (Fix conflicts) } return CHIP_NO_ERROR; } From 5d2aa73eed864cba1cf2fbdc608e48b2d1f7d56f Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Fri, 19 May 2023 11:54:48 +0200 Subject: [PATCH 23/23] Simplify code per Boris suggestion --- examples/tv-app/linux/include/channel/ChannelManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 3f49a3a81bf26e..9d7c2556e4ece9 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -178,12 +178,12 @@ bool ChannelManager::HandleSkipChannel(const int16_t & count) int32_t newChannelIndex = static_cast(count) + static_cast(mCurrentChannelIndex); uint16_t channelsSize = static_cast(mChannels.size()); - // handle larger than maximum -> channel size case + // handle newChannelIndex out of range. newChannelIndex = newChannelIndex % channelsSize; if (newChannelIndex < 0) { - newChannelIndex = (newChannelIndex + channelsSize) % channelsSize; + newChannelIndex = newChannelIndex + channelsSize; } mCurrentChannelIndex = static_cast(newChannelIndex);