From 7e88aaa2a40b600d993277ca10ca494c107c5cd1 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 9 Jul 2021 12:07:43 -0400 Subject: [PATCH] Address review comments from PR 8073 (#8231) * Address review comments from PR 8073 * Regenerate generated files --- examples/chip-tool/commands/tests/Commands.h | 5850 +++++------------ .../templates/partials/test_cluster.zapt | 27 +- 2 files changed, 1668 insertions(+), 4209 deletions(-) diff --git a/examples/chip-tool/commands/tests/Commands.h b/examples/chip-tool/commands/tests/Commands.h index ecd75e9c96cf12..df60e3b6924a8e 100644 --- a/examples/chip-tool/commands/tests/Commands.h +++ b/examples/chip-tool/commands/tests/Commands.h @@ -67,32 +67,25 @@ class TV_TargetNavigatorCluster : public TestCommand // // Test Read attribute Target Navigator list - typedef void (*SuccessCallback_0)(void * context, uint16_t count, _NavigateTargetTargetInfo * targetNavigatorList); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint16_t count, _NavigateTargetTargetInfo * targetNavigatorList); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterTargetNavigatorCommandReadAttribute_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterTargetNavigatorCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterTargetNavigatorCommandReadAttribute_0() { ChipLogProgress(chipTool, "Target Navigator - Read attribute Target Navigator list: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterTargetNavigatorCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = new chip::Callback::Callback( - OnTestSendClusterTargetNavigatorCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::TargetNavigatorCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeTargetNavigatorList(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeTargetNavigatorList(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -103,9 +96,6 @@ class TV_TargetNavigatorCluster : public TestCommand TV_TargetNavigatorCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -124,9 +114,6 @@ class TV_TargetNavigatorCluster : public TestCommand TV_TargetNavigatorCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -145,20 +132,19 @@ class TV_TargetNavigatorCluster : public TestCommand } // Test Navigate Target Command - typedef void (*SuccessCallback_1)(void * context, uint8_t status, chip::ByteSpan data); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, uint8_t status, chip::ByteSpan data); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterTargetNavigatorCommandNavigateTarget_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterTargetNavigatorCommandNavigateTarget_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterTargetNavigatorCommandNavigateTarget_1() { ChipLogProgress(chipTool, "Target Navigator - Navigate Target Command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterTargetNavigatorCommandNavigateTarget_1_FailureResponse, this); - mOnSuccessCallback_1 = new chip::Callback::Callback( - OnTestSendClusterTargetNavigatorCommandNavigateTarget_1_SuccessResponse, this); - chip::Controller::TargetNavigatorCluster cluster; cluster.Associate(mDevice, 1); @@ -166,13 +152,7 @@ class TV_TargetNavigatorCluster : public TestCommand uint8_t targetArgument = 1; chip::ByteSpan dataArgument = chip::ByteSpan(chip::Uint8::from_const_char("1"), strlen("1")); - err = cluster.NavigateTarget(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel(), targetArgument, dataArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.NavigateTarget(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel(), targetArgument, dataArgument); return err; } @@ -183,9 +163,6 @@ class TV_TargetNavigatorCluster : public TestCommand TV_TargetNavigatorCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -203,9 +180,6 @@ class TV_TargetNavigatorCluster : public TestCommand TV_TargetNavigatorCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -266,32 +240,25 @@ class TV_AudioOutputCluster : public TestCommand // // Test Read attribute Audio Output list - typedef void (*SuccessCallback_0)(void * context, uint16_t count, _AudioOutputInfo * audioOutputList); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint16_t count, _AudioOutputInfo * audioOutputList); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterAudioOutputCommandReadAttribute_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterAudioOutputCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterAudioOutputCommandReadAttribute_0() { ChipLogProgress(chipTool, "Audio Output - Read attribute Audio Output list: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterAudioOutputCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = new chip::Callback::Callback( - OnTestSendClusterAudioOutputCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::AudioOutputCluster cluster; cluster.Associate(mDevice, 2); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeAudioOutputList(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeAudioOutputList(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -302,9 +269,6 @@ class TV_AudioOutputCluster : public TestCommand TV_AudioOutputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -322,9 +286,6 @@ class TV_AudioOutputCluster : public TestCommand TV_AudioOutputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -343,33 +304,26 @@ class TV_AudioOutputCluster : public TestCommand } // Test Select Output Command - typedef void (*SuccessCallback_1)(void * context); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterAudioOutputCommandSelectOutput_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterAudioOutputCommandSelectOutput_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterAudioOutputCommandSelectOutput_1() { ChipLogProgress(chipTool, "Audio Output - Select Output Command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterAudioOutputCommandSelectOutput_1_FailureResponse, this); - mOnSuccessCallback_1 = new chip::Callback::Callback( - OnTestSendClusterAudioOutputCommandSelectOutput_1_SuccessResponse, this); - chip::Controller::AudioOutputCluster cluster; cluster.Associate(mDevice, 2); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t indexArgument = 1; - err = cluster.SelectOutput(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel(), indexArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.SelectOutput(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel(), indexArgument); return err; } @@ -380,9 +334,6 @@ class TV_AudioOutputCluster : public TestCommand TV_AudioOutputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -399,9 +350,6 @@ class TV_AudioOutputCluster : public TestCommand TV_AudioOutputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -413,20 +361,19 @@ class TV_AudioOutputCluster : public TestCommand } // Test Rename Output Command - typedef void (*SuccessCallback_2)(void * context); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_2{ + OnTestSendClusterAudioOutputCommandRenameOutput_2_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterAudioOutputCommandRenameOutput_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterAudioOutputCommandRenameOutput_2() { ChipLogProgress(chipTool, "Audio Output - Rename Output Command: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterAudioOutputCommandRenameOutput_2_FailureResponse, this); - mOnSuccessCallback_2 = new chip::Callback::Callback( - OnTestSendClusterAudioOutputCommandRenameOutput_2_SuccessResponse, this); - chip::Controller::AudioOutputCluster cluster; cluster.Associate(mDevice, 2); @@ -434,13 +381,7 @@ class TV_AudioOutputCluster : public TestCommand uint8_t indexArgument = 1; chip::ByteSpan nameArgument = chip::ByteSpan(chip::Uint8::from_const_char("exampleName"), strlen("exampleName")); - err = cluster.RenameOutput(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel(), indexArgument, nameArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.RenameOutput(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel(), indexArgument, nameArgument); return err; } @@ -451,9 +392,6 @@ class TV_AudioOutputCluster : public TestCommand TV_AudioOutputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -470,9 +408,6 @@ class TV_AudioOutputCluster : public TestCommand TV_AudioOutputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -536,32 +471,25 @@ class TV_ApplicationLauncherCluster : public TestCommand // // Test Read attribute Application Launcher list - typedef void (*SuccessCallback_0)(void * context, uint16_t count, uint16_t * applicationLauncherList); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint16_t count, uint16_t * applicationLauncherList); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterApplicationLauncherCommandReadAttribute_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterApplicationLauncherCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterApplicationLauncherCommandReadAttribute_0() { ChipLogProgress(chipTool, "Application Launcher - Read attribute Application Launcher list: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::ApplicationLauncherCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeApplicationLauncherList(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeApplicationLauncherList(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -572,9 +500,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -592,9 +517,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -613,20 +535,19 @@ class TV_ApplicationLauncherCluster : public TestCommand } // Test Launch App Command - typedef void (*SuccessCallback_1)(void * context, uint8_t status, chip::ByteSpan data); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, uint8_t status, chip::ByteSpan data); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterApplicationLauncherCommandLaunchApp_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterApplicationLauncherCommandLaunchApp_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterApplicationLauncherCommandLaunchApp_1() { ChipLogProgress(chipTool, "Application Launcher - Launch App Command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandLaunchApp_1_FailureResponse, this); - mOnSuccessCallback_1 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandLaunchApp_1_SuccessResponse, this); - chip::Controller::ApplicationLauncherCluster cluster; cluster.Associate(mDevice, 1); @@ -635,14 +556,8 @@ class TV_ApplicationLauncherCluster : public TestCommand chip::ByteSpan dataArgument = chip::ByteSpan(chip::Uint8::from_const_char("exampleData"), strlen("exampleData")); uint16_t catalogVendorIdArgument = 1U; chip::ByteSpan applicationIdArgument = chip::ByteSpan(chip::Uint8::from_const_char("appId"), strlen("appId")); - err = cluster.LaunchApp(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel(), dataArgument, - catalogVendorIdArgument, applicationIdArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.LaunchApp(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel(), dataArgument, catalogVendorIdArgument, + applicationIdArgument); return err; } @@ -653,9 +568,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -673,9 +585,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -687,32 +596,25 @@ class TV_ApplicationLauncherCluster : public TestCommand } // Test Read attribute catalog vendor id - typedef void (*SuccessCallback_2)(void * context, uint8_t catalogVendorId); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint8_t catalogVendorId); + chip::Callback::Callback mOnSuccessCallback_2{ + OnTestSendClusterApplicationLauncherCommandReadAttribute_2_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterApplicationLauncherCommandReadAttribute_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterApplicationLauncherCommandReadAttribute_2() { ChipLogProgress(chipTool, "Application Launcher - Read attribute catalog vendor id: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandReadAttribute_2_FailureResponse, this); - mOnSuccessCallback_2 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandReadAttribute_2_SuccessResponse, this); - chip::Controller::ApplicationLauncherCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeCatalogVendorId(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.ReadAttributeCatalogVendorId(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -723,9 +625,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -742,9 +641,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -763,32 +659,25 @@ class TV_ApplicationLauncherCluster : public TestCommand } // Test Read attribute application id - typedef void (*SuccessCallback_3)(void * context, uint8_t applicationId); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, uint8_t applicationId); + chip::Callback::Callback mOnSuccessCallback_3{ + OnTestSendClusterApplicationLauncherCommandReadAttribute_3_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterApplicationLauncherCommandReadAttribute_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterApplicationLauncherCommandReadAttribute_3() { ChipLogProgress(chipTool, "Application Launcher - Read attribute application id: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandReadAttribute_3_FailureResponse, this); - mOnSuccessCallback_3 = new chip::Callback::Callback( - OnTestSendClusterApplicationLauncherCommandReadAttribute_3_SuccessResponse, this); - chip::Controller::ApplicationLauncherCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeApplicationId(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.ReadAttributeApplicationId(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -799,9 +688,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -818,9 +704,6 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -882,33 +765,25 @@ class TV_KeypadInputCluster : public TestCommand // // Test Send Key Command - typedef void (*SuccessCallback_0)(void * context, uint8_t status); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint8_t status); + chip::Callback::Callback mOnSuccessCallback_0{ OnTestSendClusterKeypadInputCommandSendKey_0_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterKeypadInputCommandSendKey_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterKeypadInputCommandSendKey_0() { ChipLogProgress(chipTool, "Keypad Input - Send Key Command: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterKeypadInputCommandSendKey_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterKeypadInputCommandSendKey_0_SuccessResponse, this); - chip::Controller::KeypadInputCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t keyCodeArgument = 3; - err = cluster.SendKey(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel(), keyCodeArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.SendKey(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel(), keyCodeArgument); return err; } @@ -919,9 +794,6 @@ class TV_KeypadInputCluster : public TestCommand TV_KeypadInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -938,9 +810,6 @@ class TV_KeypadInputCluster : public TestCommand TV_KeypadInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -998,33 +867,26 @@ class TV_AccountLoginCluster : public TestCommand // // Test Get Setup PIN Command - typedef void (*SuccessCallback_0)(void * context, chip::ByteSpan setupPIN); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, chip::ByteSpan setupPIN); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterAccountLoginCommandGetSetupPIN_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterAccountLoginCommandGetSetupPIN_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterAccountLoginCommandGetSetupPIN_0() { ChipLogProgress(chipTool, "Account Login - Get Setup PIN Command: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterAccountLoginCommandGetSetupPIN_0_FailureResponse, this); - mOnSuccessCallback_0 = new chip::Callback::Callback( - OnTestSendClusterAccountLoginCommandGetSetupPIN_0_SuccessResponse, this); - chip::Controller::AccountLoginCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; chip::ByteSpan tempAccountIdentifierArgument = chip::ByteSpan(chip::Uint8::from_const_char("asdf"), strlen("asdf")); - err = cluster.GetSetupPIN(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel(), tempAccountIdentifierArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.GetSetupPIN(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel(), tempAccountIdentifierArgument); return err; } @@ -1035,9 +897,6 @@ class TV_AccountLoginCluster : public TestCommand TV_AccountLoginCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1054,9 +913,6 @@ class TV_AccountLoginCluster : public TestCommand TV_AccountLoginCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1068,20 +924,18 @@ class TV_AccountLoginCluster : public TestCommand } // Test Login Command - typedef void (*SuccessCallback_1)(void * context); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_1{ OnTestSendClusterAccountLoginCommandLogin_1_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterAccountLoginCommandLogin_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterAccountLoginCommandLogin_1() { ChipLogProgress(chipTool, "Account Login - Login Command: Sending command..."); - mOnFailureCallback_1 = - new chip::Callback::Callback(OnTestSendClusterAccountLoginCommandLogin_1_FailureResponse, this); - mOnSuccessCallback_1 = - new chip::Callback::Callback(OnTestSendClusterAccountLoginCommandLogin_1_SuccessResponse, this); - chip::Controller::AccountLoginCluster cluster; cluster.Associate(mDevice, 3); @@ -1089,15 +943,9 @@ class TV_AccountLoginCluster : public TestCommand chip::ByteSpan tempAccountIdentifierArgument = chip::ByteSpan(chip::Uint8::from_const_char("asdf"), strlen("asdf")); chip::ByteSpan setupPINArgument = chip::ByteSpan(chip::Uint8::from_const_char("tempPin123"), strlen("tempPin123")); - err = cluster.Login(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel(), tempAccountIdentifierArgument, + err = cluster.Login(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel(), tempAccountIdentifierArgument, setupPINArgument); - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } - return err; } @@ -1107,9 +955,6 @@ class TV_AccountLoginCluster : public TestCommand TV_AccountLoginCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1126,9 +971,6 @@ class TV_AccountLoginCluster : public TestCommand TV_AccountLoginCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1201,33 +1043,26 @@ class TV_ApplicationBasicCluster : public TestCommand // // Test Change Status Command - typedef void (*SuccessCallback_0)(void * context); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterApplicationBasicCommandChangeStatus_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterApplicationBasicCommandChangeStatus_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterApplicationBasicCommandChangeStatus_0() { ChipLogProgress(chipTool, "Application Basic - Change Status Command: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandChangeStatus_0_FailureResponse, this); - mOnSuccessCallback_0 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandChangeStatus_0_SuccessResponse, this); - chip::Controller::ApplicationBasicCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t statusArgument = 1; - err = cluster.ChangeStatus(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel(), statusArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ChangeStatus(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel(), statusArgument); return err; } @@ -1238,9 +1073,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1257,9 +1089,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1271,32 +1100,25 @@ class TV_ApplicationBasicCluster : public TestCommand } // Test Read attribute vendor name - typedef void (*SuccessCallback_1)(void * context, chip::ByteSpan vendorName); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, chip::ByteSpan vendorName); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterApplicationBasicCommandReadAttribute_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterApplicationBasicCommandReadAttribute_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterApplicationBasicCommandReadAttribute_1() { ChipLogProgress(chipTool, "Application Basic - Read attribute vendor name: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_1_FailureResponse, this); - mOnSuccessCallback_1 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_1_SuccessResponse, this); - chip::Controller::ApplicationBasicCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeVendorName(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.ReadAttributeVendorName(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel()); return err; } @@ -1307,9 +1129,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1326,9 +1145,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1340,32 +1156,25 @@ class TV_ApplicationBasicCluster : public TestCommand } // Test Read attribute vendor id - typedef void (*SuccessCallback_2)(void * context, uint16_t vendorId); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint16_t vendorId); + chip::Callback::Callback mOnSuccessCallback_2{ + OnTestSendClusterApplicationBasicCommandReadAttribute_2_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterApplicationBasicCommandReadAttribute_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterApplicationBasicCommandReadAttribute_2() { ChipLogProgress(chipTool, "Application Basic - Read attribute vendor id: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_2_FailureResponse, this); - mOnSuccessCallback_2 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_2_SuccessResponse, this); - chip::Controller::ApplicationBasicCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeVendorId(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.ReadAttributeVendorId(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -1376,9 +1185,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1395,9 +1201,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1416,32 +1219,25 @@ class TV_ApplicationBasicCluster : public TestCommand } // Test Read attribute name - typedef void (*SuccessCallback_3)(void * context, chip::ByteSpan applicationName); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, chip::ByteSpan applicationName); + chip::Callback::Callback mOnSuccessCallback_3{ + OnTestSendClusterApplicationBasicCommandReadAttribute_3_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterApplicationBasicCommandReadAttribute_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterApplicationBasicCommandReadAttribute_3() { ChipLogProgress(chipTool, "Application Basic - Read attribute name: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_3_FailureResponse, this); - mOnSuccessCallback_3 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_3_SuccessResponse, this); - chip::Controller::ApplicationBasicCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeApplicationName(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.ReadAttributeApplicationName(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -1452,9 +1248,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1472,9 +1265,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1486,32 +1276,25 @@ class TV_ApplicationBasicCluster : public TestCommand } // Test Read attribute product id - typedef void (*SuccessCallback_4)(void * context, uint16_t productId); - chip::Callback::Callback * mOnSuccessCallback_4 = nullptr; - chip::Callback::Callback * mOnFailureCallback_4 = nullptr; - bool mIsFailureExpected_4 = 0; + using SuccessCallback_4 = void (*)(void * context, uint16_t productId); + chip::Callback::Callback mOnSuccessCallback_4{ + OnTestSendClusterApplicationBasicCommandReadAttribute_4_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_4{ + OnTestSendClusterApplicationBasicCommandReadAttribute_4_FailureResponse, this + }; + bool mIsFailureExpected_4 = 0; CHIP_ERROR TestSendClusterApplicationBasicCommandReadAttribute_4() { ChipLogProgress(chipTool, "Application Basic - Read attribute product id: Sending command..."); - mOnFailureCallback_4 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_4_FailureResponse, this); - mOnSuccessCallback_4 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_4_SuccessResponse, this); - chip::Controller::ApplicationBasicCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeProductId(mOnSuccessCallback_4->Cancel(), mOnFailureCallback_4->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_4; - delete mOnSuccessCallback_4; - } + err = cluster.ReadAttributeProductId(mOnSuccessCallback_4.Cancel(), mOnFailureCallback_4.Cancel()); return err; } @@ -1522,9 +1305,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1541,9 +1321,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1562,32 +1339,25 @@ class TV_ApplicationBasicCluster : public TestCommand } // Test Read attribute id - typedef void (*SuccessCallback_5)(void * context, chip::ByteSpan applicationId); - chip::Callback::Callback * mOnSuccessCallback_5 = nullptr; - chip::Callback::Callback * mOnFailureCallback_5 = nullptr; - bool mIsFailureExpected_5 = 0; + using SuccessCallback_5 = void (*)(void * context, chip::ByteSpan applicationId); + chip::Callback::Callback mOnSuccessCallback_5{ + OnTestSendClusterApplicationBasicCommandReadAttribute_5_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_5{ + OnTestSendClusterApplicationBasicCommandReadAttribute_5_FailureResponse, this + }; + bool mIsFailureExpected_5 = 0; CHIP_ERROR TestSendClusterApplicationBasicCommandReadAttribute_5() { ChipLogProgress(chipTool, "Application Basic - Read attribute id: Sending command..."); - mOnFailureCallback_5 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_5_FailureResponse, this); - mOnSuccessCallback_5 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_5_SuccessResponse, this); - chip::Controller::ApplicationBasicCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeApplicationId(mOnSuccessCallback_5->Cancel(), mOnFailureCallback_5->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_5; - delete mOnSuccessCallback_5; - } + err = cluster.ReadAttributeApplicationId(mOnSuccessCallback_5.Cancel(), mOnFailureCallback_5.Cancel()); return err; } @@ -1598,9 +1368,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1618,9 +1385,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1632,32 +1396,25 @@ class TV_ApplicationBasicCluster : public TestCommand } // Test Read attribute catalog vendor id - typedef void (*SuccessCallback_6)(void * context, uint16_t catalogVendorId); - chip::Callback::Callback * mOnSuccessCallback_6 = nullptr; - chip::Callback::Callback * mOnFailureCallback_6 = nullptr; - bool mIsFailureExpected_6 = 0; + using SuccessCallback_6 = void (*)(void * context, uint16_t catalogVendorId); + chip::Callback::Callback mOnSuccessCallback_6{ + OnTestSendClusterApplicationBasicCommandReadAttribute_6_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_6{ + OnTestSendClusterApplicationBasicCommandReadAttribute_6_FailureResponse, this + }; + bool mIsFailureExpected_6 = 0; CHIP_ERROR TestSendClusterApplicationBasicCommandReadAttribute_6() { ChipLogProgress(chipTool, "Application Basic - Read attribute catalog vendor id: Sending command..."); - mOnFailureCallback_6 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_6_FailureResponse, this); - mOnSuccessCallback_6 = new chip::Callback::Callback( - OnTestSendClusterApplicationBasicCommandReadAttribute_6_SuccessResponse, this); - chip::Controller::ApplicationBasicCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeCatalogVendorId(mOnSuccessCallback_6->Cancel(), mOnFailureCallback_6->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_6; - delete mOnSuccessCallback_6; - } + err = cluster.ReadAttributeCatalogVendorId(mOnSuccessCallback_6.Cancel(), mOnFailureCallback_6.Cancel()); return err; } @@ -1668,9 +1425,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1687,9 +1441,6 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1781,32 +1532,25 @@ class TV_MediaPlaybackCluster : public TestCommand // // Test Media Playback Play Command - typedef void (*SuccessCallback_0)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterMediaPlaybackCommandMediaPlay_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterMediaPlaybackCommandMediaPlay_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaPlay_0() { ChipLogProgress(chipTool, "Media Playback - Media Playback Play Command: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaPlay_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterMediaPlaybackCommandMediaPlay_0_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaPlay(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.MediaPlay(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -1817,9 +1561,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1836,9 +1577,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1857,32 +1595,25 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Pause Command - typedef void (*SuccessCallback_1)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterMediaPlaybackCommandMediaPause_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterMediaPlaybackCommandMediaPause_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaPause_1() { ChipLogProgress(chipTool, "Media Playback - Media Playback Pause Command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaPause_1_FailureResponse, this); - mOnSuccessCallback_1 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaPause_1_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaPause(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.MediaPause(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel()); return err; } @@ -1893,9 +1624,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1912,9 +1640,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -1933,32 +1658,25 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Stop Command - typedef void (*SuccessCallback_2)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_2{ + OnTestSendClusterMediaPlaybackCommandMediaStop_2_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterMediaPlaybackCommandMediaStop_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaStop_2() { ChipLogProgress(chipTool, "Media Playback - Media Playback Stop Command: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaStop_2_FailureResponse, this); - mOnSuccessCallback_2 = - new chip::Callback::Callback(OnTestSendClusterMediaPlaybackCommandMediaStop_2_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaStop(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.MediaStop(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -1969,9 +1687,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -1988,9 +1703,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2009,32 +1721,25 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Start Over Command - typedef void (*SuccessCallback_3)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_3{ + OnTestSendClusterMediaPlaybackCommandMediaStartOver_3_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterMediaPlaybackCommandMediaStartOver_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaStartOver_3() { ChipLogProgress(chipTool, "Media Playback - Media Playback Start Over Command: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaStartOver_3_FailureResponse, this); - mOnSuccessCallback_3 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaStartOver_3_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaStartOver(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.MediaStartOver(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -2045,9 +1750,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2064,9 +1766,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2085,32 +1784,25 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Previous Command - typedef void (*SuccessCallback_4)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_4 = nullptr; - chip::Callback::Callback * mOnFailureCallback_4 = nullptr; - bool mIsFailureExpected_4 = 0; + using SuccessCallback_4 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_4{ + OnTestSendClusterMediaPlaybackCommandMediaPrevious_4_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_4{ + OnTestSendClusterMediaPlaybackCommandMediaPrevious_4_FailureResponse, this + }; + bool mIsFailureExpected_4 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaPrevious_4() { ChipLogProgress(chipTool, "Media Playback - Media Playback Previous Command: Sending command..."); - mOnFailureCallback_4 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaPrevious_4_FailureResponse, this); - mOnSuccessCallback_4 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaPrevious_4_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaPrevious(mOnSuccessCallback_4->Cancel(), mOnFailureCallback_4->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_4; - delete mOnSuccessCallback_4; - } + err = cluster.MediaPrevious(mOnSuccessCallback_4.Cancel(), mOnFailureCallback_4.Cancel()); return err; } @@ -2121,9 +1813,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2140,9 +1829,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2161,32 +1847,25 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Next Command - typedef void (*SuccessCallback_5)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_5 = nullptr; - chip::Callback::Callback * mOnFailureCallback_5 = nullptr; - bool mIsFailureExpected_5 = 0; + using SuccessCallback_5 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_5{ + OnTestSendClusterMediaPlaybackCommandMediaNext_5_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_5{ + OnTestSendClusterMediaPlaybackCommandMediaNext_5_FailureResponse, this + }; + bool mIsFailureExpected_5 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaNext_5() { ChipLogProgress(chipTool, "Media Playback - Media Playback Next Command: Sending command..."); - mOnFailureCallback_5 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaNext_5_FailureResponse, this); - mOnSuccessCallback_5 = - new chip::Callback::Callback(OnTestSendClusterMediaPlaybackCommandMediaNext_5_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaNext(mOnSuccessCallback_5->Cancel(), mOnFailureCallback_5->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_5; - delete mOnSuccessCallback_5; - } + err = cluster.MediaNext(mOnSuccessCallback_5.Cancel(), mOnFailureCallback_5.Cancel()); return err; } @@ -2197,9 +1876,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2216,9 +1892,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2237,32 +1910,25 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Rewind Command - typedef void (*SuccessCallback_6)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_6 = nullptr; - chip::Callback::Callback * mOnFailureCallback_6 = nullptr; - bool mIsFailureExpected_6 = 0; + using SuccessCallback_6 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_6{ + OnTestSendClusterMediaPlaybackCommandMediaRewind_6_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_6{ + OnTestSendClusterMediaPlaybackCommandMediaRewind_6_FailureResponse, this + }; + bool mIsFailureExpected_6 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaRewind_6() { ChipLogProgress(chipTool, "Media Playback - Media Playback Rewind Command: Sending command..."); - mOnFailureCallback_6 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaRewind_6_FailureResponse, this); - mOnSuccessCallback_6 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaRewind_6_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaRewind(mOnSuccessCallback_6->Cancel(), mOnFailureCallback_6->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_6; - delete mOnSuccessCallback_6; - } + err = cluster.MediaRewind(mOnSuccessCallback_6.Cancel(), mOnFailureCallback_6.Cancel()); return err; } @@ -2273,9 +1939,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2292,9 +1955,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2313,32 +1973,25 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Fast Forward Command - typedef void (*SuccessCallback_7)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_7 = nullptr; - chip::Callback::Callback * mOnFailureCallback_7 = nullptr; - bool mIsFailureExpected_7 = 0; + using SuccessCallback_7 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_7{ + OnTestSendClusterMediaPlaybackCommandMediaFastForward_7_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_7{ + OnTestSendClusterMediaPlaybackCommandMediaFastForward_7_FailureResponse, this + }; + bool mIsFailureExpected_7 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaFastForward_7() { ChipLogProgress(chipTool, "Media Playback - Media Playback Fast Forward Command: Sending command..."); - mOnFailureCallback_7 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaFastForward_7_FailureResponse, this); - mOnSuccessCallback_7 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaFastForward_7_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.MediaFastForward(mOnSuccessCallback_7->Cancel(), mOnFailureCallback_7->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_7; - delete mOnSuccessCallback_7; - } + err = cluster.MediaFastForward(mOnSuccessCallback_7.Cancel(), mOnFailureCallback_7.Cancel()); return err; } @@ -2349,9 +2002,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2368,9 +2018,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2389,35 +2036,28 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Skip Forward Command - typedef void (*SuccessCallback_8)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_8 = nullptr; - chip::Callback::Callback * mOnFailureCallback_8 = nullptr; - bool mIsFailureExpected_8 = 0; + using SuccessCallback_8 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_8{ + OnTestSendClusterMediaPlaybackCommandMediaSkipForward_8_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_8{ + OnTestSendClusterMediaPlaybackCommandMediaSkipForward_8_FailureResponse, this + }; + bool mIsFailureExpected_8 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaSkipForward_8() { ChipLogProgress(chipTool, "Media Playback - Media Playback Skip Forward Command: Sending command..."); - mOnFailureCallback_8 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaSkipForward_8_FailureResponse, this); - mOnSuccessCallback_8 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaSkipForward_8_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; uint64_t deltaPositionMillisecondsArgument = 100ULL; - err = cluster.MediaSkipForward(mOnSuccessCallback_8->Cancel(), mOnFailureCallback_8->Cancel(), + err = cluster.MediaSkipForward(mOnSuccessCallback_8.Cancel(), mOnFailureCallback_8.Cancel(), deltaPositionMillisecondsArgument); - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_8; - delete mOnSuccessCallback_8; - } - return err; } @@ -2427,9 +2067,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2446,9 +2083,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2467,35 +2101,28 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Skip Backward Command - typedef void (*SuccessCallback_9)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_9 = nullptr; - chip::Callback::Callback * mOnFailureCallback_9 = nullptr; - bool mIsFailureExpected_9 = 0; + using SuccessCallback_9 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_9{ + OnTestSendClusterMediaPlaybackCommandMediaSkipBackward_9_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_9{ + OnTestSendClusterMediaPlaybackCommandMediaSkipBackward_9_FailureResponse, this + }; + bool mIsFailureExpected_9 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaSkipBackward_9() { ChipLogProgress(chipTool, "Media Playback - Media Playback Skip Backward Command: Sending command..."); - mOnFailureCallback_9 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaSkipBackward_9_FailureResponse, this); - mOnSuccessCallback_9 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaSkipBackward_9_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; uint64_t deltaPositionMillisecondsArgument = 100ULL; - err = cluster.MediaSkipBackward(mOnSuccessCallback_9->Cancel(), mOnFailureCallback_9->Cancel(), + err = cluster.MediaSkipBackward(mOnSuccessCallback_9.Cancel(), mOnFailureCallback_9.Cancel(), deltaPositionMillisecondsArgument); - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_9; - delete mOnSuccessCallback_9; - } - return err; } @@ -2505,9 +2132,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2525,9 +2149,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2546,33 +2167,26 @@ class TV_MediaPlaybackCluster : public TestCommand } // Test Media Playback Seek Command - typedef void (*SuccessCallback_10)(void * context, uint8_t mediaPlaybackStatus); - chip::Callback::Callback * mOnSuccessCallback_10 = nullptr; - chip::Callback::Callback * mOnFailureCallback_10 = nullptr; - bool mIsFailureExpected_10 = 0; + using SuccessCallback_10 = void (*)(void * context, uint8_t mediaPlaybackStatus); + chip::Callback::Callback mOnSuccessCallback_10{ + OnTestSendClusterMediaPlaybackCommandMediaSeek_10_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_10{ + OnTestSendClusterMediaPlaybackCommandMediaSeek_10_FailureResponse, this + }; + bool mIsFailureExpected_10 = 0; CHIP_ERROR TestSendClusterMediaPlaybackCommandMediaSeek_10() { ChipLogProgress(chipTool, "Media Playback - Media Playback Seek Command: Sending command..."); - mOnFailureCallback_10 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaSeek_10_FailureResponse, this); - mOnSuccessCallback_10 = new chip::Callback::Callback( - OnTestSendClusterMediaPlaybackCommandMediaSeek_10_SuccessResponse, this); - chip::Controller::MediaPlaybackCluster cluster; cluster.Associate(mDevice, 3); CHIP_ERROR err = CHIP_NO_ERROR; uint64_t positionArgument = 100ULL; - err = cluster.MediaSeek(mOnSuccessCallback_10->Cancel(), mOnFailureCallback_10->Cancel(), positionArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_10; - delete mOnSuccessCallback_10; - } + err = cluster.MediaSeek(mOnSuccessCallback_10.Cancel(), mOnFailureCallback_10.Cancel(), positionArgument); return err; } @@ -2583,9 +2197,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2602,9 +2213,6 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2672,32 +2280,25 @@ class TV_TvChannelCluster : public TestCommand // // Test Read attribute TV Channel list - typedef void (*SuccessCallback_0)(void * context, uint16_t count, _TvChannelInfo * tvChannelList); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint16_t count, _TvChannelInfo * tvChannelList); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterTvChannelCommandReadAttribute_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterTvChannelCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterTvChannelCommandReadAttribute_0() { ChipLogProgress(chipTool, "TV Channel - Read attribute TV Channel list: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterTvChannelCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterTvChannelCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::TvChannelCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeTvChannelList(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeTvChannelList(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -2708,9 +2309,6 @@ class TV_TvChannelCluster : public TestCommand TV_TvChannelCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2728,9 +2326,6 @@ class TV_TvChannelCluster : public TestCommand TV_TvChannelCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2749,20 +2344,19 @@ class TV_TvChannelCluster : public TestCommand } // Test Change Channel By Number Command - typedef void (*SuccessCallback_1)(void * context); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterTvChannelCommandChangeChannelByNumber_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterTvChannelCommandChangeChannelByNumber_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterTvChannelCommandChangeChannelByNumber_1() { ChipLogProgress(chipTool, "TV Channel - Change Channel By Number Command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterTvChannelCommandChangeChannelByNumber_1_FailureResponse, this); - mOnSuccessCallback_1 = new chip::Callback::Callback( - OnTestSendClusterTvChannelCommandChangeChannelByNumber_1_SuccessResponse, this); - chip::Controller::TvChannelCluster cluster; cluster.Associate(mDevice, 1); @@ -2770,15 +2364,9 @@ class TV_TvChannelCluster : public TestCommand uint16_t majorNumberArgument = 1U; uint16_t minorNumberArgument = 2U; - err = cluster.ChangeChannelByNumber(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel(), majorNumberArgument, + err = cluster.ChangeChannelByNumber(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel(), majorNumberArgument, minorNumberArgument); - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } - return err; } @@ -2788,9 +2376,6 @@ class TV_TvChannelCluster : public TestCommand TV_TvChannelCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2807,9 +2392,6 @@ class TV_TvChannelCluster : public TestCommand TV_TvChannelCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2821,33 +2403,26 @@ class TV_TvChannelCluster : public TestCommand } // Test Skip Channel Command - typedef void (*SuccessCallback_2)(void * context); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_2{ + OnTestSendClusterTvChannelCommandSkipChannel_2_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterTvChannelCommandSkipChannel_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterTvChannelCommandSkipChannel_2() { ChipLogProgress(chipTool, "TV Channel - Skip Channel Command: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterTvChannelCommandSkipChannel_2_FailureResponse, this); - mOnSuccessCallback_2 = - new chip::Callback::Callback(OnTestSendClusterTvChannelCommandSkipChannel_2_SuccessResponse, this); - chip::Controller::TvChannelCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t countArgument = 1U; - err = cluster.SkipChannel(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel(), countArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.SkipChannel(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel(), countArgument); return err; } @@ -2858,9 +2433,6 @@ class TV_TvChannelCluster : public TestCommand TV_TvChannelCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2877,9 +2449,6 @@ class TV_TvChannelCluster : public TestCommand TV_TvChannelCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -2934,32 +2503,23 @@ class TV_LowPowerCluster : public TestCommand // // Test Sleep Input Status Command - typedef void (*SuccessCallback_0)(void * context); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_0{ OnTestSendClusterLowPowerCommandSleep_0_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_0{ OnTestSendClusterLowPowerCommandSleep_0_FailureResponse, + this }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterLowPowerCommandSleep_0() { ChipLogProgress(chipTool, "Low Power - Sleep Input Status Command: Sending command..."); - mOnFailureCallback_0 = - new chip::Callback::Callback(OnTestSendClusterLowPowerCommandSleep_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterLowPowerCommandSleep_0_SuccessResponse, this); - chip::Controller::LowPowerCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.Sleep(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.Sleep(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -2970,9 +2530,6 @@ class TV_LowPowerCluster : public TestCommand TV_LowPowerCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -2989,9 +2546,6 @@ class TV_LowPowerCluster : public TestCommand TV_LowPowerCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3061,32 +2615,25 @@ class TV_MediaInputCluster : public TestCommand // // Test Read attribute media input list - typedef void (*SuccessCallback_0)(void * context, uint16_t count, _MediaInputInfo * mediaInputList); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint16_t count, _MediaInputInfo * mediaInputList); + chip::Callback::Callback mOnSuccessCallback_0{ + OnTestSendClusterMediaInputCommandReadAttribute_0_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterMediaInputCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterMediaInputCommandReadAttribute_0() { ChipLogProgress(chipTool, "Media Input - Read attribute media input list: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::MediaInputCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeMediaInputList(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeMediaInputList(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -3097,9 +2644,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3117,9 +2661,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3138,33 +2679,26 @@ class TV_MediaInputCluster : public TestCommand } // Test Select Input Command - typedef void (*SuccessCallback_1)(void * context); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterMediaInputCommandSelectInput_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterMediaInputCommandSelectInput_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterMediaInputCommandSelectInput_1() { ChipLogProgress(chipTool, "Media Input - Select Input Command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandSelectInput_1_FailureResponse, this); - mOnSuccessCallback_1 = - new chip::Callback::Callback(OnTestSendClusterMediaInputCommandSelectInput_1_SuccessResponse, this); - chip::Controller::MediaInputCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t indexArgument = 1; - err = cluster.SelectInput(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel(), indexArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.SelectInput(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel(), indexArgument); return err; } @@ -3175,9 +2709,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3194,9 +2725,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3208,32 +2736,25 @@ class TV_MediaInputCluster : public TestCommand } // Test Read current input list - typedef void (*SuccessCallback_2)(void * context, uint8_t currentMediaInput); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint8_t currentMediaInput); + chip::Callback::Callback mOnSuccessCallback_2{ + OnTestSendClusterMediaInputCommandReadAttribute_2_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterMediaInputCommandReadAttribute_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterMediaInputCommandReadAttribute_2() { ChipLogProgress(chipTool, "Media Input - Read current input list: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandReadAttribute_2_FailureResponse, this); - mOnSuccessCallback_2 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandReadAttribute_2_SuccessResponse, this); - chip::Controller::MediaInputCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeCurrentMediaInput(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.ReadAttributeCurrentMediaInput(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -3244,9 +2765,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3263,9 +2781,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3284,32 +2799,25 @@ class TV_MediaInputCluster : public TestCommand } // Test Hide Input Status Command - typedef void (*SuccessCallback_3)(void * context); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_3{ + OnTestSendClusterMediaInputCommandHideInputStatus_3_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterMediaInputCommandHideInputStatus_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterMediaInputCommandHideInputStatus_3() { ChipLogProgress(chipTool, "Media Input - Hide Input Status Command: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandHideInputStatus_3_FailureResponse, this); - mOnSuccessCallback_3 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandHideInputStatus_3_SuccessResponse, this); - chip::Controller::MediaInputCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.HideInputStatus(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.HideInputStatus(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -3320,9 +2828,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3339,9 +2844,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3353,32 +2855,25 @@ class TV_MediaInputCluster : public TestCommand } // Test Show Input Status Command - typedef void (*SuccessCallback_4)(void * context); - chip::Callback::Callback * mOnSuccessCallback_4 = nullptr; - chip::Callback::Callback * mOnFailureCallback_4 = nullptr; - bool mIsFailureExpected_4 = 0; + using SuccessCallback_4 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_4{ + OnTestSendClusterMediaInputCommandShowInputStatus_4_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_4{ + OnTestSendClusterMediaInputCommandShowInputStatus_4_FailureResponse, this + }; + bool mIsFailureExpected_4 = 0; CHIP_ERROR TestSendClusterMediaInputCommandShowInputStatus_4() { ChipLogProgress(chipTool, "Media Input - Show Input Status Command: Sending command..."); - mOnFailureCallback_4 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandShowInputStatus_4_FailureResponse, this); - mOnSuccessCallback_4 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandShowInputStatus_4_SuccessResponse, this); - chip::Controller::MediaInputCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ShowInputStatus(mOnSuccessCallback_4->Cancel(), mOnFailureCallback_4->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_4; - delete mOnSuccessCallback_4; - } + err = cluster.ShowInputStatus(mOnSuccessCallback_4.Cancel(), mOnFailureCallback_4.Cancel()); return err; } @@ -3389,9 +2884,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3408,9 +2900,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3422,20 +2911,19 @@ class TV_MediaInputCluster : public TestCommand } // Test Rename Input Command - typedef void (*SuccessCallback_5)(void * context); - chip::Callback::Callback * mOnSuccessCallback_5 = nullptr; - chip::Callback::Callback * mOnFailureCallback_5 = nullptr; - bool mIsFailureExpected_5 = 0; + using SuccessCallback_5 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_5{ + OnTestSendClusterMediaInputCommandRenameInput_5_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_5{ + OnTestSendClusterMediaInputCommandRenameInput_5_FailureResponse, this + }; + bool mIsFailureExpected_5 = 0; CHIP_ERROR TestSendClusterMediaInputCommandRenameInput_5() { ChipLogProgress(chipTool, "Media Input - Rename Input Command: Sending command..."); - mOnFailureCallback_5 = new chip::Callback::Callback( - OnTestSendClusterMediaInputCommandRenameInput_5_FailureResponse, this); - mOnSuccessCallback_5 = - new chip::Callback::Callback(OnTestSendClusterMediaInputCommandRenameInput_5_SuccessResponse, this); - chip::Controller::MediaInputCluster cluster; cluster.Associate(mDevice, 1); @@ -3443,13 +2931,7 @@ class TV_MediaInputCluster : public TestCommand uint8_t indexArgument = 1; chip::ByteSpan nameArgument = chip::ByteSpan(chip::Uint8::from_const_char("newName"), strlen("newName")); - err = cluster.RenameInput(mOnSuccessCallback_5->Cancel(), mOnFailureCallback_5->Cancel(), indexArgument, nameArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_5; - delete mOnSuccessCallback_5; - } + err = cluster.RenameInput(mOnSuccessCallback_5.Cancel(), mOnFailureCallback_5.Cancel(), indexArgument, nameArgument); return err; } @@ -3460,9 +2942,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3479,9 +2958,6 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3839,32 +3315,24 @@ class TestCluster : public TestCommand // // Test Send Test Command - typedef void (*SuccessCallback_0)(void * context); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_0{ OnTestSendClusterTestClusterCommandTest_0_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterTestClusterCommandTest_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterTestClusterCommandTest_0() { ChipLogProgress(chipTool, "Test Cluster - Send Test Command: Sending command..."); - mOnFailureCallback_0 = - new chip::Callback::Callback(OnTestSendClusterTestClusterCommandTest_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterTestClusterCommandTest_0_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.Test(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.Test(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -3875,9 +3343,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3894,9 +3359,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3908,32 +3370,25 @@ class TestCluster : public TestCommand } // Test Send Test Not Handled Command - typedef void (*SuccessCallback_1)(void * context); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 1; + using SuccessCallback_1 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_1{ + OnTestSendClusterTestClusterCommandTestNotHandled_1_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterTestClusterCommandTestNotHandled_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 1; CHIP_ERROR TestSendClusterTestClusterCommandTestNotHandled_1() { ChipLogProgress(chipTool, "Test Cluster - Send Test Not Handled Command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandTestNotHandled_1_FailureResponse, this); - mOnSuccessCallback_1 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandTestNotHandled_1_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.TestNotHandled(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.TestNotHandled(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel()); return err; } @@ -3944,9 +3399,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -3963,9 +3415,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -3977,32 +3426,25 @@ class TestCluster : public TestCommand } // Test Send Test Specific Command - typedef void (*SuccessCallback_2)(void * context, uint8_t returnValue); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint8_t returnValue); + chip::Callback::Callback mOnSuccessCallback_2{ + OnTestSendClusterTestClusterCommandTestSpecific_2_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterTestClusterCommandTestSpecific_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterTestClusterCommandTestSpecific_2() { ChipLogProgress(chipTool, "Test Cluster - Send Test Specific Command: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandTestSpecific_2_FailureResponse, this); - mOnSuccessCallback_2 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandTestSpecific_2_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.TestSpecific(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.TestSpecific(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -4013,9 +3455,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4032,9 +3471,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4053,32 +3489,25 @@ class TestCluster : public TestCommand } // Test Read attribute BOOLEAN Default Value - typedef void (*SuccessCallback_3)(void * context, uint8_t boolean); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, uint8_t boolean); + chip::Callback::Callback mOnSuccessCallback_3{ + OnTestSendClusterTestClusterCommandReadAttribute_3_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterTestClusterCommandReadAttribute_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_3() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BOOLEAN Default Value: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_3_FailureResponse, this); - mOnSuccessCallback_3 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_3_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBoolean(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.ReadAttributeBoolean(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -4089,9 +3518,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4108,9 +3534,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4129,33 +3552,26 @@ class TestCluster : public TestCommand } // Test Write attribute BOOLEAN True - typedef void (*SuccessCallback_4)(void * context, uint8_t boolean); - chip::Callback::Callback * mOnSuccessCallback_4 = nullptr; - chip::Callback::Callback * mOnFailureCallback_4 = nullptr; - bool mIsFailureExpected_4 = 0; + using SuccessCallback_4 = void (*)(void * context, uint8_t boolean); + chip::Callback::Callback mOnSuccessCallback_4{ + OnTestSendClusterTestClusterCommandWriteAttribute_4_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_4{ + OnTestSendClusterTestClusterCommandWriteAttribute_4_FailureResponse, this + }; + bool mIsFailureExpected_4 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_4() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BOOLEAN True: Sending command..."); - mOnFailureCallback_4 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_4_FailureResponse, this); - mOnSuccessCallback_4 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_4_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t booleanArgument = 1; - err = cluster.WriteAttributeBoolean(mOnSuccessCallback_4->Cancel(), mOnFailureCallback_4->Cancel(), booleanArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_4; - delete mOnSuccessCallback_4; - } + err = cluster.WriteAttributeBoolean(mOnSuccessCallback_4.Cancel(), mOnFailureCallback_4.Cancel(), booleanArgument); return err; } @@ -4166,9 +3582,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4185,9 +3598,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4199,32 +3609,25 @@ class TestCluster : public TestCommand } // Test Read attribute BOOLEAN True - typedef void (*SuccessCallback_5)(void * context, uint8_t boolean); - chip::Callback::Callback * mOnSuccessCallback_5 = nullptr; - chip::Callback::Callback * mOnFailureCallback_5 = nullptr; - bool mIsFailureExpected_5 = 0; + using SuccessCallback_5 = void (*)(void * context, uint8_t boolean); + chip::Callback::Callback mOnSuccessCallback_5{ + OnTestSendClusterTestClusterCommandReadAttribute_5_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_5{ + OnTestSendClusterTestClusterCommandReadAttribute_5_FailureResponse, this + }; + bool mIsFailureExpected_5 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_5() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BOOLEAN True: Sending command..."); - mOnFailureCallback_5 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_5_FailureResponse, this); - mOnSuccessCallback_5 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_5_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBoolean(mOnSuccessCallback_5->Cancel(), mOnFailureCallback_5->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_5; - delete mOnSuccessCallback_5; - } + err = cluster.ReadAttributeBoolean(mOnSuccessCallback_5.Cancel(), mOnFailureCallback_5.Cancel()); return err; } @@ -4235,9 +3638,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4254,9 +3654,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4275,33 +3672,26 @@ class TestCluster : public TestCommand } // Test Write attribute BOOLEAN False - typedef void (*SuccessCallback_6)(void * context, uint8_t boolean); - chip::Callback::Callback * mOnSuccessCallback_6 = nullptr; - chip::Callback::Callback * mOnFailureCallback_6 = nullptr; - bool mIsFailureExpected_6 = 0; + using SuccessCallback_6 = void (*)(void * context, uint8_t boolean); + chip::Callback::Callback mOnSuccessCallback_6{ + OnTestSendClusterTestClusterCommandWriteAttribute_6_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_6{ + OnTestSendClusterTestClusterCommandWriteAttribute_6_FailureResponse, this + }; + bool mIsFailureExpected_6 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_6() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BOOLEAN False: Sending command..."); - mOnFailureCallback_6 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_6_FailureResponse, this); - mOnSuccessCallback_6 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_6_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t booleanArgument = 0; - err = cluster.WriteAttributeBoolean(mOnSuccessCallback_6->Cancel(), mOnFailureCallback_6->Cancel(), booleanArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_6; - delete mOnSuccessCallback_6; - } + err = cluster.WriteAttributeBoolean(mOnSuccessCallback_6.Cancel(), mOnFailureCallback_6.Cancel(), booleanArgument); return err; } @@ -4312,9 +3702,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4331,9 +3718,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4345,32 +3729,25 @@ class TestCluster : public TestCommand } // Test Read attribute BOOLEAN False - typedef void (*SuccessCallback_7)(void * context, uint8_t boolean); - chip::Callback::Callback * mOnSuccessCallback_7 = nullptr; - chip::Callback::Callback * mOnFailureCallback_7 = nullptr; - bool mIsFailureExpected_7 = 0; + using SuccessCallback_7 = void (*)(void * context, uint8_t boolean); + chip::Callback::Callback mOnSuccessCallback_7{ + OnTestSendClusterTestClusterCommandReadAttribute_7_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_7{ + OnTestSendClusterTestClusterCommandReadAttribute_7_FailureResponse, this + }; + bool mIsFailureExpected_7 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_7() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BOOLEAN False: Sending command..."); - mOnFailureCallback_7 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_7_FailureResponse, this); - mOnSuccessCallback_7 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_7_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBoolean(mOnSuccessCallback_7->Cancel(), mOnFailureCallback_7->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_7; - delete mOnSuccessCallback_7; - } + err = cluster.ReadAttributeBoolean(mOnSuccessCallback_7.Cancel(), mOnFailureCallback_7.Cancel()); return err; } @@ -4381,9 +3758,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4400,9 +3774,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4421,32 +3792,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP8 Default Value - typedef void (*SuccessCallback_8)(void * context, uint8_t bitmap8); - chip::Callback::Callback * mOnSuccessCallback_8 = nullptr; - chip::Callback::Callback * mOnFailureCallback_8 = nullptr; - bool mIsFailureExpected_8 = 0; + using SuccessCallback_8 = void (*)(void * context, uint8_t bitmap8); + chip::Callback::Callback mOnSuccessCallback_8{ + OnTestSendClusterTestClusterCommandReadAttribute_8_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_8{ + OnTestSendClusterTestClusterCommandReadAttribute_8_FailureResponse, this + }; + bool mIsFailureExpected_8 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_8() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP8 Default Value: Sending command..."); - mOnFailureCallback_8 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_8_FailureResponse, this); - mOnSuccessCallback_8 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_8_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap8(mOnSuccessCallback_8->Cancel(), mOnFailureCallback_8->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_8; - delete mOnSuccessCallback_8; - } + err = cluster.ReadAttributeBitmap8(mOnSuccessCallback_8.Cancel(), mOnFailureCallback_8.Cancel()); return err; } @@ -4457,9 +3821,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4476,9 +3837,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4497,33 +3855,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP8 Max Value - typedef void (*SuccessCallback_9)(void * context, uint8_t bitmap8); - chip::Callback::Callback * mOnSuccessCallback_9 = nullptr; - chip::Callback::Callback * mOnFailureCallback_9 = nullptr; - bool mIsFailureExpected_9 = 0; + using SuccessCallback_9 = void (*)(void * context, uint8_t bitmap8); + chip::Callback::Callback mOnSuccessCallback_9{ + OnTestSendClusterTestClusterCommandWriteAttribute_9_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_9{ + OnTestSendClusterTestClusterCommandWriteAttribute_9_FailureResponse, this + }; + bool mIsFailureExpected_9 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_9() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP8 Max Value: Sending command..."); - mOnFailureCallback_9 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_9_FailureResponse, this); - mOnSuccessCallback_9 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_9_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t bitmap8Argument = 255; - err = cluster.WriteAttributeBitmap8(mOnSuccessCallback_9->Cancel(), mOnFailureCallback_9->Cancel(), bitmap8Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_9; - delete mOnSuccessCallback_9; - } + err = cluster.WriteAttributeBitmap8(mOnSuccessCallback_9.Cancel(), mOnFailureCallback_9.Cancel(), bitmap8Argument); return err; } @@ -4534,9 +3885,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4553,9 +3901,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4567,32 +3912,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP8 Max Value - typedef void (*SuccessCallback_10)(void * context, uint8_t bitmap8); - chip::Callback::Callback * mOnSuccessCallback_10 = nullptr; - chip::Callback::Callback * mOnFailureCallback_10 = nullptr; - bool mIsFailureExpected_10 = 0; + using SuccessCallback_10 = void (*)(void * context, uint8_t bitmap8); + chip::Callback::Callback mOnSuccessCallback_10{ + OnTestSendClusterTestClusterCommandReadAttribute_10_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_10{ + OnTestSendClusterTestClusterCommandReadAttribute_10_FailureResponse, this + }; + bool mIsFailureExpected_10 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_10() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP8 Max Value: Sending command..."); - mOnFailureCallback_10 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_10_FailureResponse, this); - mOnSuccessCallback_10 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_10_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap8(mOnSuccessCallback_10->Cancel(), mOnFailureCallback_10->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_10; - delete mOnSuccessCallback_10; - } + err = cluster.ReadAttributeBitmap8(mOnSuccessCallback_10.Cancel(), mOnFailureCallback_10.Cancel()); return err; } @@ -4603,9 +3941,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4622,9 +3957,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4643,33 +3975,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP8 Min Value - typedef void (*SuccessCallback_11)(void * context, uint8_t bitmap8); - chip::Callback::Callback * mOnSuccessCallback_11 = nullptr; - chip::Callback::Callback * mOnFailureCallback_11 = nullptr; - bool mIsFailureExpected_11 = 0; + using SuccessCallback_11 = void (*)(void * context, uint8_t bitmap8); + chip::Callback::Callback mOnSuccessCallback_11{ + OnTestSendClusterTestClusterCommandWriteAttribute_11_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_11{ + OnTestSendClusterTestClusterCommandWriteAttribute_11_FailureResponse, this + }; + bool mIsFailureExpected_11 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_11() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP8 Min Value: Sending command..."); - mOnFailureCallback_11 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_11_FailureResponse, this); - mOnSuccessCallback_11 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_11_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t bitmap8Argument = 0; - err = cluster.WriteAttributeBitmap8(mOnSuccessCallback_11->Cancel(), mOnFailureCallback_11->Cancel(), bitmap8Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_11; - delete mOnSuccessCallback_11; - } + err = cluster.WriteAttributeBitmap8(mOnSuccessCallback_11.Cancel(), mOnFailureCallback_11.Cancel(), bitmap8Argument); return err; } @@ -4680,9 +4005,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (runner->mIsFailureExpected_11 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4699,9 +4021,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (runner->mIsFailureExpected_11 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4713,32 +4032,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP8 Min Value - typedef void (*SuccessCallback_12)(void * context, uint8_t bitmap8); - chip::Callback::Callback * mOnSuccessCallback_12 = nullptr; - chip::Callback::Callback * mOnFailureCallback_12 = nullptr; - bool mIsFailureExpected_12 = 0; + using SuccessCallback_12 = void (*)(void * context, uint8_t bitmap8); + chip::Callback::Callback mOnSuccessCallback_12{ + OnTestSendClusterTestClusterCommandReadAttribute_12_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_12{ + OnTestSendClusterTestClusterCommandReadAttribute_12_FailureResponse, this + }; + bool mIsFailureExpected_12 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_12() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP8 Min Value: Sending command..."); - mOnFailureCallback_12 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_12_FailureResponse, this); - mOnSuccessCallback_12 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_12_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap8(mOnSuccessCallback_12->Cancel(), mOnFailureCallback_12->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_12; - delete mOnSuccessCallback_12; - } + err = cluster.ReadAttributeBitmap8(mOnSuccessCallback_12.Cancel(), mOnFailureCallback_12.Cancel()); return err; } @@ -4749,9 +4061,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_12; - delete runner->mOnSuccessCallback_12; - if (runner->mIsFailureExpected_12 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4768,9 +4077,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_12; - delete runner->mOnSuccessCallback_12; - if (runner->mIsFailureExpected_12 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4789,32 +4095,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP16 Default Value - typedef void (*SuccessCallback_13)(void * context, uint16_t bitmap16); - chip::Callback::Callback * mOnSuccessCallback_13 = nullptr; - chip::Callback::Callback * mOnFailureCallback_13 = nullptr; - bool mIsFailureExpected_13 = 0; + using SuccessCallback_13 = void (*)(void * context, uint16_t bitmap16); + chip::Callback::Callback mOnSuccessCallback_13{ + OnTestSendClusterTestClusterCommandReadAttribute_13_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_13{ + OnTestSendClusterTestClusterCommandReadAttribute_13_FailureResponse, this + }; + bool mIsFailureExpected_13 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_13() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP16 Default Value: Sending command..."); - mOnFailureCallback_13 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_13_FailureResponse, this); - mOnSuccessCallback_13 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_13_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap16(mOnSuccessCallback_13->Cancel(), mOnFailureCallback_13->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_13; - delete mOnSuccessCallback_13; - } + err = cluster.ReadAttributeBitmap16(mOnSuccessCallback_13.Cancel(), mOnFailureCallback_13.Cancel()); return err; } @@ -4825,9 +4124,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_13; - delete runner->mOnSuccessCallback_13; - if (runner->mIsFailureExpected_13 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4844,9 +4140,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_13; - delete runner->mOnSuccessCallback_13; - if (runner->mIsFailureExpected_13 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4865,33 +4158,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP16 Max Value - typedef void (*SuccessCallback_14)(void * context, uint16_t bitmap16); - chip::Callback::Callback * mOnSuccessCallback_14 = nullptr; - chip::Callback::Callback * mOnFailureCallback_14 = nullptr; - bool mIsFailureExpected_14 = 0; + using SuccessCallback_14 = void (*)(void * context, uint16_t bitmap16); + chip::Callback::Callback mOnSuccessCallback_14{ + OnTestSendClusterTestClusterCommandWriteAttribute_14_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_14{ + OnTestSendClusterTestClusterCommandWriteAttribute_14_FailureResponse, this + }; + bool mIsFailureExpected_14 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_14() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP16 Max Value: Sending command..."); - mOnFailureCallback_14 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_14_FailureResponse, this); - mOnSuccessCallback_14 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_14_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t bitmap16Argument = 65535U; - err = cluster.WriteAttributeBitmap16(mOnSuccessCallback_14->Cancel(), mOnFailureCallback_14->Cancel(), bitmap16Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_14; - delete mOnSuccessCallback_14; - } + err = cluster.WriteAttributeBitmap16(mOnSuccessCallback_14.Cancel(), mOnFailureCallback_14.Cancel(), bitmap16Argument); return err; } @@ -4902,9 +4188,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_14; - delete runner->mOnSuccessCallback_14; - if (runner->mIsFailureExpected_14 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4921,9 +4204,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_14; - delete runner->mOnSuccessCallback_14; - if (runner->mIsFailureExpected_14 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -4935,32 +4215,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP16 Max Value - typedef void (*SuccessCallback_15)(void * context, uint16_t bitmap16); - chip::Callback::Callback * mOnSuccessCallback_15 = nullptr; - chip::Callback::Callback * mOnFailureCallback_15 = nullptr; - bool mIsFailureExpected_15 = 0; + using SuccessCallback_15 = void (*)(void * context, uint16_t bitmap16); + chip::Callback::Callback mOnSuccessCallback_15{ + OnTestSendClusterTestClusterCommandReadAttribute_15_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_15{ + OnTestSendClusterTestClusterCommandReadAttribute_15_FailureResponse, this + }; + bool mIsFailureExpected_15 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_15() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP16 Max Value: Sending command..."); - mOnFailureCallback_15 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_15_FailureResponse, this); - mOnSuccessCallback_15 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_15_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap16(mOnSuccessCallback_15->Cancel(), mOnFailureCallback_15->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_15; - delete mOnSuccessCallback_15; - } + err = cluster.ReadAttributeBitmap16(mOnSuccessCallback_15.Cancel(), mOnFailureCallback_15.Cancel()); return err; } @@ -4971,9 +4244,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_15; - delete runner->mOnSuccessCallback_15; - if (runner->mIsFailureExpected_15 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -4990,9 +4260,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_15; - delete runner->mOnSuccessCallback_15; - if (runner->mIsFailureExpected_15 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5011,33 +4278,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP16 Min Value - typedef void (*SuccessCallback_16)(void * context, uint16_t bitmap16); - chip::Callback::Callback * mOnSuccessCallback_16 = nullptr; - chip::Callback::Callback * mOnFailureCallback_16 = nullptr; - bool mIsFailureExpected_16 = 0; + using SuccessCallback_16 = void (*)(void * context, uint16_t bitmap16); + chip::Callback::Callback mOnSuccessCallback_16{ + OnTestSendClusterTestClusterCommandWriteAttribute_16_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_16{ + OnTestSendClusterTestClusterCommandWriteAttribute_16_FailureResponse, this + }; + bool mIsFailureExpected_16 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_16() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP16 Min Value: Sending command..."); - mOnFailureCallback_16 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_16_FailureResponse, this); - mOnSuccessCallback_16 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_16_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t bitmap16Argument = 0U; - err = cluster.WriteAttributeBitmap16(mOnSuccessCallback_16->Cancel(), mOnFailureCallback_16->Cancel(), bitmap16Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_16; - delete mOnSuccessCallback_16; - } + err = cluster.WriteAttributeBitmap16(mOnSuccessCallback_16.Cancel(), mOnFailureCallback_16.Cancel(), bitmap16Argument); return err; } @@ -5048,9 +4308,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_16; - delete runner->mOnSuccessCallback_16; - if (runner->mIsFailureExpected_16 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5067,9 +4324,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_16; - delete runner->mOnSuccessCallback_16; - if (runner->mIsFailureExpected_16 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5081,32 +4335,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP16 Min Value - typedef void (*SuccessCallback_17)(void * context, uint16_t bitmap16); - chip::Callback::Callback * mOnSuccessCallback_17 = nullptr; - chip::Callback::Callback * mOnFailureCallback_17 = nullptr; - bool mIsFailureExpected_17 = 0; + using SuccessCallback_17 = void (*)(void * context, uint16_t bitmap16); + chip::Callback::Callback mOnSuccessCallback_17{ + OnTestSendClusterTestClusterCommandReadAttribute_17_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_17{ + OnTestSendClusterTestClusterCommandReadAttribute_17_FailureResponse, this + }; + bool mIsFailureExpected_17 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_17() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP16 Min Value: Sending command..."); - mOnFailureCallback_17 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_17_FailureResponse, this); - mOnSuccessCallback_17 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_17_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap16(mOnSuccessCallback_17->Cancel(), mOnFailureCallback_17->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_17; - delete mOnSuccessCallback_17; - } + err = cluster.ReadAttributeBitmap16(mOnSuccessCallback_17.Cancel(), mOnFailureCallback_17.Cancel()); return err; } @@ -5117,9 +4364,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_17; - delete runner->mOnSuccessCallback_17; - if (runner->mIsFailureExpected_17 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5136,9 +4380,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_17; - delete runner->mOnSuccessCallback_17; - if (runner->mIsFailureExpected_17 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5157,32 +4398,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP32 Default Value - typedef void (*SuccessCallback_18)(void * context, uint32_t bitmap32); - chip::Callback::Callback * mOnSuccessCallback_18 = nullptr; - chip::Callback::Callback * mOnFailureCallback_18 = nullptr; - bool mIsFailureExpected_18 = 0; + using SuccessCallback_18 = void (*)(void * context, uint32_t bitmap32); + chip::Callback::Callback mOnSuccessCallback_18{ + OnTestSendClusterTestClusterCommandReadAttribute_18_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_18{ + OnTestSendClusterTestClusterCommandReadAttribute_18_FailureResponse, this + }; + bool mIsFailureExpected_18 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_18() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP32 Default Value: Sending command..."); - mOnFailureCallback_18 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_18_FailureResponse, this); - mOnSuccessCallback_18 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_18_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap32(mOnSuccessCallback_18->Cancel(), mOnFailureCallback_18->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_18; - delete mOnSuccessCallback_18; - } + err = cluster.ReadAttributeBitmap32(mOnSuccessCallback_18.Cancel(), mOnFailureCallback_18.Cancel()); return err; } @@ -5193,9 +4427,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_18; - delete runner->mOnSuccessCallback_18; - if (runner->mIsFailureExpected_18 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5212,9 +4443,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_18; - delete runner->mOnSuccessCallback_18; - if (runner->mIsFailureExpected_18 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5233,33 +4461,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP32 Max Value - typedef void (*SuccessCallback_19)(void * context, uint32_t bitmap32); - chip::Callback::Callback * mOnSuccessCallback_19 = nullptr; - chip::Callback::Callback * mOnFailureCallback_19 = nullptr; - bool mIsFailureExpected_19 = 0; + using SuccessCallback_19 = void (*)(void * context, uint32_t bitmap32); + chip::Callback::Callback mOnSuccessCallback_19{ + OnTestSendClusterTestClusterCommandWriteAttribute_19_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_19{ + OnTestSendClusterTestClusterCommandWriteAttribute_19_FailureResponse, this + }; + bool mIsFailureExpected_19 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_19() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP32 Max Value: Sending command..."); - mOnFailureCallback_19 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_19_FailureResponse, this); - mOnSuccessCallback_19 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_19_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint32_t bitmap32Argument = 4294967295UL; - err = cluster.WriteAttributeBitmap32(mOnSuccessCallback_19->Cancel(), mOnFailureCallback_19->Cancel(), bitmap32Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_19; - delete mOnSuccessCallback_19; - } + err = cluster.WriteAttributeBitmap32(mOnSuccessCallback_19.Cancel(), mOnFailureCallback_19.Cancel(), bitmap32Argument); return err; } @@ -5270,9 +4491,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_19; - delete runner->mOnSuccessCallback_19; - if (runner->mIsFailureExpected_19 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5289,9 +4507,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_19; - delete runner->mOnSuccessCallback_19; - if (runner->mIsFailureExpected_19 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5303,32 +4518,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP32 Max Value - typedef void (*SuccessCallback_20)(void * context, uint32_t bitmap32); - chip::Callback::Callback * mOnSuccessCallback_20 = nullptr; - chip::Callback::Callback * mOnFailureCallback_20 = nullptr; - bool mIsFailureExpected_20 = 0; + using SuccessCallback_20 = void (*)(void * context, uint32_t bitmap32); + chip::Callback::Callback mOnSuccessCallback_20{ + OnTestSendClusterTestClusterCommandReadAttribute_20_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_20{ + OnTestSendClusterTestClusterCommandReadAttribute_20_FailureResponse, this + }; + bool mIsFailureExpected_20 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_20() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP32 Max Value: Sending command..."); - mOnFailureCallback_20 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_20_FailureResponse, this); - mOnSuccessCallback_20 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_20_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap32(mOnSuccessCallback_20->Cancel(), mOnFailureCallback_20->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_20; - delete mOnSuccessCallback_20; - } + err = cluster.ReadAttributeBitmap32(mOnSuccessCallback_20.Cancel(), mOnFailureCallback_20.Cancel()); return err; } @@ -5339,9 +4547,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_20; - delete runner->mOnSuccessCallback_20; - if (runner->mIsFailureExpected_20 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5358,9 +4563,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_20; - delete runner->mOnSuccessCallback_20; - if (runner->mIsFailureExpected_20 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5379,33 +4581,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP32 Min Value - typedef void (*SuccessCallback_21)(void * context, uint32_t bitmap32); - chip::Callback::Callback * mOnSuccessCallback_21 = nullptr; - chip::Callback::Callback * mOnFailureCallback_21 = nullptr; - bool mIsFailureExpected_21 = 0; + using SuccessCallback_21 = void (*)(void * context, uint32_t bitmap32); + chip::Callback::Callback mOnSuccessCallback_21{ + OnTestSendClusterTestClusterCommandWriteAttribute_21_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_21{ + OnTestSendClusterTestClusterCommandWriteAttribute_21_FailureResponse, this + }; + bool mIsFailureExpected_21 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_21() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP32 Min Value: Sending command..."); - mOnFailureCallback_21 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_21_FailureResponse, this); - mOnSuccessCallback_21 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_21_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint32_t bitmap32Argument = 0UL; - err = cluster.WriteAttributeBitmap32(mOnSuccessCallback_21->Cancel(), mOnFailureCallback_21->Cancel(), bitmap32Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_21; - delete mOnSuccessCallback_21; - } + err = cluster.WriteAttributeBitmap32(mOnSuccessCallback_21.Cancel(), mOnFailureCallback_21.Cancel(), bitmap32Argument); return err; } @@ -5416,9 +4611,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_21; - delete runner->mOnSuccessCallback_21; - if (runner->mIsFailureExpected_21 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5435,9 +4627,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_21; - delete runner->mOnSuccessCallback_21; - if (runner->mIsFailureExpected_21 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5449,32 +4638,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP32 Min Value - typedef void (*SuccessCallback_22)(void * context, uint32_t bitmap32); - chip::Callback::Callback * mOnSuccessCallback_22 = nullptr; - chip::Callback::Callback * mOnFailureCallback_22 = nullptr; - bool mIsFailureExpected_22 = 0; + using SuccessCallback_22 = void (*)(void * context, uint32_t bitmap32); + chip::Callback::Callback mOnSuccessCallback_22{ + OnTestSendClusterTestClusterCommandReadAttribute_22_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_22{ + OnTestSendClusterTestClusterCommandReadAttribute_22_FailureResponse, this + }; + bool mIsFailureExpected_22 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_22() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP32 Min Value: Sending command..."); - mOnFailureCallback_22 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_22_FailureResponse, this); - mOnSuccessCallback_22 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_22_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap32(mOnSuccessCallback_22->Cancel(), mOnFailureCallback_22->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_22; - delete mOnSuccessCallback_22; - } + err = cluster.ReadAttributeBitmap32(mOnSuccessCallback_22.Cancel(), mOnFailureCallback_22.Cancel()); return err; } @@ -5485,9 +4667,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_22; - delete runner->mOnSuccessCallback_22; - if (runner->mIsFailureExpected_22 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5504,9 +4683,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_22; - delete runner->mOnSuccessCallback_22; - if (runner->mIsFailureExpected_22 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5525,32 +4701,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP64 Default Value - typedef void (*SuccessCallback_23)(void * context, uint64_t bitmap64); - chip::Callback::Callback * mOnSuccessCallback_23 = nullptr; - chip::Callback::Callback * mOnFailureCallback_23 = nullptr; - bool mIsFailureExpected_23 = 0; + using SuccessCallback_23 = void (*)(void * context, uint64_t bitmap64); + chip::Callback::Callback mOnSuccessCallback_23{ + OnTestSendClusterTestClusterCommandReadAttribute_23_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_23{ + OnTestSendClusterTestClusterCommandReadAttribute_23_FailureResponse, this + }; + bool mIsFailureExpected_23 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_23() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP64 Default Value: Sending command..."); - mOnFailureCallback_23 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_23_FailureResponse, this); - mOnSuccessCallback_23 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_23_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap64(mOnSuccessCallback_23->Cancel(), mOnFailureCallback_23->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_23; - delete mOnSuccessCallback_23; - } + err = cluster.ReadAttributeBitmap64(mOnSuccessCallback_23.Cancel(), mOnFailureCallback_23.Cancel()); return err; } @@ -5561,9 +4730,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_23; - delete runner->mOnSuccessCallback_23; - if (runner->mIsFailureExpected_23 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5580,9 +4746,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_23; - delete runner->mOnSuccessCallback_23; - if (runner->mIsFailureExpected_23 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5601,33 +4764,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP64 Max Value - typedef void (*SuccessCallback_24)(void * context, uint64_t bitmap64); - chip::Callback::Callback * mOnSuccessCallback_24 = nullptr; - chip::Callback::Callback * mOnFailureCallback_24 = nullptr; - bool mIsFailureExpected_24 = 0; + using SuccessCallback_24 = void (*)(void * context, uint64_t bitmap64); + chip::Callback::Callback mOnSuccessCallback_24{ + OnTestSendClusterTestClusterCommandWriteAttribute_24_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_24{ + OnTestSendClusterTestClusterCommandWriteAttribute_24_FailureResponse, this + }; + bool mIsFailureExpected_24 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_24() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP64 Max Value: Sending command..."); - mOnFailureCallback_24 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_24_FailureResponse, this); - mOnSuccessCallback_24 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_24_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint64_t bitmap64Argument = 18446744073709551615ULL; - err = cluster.WriteAttributeBitmap64(mOnSuccessCallback_24->Cancel(), mOnFailureCallback_24->Cancel(), bitmap64Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_24; - delete mOnSuccessCallback_24; - } + err = cluster.WriteAttributeBitmap64(mOnSuccessCallback_24.Cancel(), mOnFailureCallback_24.Cancel(), bitmap64Argument); return err; } @@ -5638,9 +4794,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_24; - delete runner->mOnSuccessCallback_24; - if (runner->mIsFailureExpected_24 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5657,9 +4810,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_24; - delete runner->mOnSuccessCallback_24; - if (runner->mIsFailureExpected_24 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5671,32 +4821,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP64 Max Value - typedef void (*SuccessCallback_25)(void * context, uint64_t bitmap64); - chip::Callback::Callback * mOnSuccessCallback_25 = nullptr; - chip::Callback::Callback * mOnFailureCallback_25 = nullptr; - bool mIsFailureExpected_25 = 0; + using SuccessCallback_25 = void (*)(void * context, uint64_t bitmap64); + chip::Callback::Callback mOnSuccessCallback_25{ + OnTestSendClusterTestClusterCommandReadAttribute_25_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_25{ + OnTestSendClusterTestClusterCommandReadAttribute_25_FailureResponse, this + }; + bool mIsFailureExpected_25 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_25() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP64 Max Value: Sending command..."); - mOnFailureCallback_25 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_25_FailureResponse, this); - mOnSuccessCallback_25 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_25_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap64(mOnSuccessCallback_25->Cancel(), mOnFailureCallback_25->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_25; - delete mOnSuccessCallback_25; - } + err = cluster.ReadAttributeBitmap64(mOnSuccessCallback_25.Cancel(), mOnFailureCallback_25.Cancel()); return err; } @@ -5707,9 +4850,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_25; - delete runner->mOnSuccessCallback_25; - if (runner->mIsFailureExpected_25 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5726,9 +4866,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_25; - delete runner->mOnSuccessCallback_25; - if (runner->mIsFailureExpected_25 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5747,33 +4884,26 @@ class TestCluster : public TestCommand } // Test Write attribute BITMAP64 Min Value - typedef void (*SuccessCallback_26)(void * context, uint64_t bitmap64); - chip::Callback::Callback * mOnSuccessCallback_26 = nullptr; - chip::Callback::Callback * mOnFailureCallback_26 = nullptr; - bool mIsFailureExpected_26 = 0; + using SuccessCallback_26 = void (*)(void * context, uint64_t bitmap64); + chip::Callback::Callback mOnSuccessCallback_26{ + OnTestSendClusterTestClusterCommandWriteAttribute_26_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_26{ + OnTestSendClusterTestClusterCommandWriteAttribute_26_FailureResponse, this + }; + bool mIsFailureExpected_26 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_26() { ChipLogProgress(chipTool, "Test Cluster - Write attribute BITMAP64 Min Value: Sending command..."); - mOnFailureCallback_26 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_26_FailureResponse, this); - mOnSuccessCallback_26 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_26_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint64_t bitmap64Argument = 0ULL; - err = cluster.WriteAttributeBitmap64(mOnSuccessCallback_26->Cancel(), mOnFailureCallback_26->Cancel(), bitmap64Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_26; - delete mOnSuccessCallback_26; - } + err = cluster.WriteAttributeBitmap64(mOnSuccessCallback_26.Cancel(), mOnFailureCallback_26.Cancel(), bitmap64Argument); return err; } @@ -5784,9 +4914,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_26; - delete runner->mOnSuccessCallback_26; - if (runner->mIsFailureExpected_26 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5803,9 +4930,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_26; - delete runner->mOnSuccessCallback_26; - if (runner->mIsFailureExpected_26 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5817,32 +4941,25 @@ class TestCluster : public TestCommand } // Test Read attribute BITMAP64 Min Value - typedef void (*SuccessCallback_27)(void * context, uint64_t bitmap64); - chip::Callback::Callback * mOnSuccessCallback_27 = nullptr; - chip::Callback::Callback * mOnFailureCallback_27 = nullptr; - bool mIsFailureExpected_27 = 0; + using SuccessCallback_27 = void (*)(void * context, uint64_t bitmap64); + chip::Callback::Callback mOnSuccessCallback_27{ + OnTestSendClusterTestClusterCommandReadAttribute_27_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_27{ + OnTestSendClusterTestClusterCommandReadAttribute_27_FailureResponse, this + }; + bool mIsFailureExpected_27 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_27() { ChipLogProgress(chipTool, "Test Cluster - Read attribute BITMAP64 Min Value: Sending command..."); - mOnFailureCallback_27 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_27_FailureResponse, this); - mOnSuccessCallback_27 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_27_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeBitmap64(mOnSuccessCallback_27->Cancel(), mOnFailureCallback_27->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_27; - delete mOnSuccessCallback_27; - } + err = cluster.ReadAttributeBitmap64(mOnSuccessCallback_27.Cancel(), mOnFailureCallback_27.Cancel()); return err; } @@ -5853,9 +4970,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_27; - delete runner->mOnSuccessCallback_27; - if (runner->mIsFailureExpected_27 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5872,9 +4986,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_27; - delete runner->mOnSuccessCallback_27; - if (runner->mIsFailureExpected_27 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5893,32 +5004,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT8U Default Value - typedef void (*SuccessCallback_28)(void * context, uint8_t int8u); - chip::Callback::Callback * mOnSuccessCallback_28 = nullptr; - chip::Callback::Callback * mOnFailureCallback_28 = nullptr; - bool mIsFailureExpected_28 = 0; + using SuccessCallback_28 = void (*)(void * context, uint8_t int8u); + chip::Callback::Callback mOnSuccessCallback_28{ + OnTestSendClusterTestClusterCommandReadAttribute_28_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_28{ + OnTestSendClusterTestClusterCommandReadAttribute_28_FailureResponse, this + }; + bool mIsFailureExpected_28 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_28() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT8U Default Value: Sending command..."); - mOnFailureCallback_28 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_28_FailureResponse, this); - mOnSuccessCallback_28 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_28_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt8u(mOnSuccessCallback_28->Cancel(), mOnFailureCallback_28->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_28; - delete mOnSuccessCallback_28; - } + err = cluster.ReadAttributeInt8u(mOnSuccessCallback_28.Cancel(), mOnFailureCallback_28.Cancel()); return err; } @@ -5929,9 +5033,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_28; - delete runner->mOnSuccessCallback_28; - if (runner->mIsFailureExpected_28 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -5948,9 +5049,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_28; - delete runner->mOnSuccessCallback_28; - if (runner->mIsFailureExpected_28 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -5969,33 +5067,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT8U Max Value - typedef void (*SuccessCallback_29)(void * context, uint8_t int8u); - chip::Callback::Callback * mOnSuccessCallback_29 = nullptr; - chip::Callback::Callback * mOnFailureCallback_29 = nullptr; - bool mIsFailureExpected_29 = 0; + using SuccessCallback_29 = void (*)(void * context, uint8_t int8u); + chip::Callback::Callback mOnSuccessCallback_29{ + OnTestSendClusterTestClusterCommandWriteAttribute_29_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_29{ + OnTestSendClusterTestClusterCommandWriteAttribute_29_FailureResponse, this + }; + bool mIsFailureExpected_29 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_29() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT8U Max Value: Sending command..."); - mOnFailureCallback_29 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_29_FailureResponse, this); - mOnSuccessCallback_29 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_29_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t int8uArgument = 255; - err = cluster.WriteAttributeInt8u(mOnSuccessCallback_29->Cancel(), mOnFailureCallback_29->Cancel(), int8uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_29; - delete mOnSuccessCallback_29; - } + err = cluster.WriteAttributeInt8u(mOnSuccessCallback_29.Cancel(), mOnFailureCallback_29.Cancel(), int8uArgument); return err; } @@ -6006,9 +5097,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_29; - delete runner->mOnSuccessCallback_29; - if (runner->mIsFailureExpected_29 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6025,9 +5113,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_29; - delete runner->mOnSuccessCallback_29; - if (runner->mIsFailureExpected_29 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6039,32 +5124,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT8U Max Value - typedef void (*SuccessCallback_30)(void * context, uint8_t int8u); - chip::Callback::Callback * mOnSuccessCallback_30 = nullptr; - chip::Callback::Callback * mOnFailureCallback_30 = nullptr; - bool mIsFailureExpected_30 = 0; + using SuccessCallback_30 = void (*)(void * context, uint8_t int8u); + chip::Callback::Callback mOnSuccessCallback_30{ + OnTestSendClusterTestClusterCommandReadAttribute_30_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_30{ + OnTestSendClusterTestClusterCommandReadAttribute_30_FailureResponse, this + }; + bool mIsFailureExpected_30 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_30() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT8U Max Value: Sending command..."); - mOnFailureCallback_30 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_30_FailureResponse, this); - mOnSuccessCallback_30 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_30_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt8u(mOnSuccessCallback_30->Cancel(), mOnFailureCallback_30->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_30; - delete mOnSuccessCallback_30; - } + err = cluster.ReadAttributeInt8u(mOnSuccessCallback_30.Cancel(), mOnFailureCallback_30.Cancel()); return err; } @@ -6075,9 +5153,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_30; - delete runner->mOnSuccessCallback_30; - if (runner->mIsFailureExpected_30 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6094,9 +5169,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_30; - delete runner->mOnSuccessCallback_30; - if (runner->mIsFailureExpected_30 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6115,33 +5187,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT8U Min Value - typedef void (*SuccessCallback_31)(void * context, uint8_t int8u); - chip::Callback::Callback * mOnSuccessCallback_31 = nullptr; - chip::Callback::Callback * mOnFailureCallback_31 = nullptr; - bool mIsFailureExpected_31 = 0; + using SuccessCallback_31 = void (*)(void * context, uint8_t int8u); + chip::Callback::Callback mOnSuccessCallback_31{ + OnTestSendClusterTestClusterCommandWriteAttribute_31_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_31{ + OnTestSendClusterTestClusterCommandWriteAttribute_31_FailureResponse, this + }; + bool mIsFailureExpected_31 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_31() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT8U Min Value: Sending command..."); - mOnFailureCallback_31 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_31_FailureResponse, this); - mOnSuccessCallback_31 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_31_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t int8uArgument = 0; - err = cluster.WriteAttributeInt8u(mOnSuccessCallback_31->Cancel(), mOnFailureCallback_31->Cancel(), int8uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_31; - delete mOnSuccessCallback_31; - } + err = cluster.WriteAttributeInt8u(mOnSuccessCallback_31.Cancel(), mOnFailureCallback_31.Cancel(), int8uArgument); return err; } @@ -6152,9 +5217,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_31; - delete runner->mOnSuccessCallback_31; - if (runner->mIsFailureExpected_31 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6171,9 +5233,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_31; - delete runner->mOnSuccessCallback_31; - if (runner->mIsFailureExpected_31 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6185,32 +5244,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT8U Min Value - typedef void (*SuccessCallback_32)(void * context, uint8_t int8u); - chip::Callback::Callback * mOnSuccessCallback_32 = nullptr; - chip::Callback::Callback * mOnFailureCallback_32 = nullptr; - bool mIsFailureExpected_32 = 0; + using SuccessCallback_32 = void (*)(void * context, uint8_t int8u); + chip::Callback::Callback mOnSuccessCallback_32{ + OnTestSendClusterTestClusterCommandReadAttribute_32_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_32{ + OnTestSendClusterTestClusterCommandReadAttribute_32_FailureResponse, this + }; + bool mIsFailureExpected_32 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_32() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT8U Min Value: Sending command..."); - mOnFailureCallback_32 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_32_FailureResponse, this); - mOnSuccessCallback_32 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_32_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt8u(mOnSuccessCallback_32->Cancel(), mOnFailureCallback_32->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_32; - delete mOnSuccessCallback_32; - } + err = cluster.ReadAttributeInt8u(mOnSuccessCallback_32.Cancel(), mOnFailureCallback_32.Cancel()); return err; } @@ -6221,9 +5273,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_32; - delete runner->mOnSuccessCallback_32; - if (runner->mIsFailureExpected_32 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6240,9 +5289,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_32; - delete runner->mOnSuccessCallback_32; - if (runner->mIsFailureExpected_32 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6261,32 +5307,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT16U Default Value - typedef void (*SuccessCallback_33)(void * context, uint16_t int16u); - chip::Callback::Callback * mOnSuccessCallback_33 = nullptr; - chip::Callback::Callback * mOnFailureCallback_33 = nullptr; - bool mIsFailureExpected_33 = 0; + using SuccessCallback_33 = void (*)(void * context, uint16_t int16u); + chip::Callback::Callback mOnSuccessCallback_33{ + OnTestSendClusterTestClusterCommandReadAttribute_33_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_33{ + OnTestSendClusterTestClusterCommandReadAttribute_33_FailureResponse, this + }; + bool mIsFailureExpected_33 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_33() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT16U Default Value: Sending command..."); - mOnFailureCallback_33 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_33_FailureResponse, this); - mOnSuccessCallback_33 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_33_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt16u(mOnSuccessCallback_33->Cancel(), mOnFailureCallback_33->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_33; - delete mOnSuccessCallback_33; - } + err = cluster.ReadAttributeInt16u(mOnSuccessCallback_33.Cancel(), mOnFailureCallback_33.Cancel()); return err; } @@ -6297,9 +5336,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_33; - delete runner->mOnSuccessCallback_33; - if (runner->mIsFailureExpected_33 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6316,9 +5352,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_33; - delete runner->mOnSuccessCallback_33; - if (runner->mIsFailureExpected_33 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6337,33 +5370,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT16U Max Value - typedef void (*SuccessCallback_34)(void * context, uint16_t int16u); - chip::Callback::Callback * mOnSuccessCallback_34 = nullptr; - chip::Callback::Callback * mOnFailureCallback_34 = nullptr; - bool mIsFailureExpected_34 = 0; + using SuccessCallback_34 = void (*)(void * context, uint16_t int16u); + chip::Callback::Callback mOnSuccessCallback_34{ + OnTestSendClusterTestClusterCommandWriteAttribute_34_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_34{ + OnTestSendClusterTestClusterCommandWriteAttribute_34_FailureResponse, this + }; + bool mIsFailureExpected_34 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_34() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT16U Max Value: Sending command..."); - mOnFailureCallback_34 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_34_FailureResponse, this); - mOnSuccessCallback_34 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_34_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t int16uArgument = 65535U; - err = cluster.WriteAttributeInt16u(mOnSuccessCallback_34->Cancel(), mOnFailureCallback_34->Cancel(), int16uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_34; - delete mOnSuccessCallback_34; - } + err = cluster.WriteAttributeInt16u(mOnSuccessCallback_34.Cancel(), mOnFailureCallback_34.Cancel(), int16uArgument); return err; } @@ -6374,9 +5400,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_34; - delete runner->mOnSuccessCallback_34; - if (runner->mIsFailureExpected_34 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6393,9 +5416,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_34; - delete runner->mOnSuccessCallback_34; - if (runner->mIsFailureExpected_34 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6407,32 +5427,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT16U Max Value - typedef void (*SuccessCallback_35)(void * context, uint16_t int16u); - chip::Callback::Callback * mOnSuccessCallback_35 = nullptr; - chip::Callback::Callback * mOnFailureCallback_35 = nullptr; - bool mIsFailureExpected_35 = 0; + using SuccessCallback_35 = void (*)(void * context, uint16_t int16u); + chip::Callback::Callback mOnSuccessCallback_35{ + OnTestSendClusterTestClusterCommandReadAttribute_35_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_35{ + OnTestSendClusterTestClusterCommandReadAttribute_35_FailureResponse, this + }; + bool mIsFailureExpected_35 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_35() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT16U Max Value: Sending command..."); - mOnFailureCallback_35 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_35_FailureResponse, this); - mOnSuccessCallback_35 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_35_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt16u(mOnSuccessCallback_35->Cancel(), mOnFailureCallback_35->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_35; - delete mOnSuccessCallback_35; - } + err = cluster.ReadAttributeInt16u(mOnSuccessCallback_35.Cancel(), mOnFailureCallback_35.Cancel()); return err; } @@ -6443,9 +5456,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_35; - delete runner->mOnSuccessCallback_35; - if (runner->mIsFailureExpected_35 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6462,9 +5472,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_35; - delete runner->mOnSuccessCallback_35; - if (runner->mIsFailureExpected_35 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6483,33 +5490,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT16U Min Value - typedef void (*SuccessCallback_36)(void * context, uint16_t int16u); - chip::Callback::Callback * mOnSuccessCallback_36 = nullptr; - chip::Callback::Callback * mOnFailureCallback_36 = nullptr; - bool mIsFailureExpected_36 = 0; + using SuccessCallback_36 = void (*)(void * context, uint16_t int16u); + chip::Callback::Callback mOnSuccessCallback_36{ + OnTestSendClusterTestClusterCommandWriteAttribute_36_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_36{ + OnTestSendClusterTestClusterCommandWriteAttribute_36_FailureResponse, this + }; + bool mIsFailureExpected_36 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_36() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT16U Min Value: Sending command..."); - mOnFailureCallback_36 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_36_FailureResponse, this); - mOnSuccessCallback_36 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_36_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t int16uArgument = 0U; - err = cluster.WriteAttributeInt16u(mOnSuccessCallback_36->Cancel(), mOnFailureCallback_36->Cancel(), int16uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_36; - delete mOnSuccessCallback_36; - } + err = cluster.WriteAttributeInt16u(mOnSuccessCallback_36.Cancel(), mOnFailureCallback_36.Cancel(), int16uArgument); return err; } @@ -6520,9 +5520,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_36; - delete runner->mOnSuccessCallback_36; - if (runner->mIsFailureExpected_36 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6539,9 +5536,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_36; - delete runner->mOnSuccessCallback_36; - if (runner->mIsFailureExpected_36 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6553,32 +5547,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT16U Min Value - typedef void (*SuccessCallback_37)(void * context, uint16_t int16u); - chip::Callback::Callback * mOnSuccessCallback_37 = nullptr; - chip::Callback::Callback * mOnFailureCallback_37 = nullptr; - bool mIsFailureExpected_37 = 0; + using SuccessCallback_37 = void (*)(void * context, uint16_t int16u); + chip::Callback::Callback mOnSuccessCallback_37{ + OnTestSendClusterTestClusterCommandReadAttribute_37_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_37{ + OnTestSendClusterTestClusterCommandReadAttribute_37_FailureResponse, this + }; + bool mIsFailureExpected_37 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_37() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT16U Min Value: Sending command..."); - mOnFailureCallback_37 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_37_FailureResponse, this); - mOnSuccessCallback_37 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_37_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt16u(mOnSuccessCallback_37->Cancel(), mOnFailureCallback_37->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_37; - delete mOnSuccessCallback_37; - } + err = cluster.ReadAttributeInt16u(mOnSuccessCallback_37.Cancel(), mOnFailureCallback_37.Cancel()); return err; } @@ -6589,9 +5576,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_37; - delete runner->mOnSuccessCallback_37; - if (runner->mIsFailureExpected_37 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6608,9 +5592,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_37; - delete runner->mOnSuccessCallback_37; - if (runner->mIsFailureExpected_37 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6629,32 +5610,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT32U Default Value - typedef void (*SuccessCallback_38)(void * context, uint32_t int32u); - chip::Callback::Callback * mOnSuccessCallback_38 = nullptr; - chip::Callback::Callback * mOnFailureCallback_38 = nullptr; - bool mIsFailureExpected_38 = 0; + using SuccessCallback_38 = void (*)(void * context, uint32_t int32u); + chip::Callback::Callback mOnSuccessCallback_38{ + OnTestSendClusterTestClusterCommandReadAttribute_38_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_38{ + OnTestSendClusterTestClusterCommandReadAttribute_38_FailureResponse, this + }; + bool mIsFailureExpected_38 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_38() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT32U Default Value: Sending command..."); - mOnFailureCallback_38 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_38_FailureResponse, this); - mOnSuccessCallback_38 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_38_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt32u(mOnSuccessCallback_38->Cancel(), mOnFailureCallback_38->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_38; - delete mOnSuccessCallback_38; - } + err = cluster.ReadAttributeInt32u(mOnSuccessCallback_38.Cancel(), mOnFailureCallback_38.Cancel()); return err; } @@ -6665,9 +5639,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_38; - delete runner->mOnSuccessCallback_38; - if (runner->mIsFailureExpected_38 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6684,9 +5655,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_38; - delete runner->mOnSuccessCallback_38; - if (runner->mIsFailureExpected_38 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6705,33 +5673,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT32U Max Value - typedef void (*SuccessCallback_39)(void * context, uint32_t int32u); - chip::Callback::Callback * mOnSuccessCallback_39 = nullptr; - chip::Callback::Callback * mOnFailureCallback_39 = nullptr; - bool mIsFailureExpected_39 = 0; + using SuccessCallback_39 = void (*)(void * context, uint32_t int32u); + chip::Callback::Callback mOnSuccessCallback_39{ + OnTestSendClusterTestClusterCommandWriteAttribute_39_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_39{ + OnTestSendClusterTestClusterCommandWriteAttribute_39_FailureResponse, this + }; + bool mIsFailureExpected_39 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_39() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT32U Max Value: Sending command..."); - mOnFailureCallback_39 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_39_FailureResponse, this); - mOnSuccessCallback_39 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_39_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint32_t int32uArgument = 4294967295UL; - err = cluster.WriteAttributeInt32u(mOnSuccessCallback_39->Cancel(), mOnFailureCallback_39->Cancel(), int32uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_39; - delete mOnSuccessCallback_39; - } + err = cluster.WriteAttributeInt32u(mOnSuccessCallback_39.Cancel(), mOnFailureCallback_39.Cancel(), int32uArgument); return err; } @@ -6742,9 +5703,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_39; - delete runner->mOnSuccessCallback_39; - if (runner->mIsFailureExpected_39 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6761,9 +5719,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_39; - delete runner->mOnSuccessCallback_39; - if (runner->mIsFailureExpected_39 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6775,32 +5730,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT32U Max Value - typedef void (*SuccessCallback_40)(void * context, uint32_t int32u); - chip::Callback::Callback * mOnSuccessCallback_40 = nullptr; - chip::Callback::Callback * mOnFailureCallback_40 = nullptr; - bool mIsFailureExpected_40 = 0; + using SuccessCallback_40 = void (*)(void * context, uint32_t int32u); + chip::Callback::Callback mOnSuccessCallback_40{ + OnTestSendClusterTestClusterCommandReadAttribute_40_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_40{ + OnTestSendClusterTestClusterCommandReadAttribute_40_FailureResponse, this + }; + bool mIsFailureExpected_40 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_40() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT32U Max Value: Sending command..."); - mOnFailureCallback_40 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_40_FailureResponse, this); - mOnSuccessCallback_40 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_40_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt32u(mOnSuccessCallback_40->Cancel(), mOnFailureCallback_40->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_40; - delete mOnSuccessCallback_40; - } + err = cluster.ReadAttributeInt32u(mOnSuccessCallback_40.Cancel(), mOnFailureCallback_40.Cancel()); return err; } @@ -6811,9 +5759,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_40; - delete runner->mOnSuccessCallback_40; - if (runner->mIsFailureExpected_40 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6830,9 +5775,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_40; - delete runner->mOnSuccessCallback_40; - if (runner->mIsFailureExpected_40 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6851,33 +5793,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT32U Min Value - typedef void (*SuccessCallback_41)(void * context, uint32_t int32u); - chip::Callback::Callback * mOnSuccessCallback_41 = nullptr; - chip::Callback::Callback * mOnFailureCallback_41 = nullptr; - bool mIsFailureExpected_41 = 0; + using SuccessCallback_41 = void (*)(void * context, uint32_t int32u); + chip::Callback::Callback mOnSuccessCallback_41{ + OnTestSendClusterTestClusterCommandWriteAttribute_41_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_41{ + OnTestSendClusterTestClusterCommandWriteAttribute_41_FailureResponse, this + }; + bool mIsFailureExpected_41 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_41() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT32U Min Value: Sending command..."); - mOnFailureCallback_41 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_41_FailureResponse, this); - mOnSuccessCallback_41 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_41_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint32_t int32uArgument = 0UL; - err = cluster.WriteAttributeInt32u(mOnSuccessCallback_41->Cancel(), mOnFailureCallback_41->Cancel(), int32uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_41; - delete mOnSuccessCallback_41; - } + err = cluster.WriteAttributeInt32u(mOnSuccessCallback_41.Cancel(), mOnFailureCallback_41.Cancel(), int32uArgument); return err; } @@ -6888,9 +5823,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_41; - delete runner->mOnSuccessCallback_41; - if (runner->mIsFailureExpected_41 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6907,9 +5839,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_41; - delete runner->mOnSuccessCallback_41; - if (runner->mIsFailureExpected_41 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6921,32 +5850,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT32U Min Value - typedef void (*SuccessCallback_42)(void * context, uint32_t int32u); - chip::Callback::Callback * mOnSuccessCallback_42 = nullptr; - chip::Callback::Callback * mOnFailureCallback_42 = nullptr; - bool mIsFailureExpected_42 = 0; + using SuccessCallback_42 = void (*)(void * context, uint32_t int32u); + chip::Callback::Callback mOnSuccessCallback_42{ + OnTestSendClusterTestClusterCommandReadAttribute_42_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_42{ + OnTestSendClusterTestClusterCommandReadAttribute_42_FailureResponse, this + }; + bool mIsFailureExpected_42 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_42() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT32U Min Value: Sending command..."); - mOnFailureCallback_42 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_42_FailureResponse, this); - mOnSuccessCallback_42 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_42_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt32u(mOnSuccessCallback_42->Cancel(), mOnFailureCallback_42->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_42; - delete mOnSuccessCallback_42; - } + err = cluster.ReadAttributeInt32u(mOnSuccessCallback_42.Cancel(), mOnFailureCallback_42.Cancel()); return err; } @@ -6957,9 +5879,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_42; - delete runner->mOnSuccessCallback_42; - if (runner->mIsFailureExpected_42 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -6976,9 +5895,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_42; - delete runner->mOnSuccessCallback_42; - if (runner->mIsFailureExpected_42 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -6997,32 +5913,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT64U Default Value - typedef void (*SuccessCallback_43)(void * context, uint64_t int64u); - chip::Callback::Callback * mOnSuccessCallback_43 = nullptr; - chip::Callback::Callback * mOnFailureCallback_43 = nullptr; - bool mIsFailureExpected_43 = 0; + using SuccessCallback_43 = void (*)(void * context, uint64_t int64u); + chip::Callback::Callback mOnSuccessCallback_43{ + OnTestSendClusterTestClusterCommandReadAttribute_43_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_43{ + OnTestSendClusterTestClusterCommandReadAttribute_43_FailureResponse, this + }; + bool mIsFailureExpected_43 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_43() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT64U Default Value: Sending command..."); - mOnFailureCallback_43 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_43_FailureResponse, this); - mOnSuccessCallback_43 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_43_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt64u(mOnSuccessCallback_43->Cancel(), mOnFailureCallback_43->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_43; - delete mOnSuccessCallback_43; - } + err = cluster.ReadAttributeInt64u(mOnSuccessCallback_43.Cancel(), mOnFailureCallback_43.Cancel()); return err; } @@ -7033,9 +5942,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_43; - delete runner->mOnSuccessCallback_43; - if (runner->mIsFailureExpected_43 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7052,9 +5958,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_43; - delete runner->mOnSuccessCallback_43; - if (runner->mIsFailureExpected_43 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7073,33 +5976,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT64U Max Value - typedef void (*SuccessCallback_44)(void * context, uint64_t int64u); - chip::Callback::Callback * mOnSuccessCallback_44 = nullptr; - chip::Callback::Callback * mOnFailureCallback_44 = nullptr; - bool mIsFailureExpected_44 = 0; + using SuccessCallback_44 = void (*)(void * context, uint64_t int64u); + chip::Callback::Callback mOnSuccessCallback_44{ + OnTestSendClusterTestClusterCommandWriteAttribute_44_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_44{ + OnTestSendClusterTestClusterCommandWriteAttribute_44_FailureResponse, this + }; + bool mIsFailureExpected_44 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_44() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT64U Max Value: Sending command..."); - mOnFailureCallback_44 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_44_FailureResponse, this); - mOnSuccessCallback_44 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_44_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint64_t int64uArgument = 18446744073709551615ULL; - err = cluster.WriteAttributeInt64u(mOnSuccessCallback_44->Cancel(), mOnFailureCallback_44->Cancel(), int64uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_44; - delete mOnSuccessCallback_44; - } + err = cluster.WriteAttributeInt64u(mOnSuccessCallback_44.Cancel(), mOnFailureCallback_44.Cancel(), int64uArgument); return err; } @@ -7110,9 +6006,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_44; - delete runner->mOnSuccessCallback_44; - if (runner->mIsFailureExpected_44 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7129,9 +6022,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_44; - delete runner->mOnSuccessCallback_44; - if (runner->mIsFailureExpected_44 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7143,32 +6033,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT64U Max Value - typedef void (*SuccessCallback_45)(void * context, uint64_t int64u); - chip::Callback::Callback * mOnSuccessCallback_45 = nullptr; - chip::Callback::Callback * mOnFailureCallback_45 = nullptr; - bool mIsFailureExpected_45 = 0; + using SuccessCallback_45 = void (*)(void * context, uint64_t int64u); + chip::Callback::Callback mOnSuccessCallback_45{ + OnTestSendClusterTestClusterCommandReadAttribute_45_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_45{ + OnTestSendClusterTestClusterCommandReadAttribute_45_FailureResponse, this + }; + bool mIsFailureExpected_45 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_45() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT64U Max Value: Sending command..."); - mOnFailureCallback_45 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_45_FailureResponse, this); - mOnSuccessCallback_45 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_45_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt64u(mOnSuccessCallback_45->Cancel(), mOnFailureCallback_45->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_45; - delete mOnSuccessCallback_45; - } + err = cluster.ReadAttributeInt64u(mOnSuccessCallback_45.Cancel(), mOnFailureCallback_45.Cancel()); return err; } @@ -7179,9 +6062,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_45; - delete runner->mOnSuccessCallback_45; - if (runner->mIsFailureExpected_45 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7198,9 +6078,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_45; - delete runner->mOnSuccessCallback_45; - if (runner->mIsFailureExpected_45 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7219,33 +6096,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT64U Min Value - typedef void (*SuccessCallback_46)(void * context, uint64_t int64u); - chip::Callback::Callback * mOnSuccessCallback_46 = nullptr; - chip::Callback::Callback * mOnFailureCallback_46 = nullptr; - bool mIsFailureExpected_46 = 0; + using SuccessCallback_46 = void (*)(void * context, uint64_t int64u); + chip::Callback::Callback mOnSuccessCallback_46{ + OnTestSendClusterTestClusterCommandWriteAttribute_46_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_46{ + OnTestSendClusterTestClusterCommandWriteAttribute_46_FailureResponse, this + }; + bool mIsFailureExpected_46 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_46() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT64U Min Value: Sending command..."); - mOnFailureCallback_46 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_46_FailureResponse, this); - mOnSuccessCallback_46 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_46_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint64_t int64uArgument = 0ULL; - err = cluster.WriteAttributeInt64u(mOnSuccessCallback_46->Cancel(), mOnFailureCallback_46->Cancel(), int64uArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_46; - delete mOnSuccessCallback_46; - } + err = cluster.WriteAttributeInt64u(mOnSuccessCallback_46.Cancel(), mOnFailureCallback_46.Cancel(), int64uArgument); return err; } @@ -7256,9 +6126,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_46; - delete runner->mOnSuccessCallback_46; - if (runner->mIsFailureExpected_46 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7275,9 +6142,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_46; - delete runner->mOnSuccessCallback_46; - if (runner->mIsFailureExpected_46 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7289,32 +6153,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT64U Min Value - typedef void (*SuccessCallback_47)(void * context, uint64_t int64u); - chip::Callback::Callback * mOnSuccessCallback_47 = nullptr; - chip::Callback::Callback * mOnFailureCallback_47 = nullptr; - bool mIsFailureExpected_47 = 0; + using SuccessCallback_47 = void (*)(void * context, uint64_t int64u); + chip::Callback::Callback mOnSuccessCallback_47{ + OnTestSendClusterTestClusterCommandReadAttribute_47_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_47{ + OnTestSendClusterTestClusterCommandReadAttribute_47_FailureResponse, this + }; + bool mIsFailureExpected_47 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_47() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT64U Min Value: Sending command..."); - mOnFailureCallback_47 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_47_FailureResponse, this); - mOnSuccessCallback_47 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_47_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt64u(mOnSuccessCallback_47->Cancel(), mOnFailureCallback_47->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_47; - delete mOnSuccessCallback_47; - } + err = cluster.ReadAttributeInt64u(mOnSuccessCallback_47.Cancel(), mOnFailureCallback_47.Cancel()); return err; } @@ -7325,9 +6182,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_47; - delete runner->mOnSuccessCallback_47; - if (runner->mIsFailureExpected_47 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7344,9 +6198,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_47; - delete runner->mOnSuccessCallback_47; - if (runner->mIsFailureExpected_47 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7365,32 +6216,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT8S Default Value - typedef void (*SuccessCallback_48)(void * context, int8_t int8s); - chip::Callback::Callback * mOnSuccessCallback_48 = nullptr; - chip::Callback::Callback * mOnFailureCallback_48 = nullptr; - bool mIsFailureExpected_48 = 0; + using SuccessCallback_48 = void (*)(void * context, int8_t int8s); + chip::Callback::Callback mOnSuccessCallback_48{ + OnTestSendClusterTestClusterCommandReadAttribute_48_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_48{ + OnTestSendClusterTestClusterCommandReadAttribute_48_FailureResponse, this + }; + bool mIsFailureExpected_48 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_48() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT8S Default Value: Sending command..."); - mOnFailureCallback_48 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_48_FailureResponse, this); - mOnSuccessCallback_48 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_48_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt8s(mOnSuccessCallback_48->Cancel(), mOnFailureCallback_48->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_48; - delete mOnSuccessCallback_48; - } + err = cluster.ReadAttributeInt8s(mOnSuccessCallback_48.Cancel(), mOnFailureCallback_48.Cancel()); return err; } @@ -7401,9 +6245,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_48; - delete runner->mOnSuccessCallback_48; - if (runner->mIsFailureExpected_48 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7420,9 +6261,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_48; - delete runner->mOnSuccessCallback_48; - if (runner->mIsFailureExpected_48 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7441,33 +6279,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT8S Max Value - typedef void (*SuccessCallback_49)(void * context, int8_t int8s); - chip::Callback::Callback * mOnSuccessCallback_49 = nullptr; - chip::Callback::Callback * mOnFailureCallback_49 = nullptr; - bool mIsFailureExpected_49 = 0; + using SuccessCallback_49 = void (*)(void * context, int8_t int8s); + chip::Callback::Callback mOnSuccessCallback_49{ + OnTestSendClusterTestClusterCommandWriteAttribute_49_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_49{ + OnTestSendClusterTestClusterCommandWriteAttribute_49_FailureResponse, this + }; + bool mIsFailureExpected_49 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_49() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT8S Max Value: Sending command..."); - mOnFailureCallback_49 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_49_FailureResponse, this); - mOnSuccessCallback_49 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_49_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int8_t int8sArgument = 127; - err = cluster.WriteAttributeInt8s(mOnSuccessCallback_49->Cancel(), mOnFailureCallback_49->Cancel(), int8sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_49; - delete mOnSuccessCallback_49; - } + err = cluster.WriteAttributeInt8s(mOnSuccessCallback_49.Cancel(), mOnFailureCallback_49.Cancel(), int8sArgument); return err; } @@ -7478,9 +6309,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_49; - delete runner->mOnSuccessCallback_49; - if (runner->mIsFailureExpected_49 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7497,9 +6325,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_49; - delete runner->mOnSuccessCallback_49; - if (runner->mIsFailureExpected_49 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7511,32 +6336,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT8S Max Value - typedef void (*SuccessCallback_50)(void * context, int8_t int8s); - chip::Callback::Callback * mOnSuccessCallback_50 = nullptr; - chip::Callback::Callback * mOnFailureCallback_50 = nullptr; - bool mIsFailureExpected_50 = 0; + using SuccessCallback_50 = void (*)(void * context, int8_t int8s); + chip::Callback::Callback mOnSuccessCallback_50{ + OnTestSendClusterTestClusterCommandReadAttribute_50_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_50{ + OnTestSendClusterTestClusterCommandReadAttribute_50_FailureResponse, this + }; + bool mIsFailureExpected_50 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_50() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT8S Max Value: Sending command..."); - mOnFailureCallback_50 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_50_FailureResponse, this); - mOnSuccessCallback_50 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_50_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt8s(mOnSuccessCallback_50->Cancel(), mOnFailureCallback_50->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_50; - delete mOnSuccessCallback_50; - } + err = cluster.ReadAttributeInt8s(mOnSuccessCallback_50.Cancel(), mOnFailureCallback_50.Cancel()); return err; } @@ -7547,9 +6365,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_50; - delete runner->mOnSuccessCallback_50; - if (runner->mIsFailureExpected_50 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7566,9 +6381,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_50; - delete runner->mOnSuccessCallback_50; - if (runner->mIsFailureExpected_50 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7587,33 +6399,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT8S Min Value - typedef void (*SuccessCallback_51)(void * context, int8_t int8s); - chip::Callback::Callback * mOnSuccessCallback_51 = nullptr; - chip::Callback::Callback * mOnFailureCallback_51 = nullptr; - bool mIsFailureExpected_51 = 0; + using SuccessCallback_51 = void (*)(void * context, int8_t int8s); + chip::Callback::Callback mOnSuccessCallback_51{ + OnTestSendClusterTestClusterCommandWriteAttribute_51_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_51{ + OnTestSendClusterTestClusterCommandWriteAttribute_51_FailureResponse, this + }; + bool mIsFailureExpected_51 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_51() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT8S Min Value: Sending command..."); - mOnFailureCallback_51 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_51_FailureResponse, this); - mOnSuccessCallback_51 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_51_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int8_t int8sArgument = -128; - err = cluster.WriteAttributeInt8s(mOnSuccessCallback_51->Cancel(), mOnFailureCallback_51->Cancel(), int8sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_51; - delete mOnSuccessCallback_51; - } + err = cluster.WriteAttributeInt8s(mOnSuccessCallback_51.Cancel(), mOnFailureCallback_51.Cancel(), int8sArgument); return err; } @@ -7624,9 +6429,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_51; - delete runner->mOnSuccessCallback_51; - if (runner->mIsFailureExpected_51 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7643,9 +6445,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_51; - delete runner->mOnSuccessCallback_51; - if (runner->mIsFailureExpected_51 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7657,32 +6456,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT8S Min Value - typedef void (*SuccessCallback_52)(void * context, int8_t int8s); - chip::Callback::Callback * mOnSuccessCallback_52 = nullptr; - chip::Callback::Callback * mOnFailureCallback_52 = nullptr; - bool mIsFailureExpected_52 = 0; + using SuccessCallback_52 = void (*)(void * context, int8_t int8s); + chip::Callback::Callback mOnSuccessCallback_52{ + OnTestSendClusterTestClusterCommandReadAttribute_52_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_52{ + OnTestSendClusterTestClusterCommandReadAttribute_52_FailureResponse, this + }; + bool mIsFailureExpected_52 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_52() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT8S Min Value: Sending command..."); - mOnFailureCallback_52 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_52_FailureResponse, this); - mOnSuccessCallback_52 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_52_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt8s(mOnSuccessCallback_52->Cancel(), mOnFailureCallback_52->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_52; - delete mOnSuccessCallback_52; - } + err = cluster.ReadAttributeInt8s(mOnSuccessCallback_52.Cancel(), mOnFailureCallback_52.Cancel()); return err; } @@ -7693,9 +6485,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_52; - delete runner->mOnSuccessCallback_52; - if (runner->mIsFailureExpected_52 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7712,9 +6501,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_52; - delete runner->mOnSuccessCallback_52; - if (runner->mIsFailureExpected_52 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7733,33 +6519,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT8S Default Value - typedef void (*SuccessCallback_53)(void * context, int8_t int8s); - chip::Callback::Callback * mOnSuccessCallback_53 = nullptr; - chip::Callback::Callback * mOnFailureCallback_53 = nullptr; - bool mIsFailureExpected_53 = 0; + using SuccessCallback_53 = void (*)(void * context, int8_t int8s); + chip::Callback::Callback mOnSuccessCallback_53{ + OnTestSendClusterTestClusterCommandWriteAttribute_53_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_53{ + OnTestSendClusterTestClusterCommandWriteAttribute_53_FailureResponse, this + }; + bool mIsFailureExpected_53 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_53() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT8S Default Value: Sending command..."); - mOnFailureCallback_53 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_53_FailureResponse, this); - mOnSuccessCallback_53 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_53_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int8_t int8sArgument = 0; - err = cluster.WriteAttributeInt8s(mOnSuccessCallback_53->Cancel(), mOnFailureCallback_53->Cancel(), int8sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_53; - delete mOnSuccessCallback_53; - } + err = cluster.WriteAttributeInt8s(mOnSuccessCallback_53.Cancel(), mOnFailureCallback_53.Cancel(), int8sArgument); return err; } @@ -7770,9 +6549,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_53; - delete runner->mOnSuccessCallback_53; - if (runner->mIsFailureExpected_53 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7789,9 +6565,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_53; - delete runner->mOnSuccessCallback_53; - if (runner->mIsFailureExpected_53 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7803,32 +6576,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT8S Default Value - typedef void (*SuccessCallback_54)(void * context, int8_t int8s); - chip::Callback::Callback * mOnSuccessCallback_54 = nullptr; - chip::Callback::Callback * mOnFailureCallback_54 = nullptr; - bool mIsFailureExpected_54 = 0; + using SuccessCallback_54 = void (*)(void * context, int8_t int8s); + chip::Callback::Callback mOnSuccessCallback_54{ + OnTestSendClusterTestClusterCommandReadAttribute_54_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_54{ + OnTestSendClusterTestClusterCommandReadAttribute_54_FailureResponse, this + }; + bool mIsFailureExpected_54 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_54() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT8S Default Value: Sending command..."); - mOnFailureCallback_54 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_54_FailureResponse, this); - mOnSuccessCallback_54 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_54_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt8s(mOnSuccessCallback_54->Cancel(), mOnFailureCallback_54->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_54; - delete mOnSuccessCallback_54; - } + err = cluster.ReadAttributeInt8s(mOnSuccessCallback_54.Cancel(), mOnFailureCallback_54.Cancel()); return err; } @@ -7839,9 +6605,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_54; - delete runner->mOnSuccessCallback_54; - if (runner->mIsFailureExpected_54 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7858,9 +6621,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_54; - delete runner->mOnSuccessCallback_54; - if (runner->mIsFailureExpected_54 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7879,32 +6639,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT16S Default Value - typedef void (*SuccessCallback_55)(void * context, int16_t int16s); - chip::Callback::Callback * mOnSuccessCallback_55 = nullptr; - chip::Callback::Callback * mOnFailureCallback_55 = nullptr; - bool mIsFailureExpected_55 = 0; + using SuccessCallback_55 = void (*)(void * context, int16_t int16s); + chip::Callback::Callback mOnSuccessCallback_55{ + OnTestSendClusterTestClusterCommandReadAttribute_55_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_55{ + OnTestSendClusterTestClusterCommandReadAttribute_55_FailureResponse, this + }; + bool mIsFailureExpected_55 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_55() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT16S Default Value: Sending command..."); - mOnFailureCallback_55 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_55_FailureResponse, this); - mOnSuccessCallback_55 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_55_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt16s(mOnSuccessCallback_55->Cancel(), mOnFailureCallback_55->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_55; - delete mOnSuccessCallback_55; - } + err = cluster.ReadAttributeInt16s(mOnSuccessCallback_55.Cancel(), mOnFailureCallback_55.Cancel()); return err; } @@ -7915,9 +6668,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_55; - delete runner->mOnSuccessCallback_55; - if (runner->mIsFailureExpected_55 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -7934,9 +6684,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_55; - delete runner->mOnSuccessCallback_55; - if (runner->mIsFailureExpected_55 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -7955,33 +6702,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT16S Max Value - typedef void (*SuccessCallback_56)(void * context, int16_t int16s); - chip::Callback::Callback * mOnSuccessCallback_56 = nullptr; - chip::Callback::Callback * mOnFailureCallback_56 = nullptr; - bool mIsFailureExpected_56 = 0; + using SuccessCallback_56 = void (*)(void * context, int16_t int16s); + chip::Callback::Callback mOnSuccessCallback_56{ + OnTestSendClusterTestClusterCommandWriteAttribute_56_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_56{ + OnTestSendClusterTestClusterCommandWriteAttribute_56_FailureResponse, this + }; + bool mIsFailureExpected_56 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_56() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT16S Max Value: Sending command..."); - mOnFailureCallback_56 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_56_FailureResponse, this); - mOnSuccessCallback_56 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_56_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int16_t int16sArgument = 32767; - err = cluster.WriteAttributeInt16s(mOnSuccessCallback_56->Cancel(), mOnFailureCallback_56->Cancel(), int16sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_56; - delete mOnSuccessCallback_56; - } + err = cluster.WriteAttributeInt16s(mOnSuccessCallback_56.Cancel(), mOnFailureCallback_56.Cancel(), int16sArgument); return err; } @@ -7992,9 +6732,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_56; - delete runner->mOnSuccessCallback_56; - if (runner->mIsFailureExpected_56 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8011,9 +6748,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_56; - delete runner->mOnSuccessCallback_56; - if (runner->mIsFailureExpected_56 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8025,32 +6759,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT16S Max Value - typedef void (*SuccessCallback_57)(void * context, int16_t int16s); - chip::Callback::Callback * mOnSuccessCallback_57 = nullptr; - chip::Callback::Callback * mOnFailureCallback_57 = nullptr; - bool mIsFailureExpected_57 = 0; + using SuccessCallback_57 = void (*)(void * context, int16_t int16s); + chip::Callback::Callback mOnSuccessCallback_57{ + OnTestSendClusterTestClusterCommandReadAttribute_57_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_57{ + OnTestSendClusterTestClusterCommandReadAttribute_57_FailureResponse, this + }; + bool mIsFailureExpected_57 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_57() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT16S Max Value: Sending command..."); - mOnFailureCallback_57 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_57_FailureResponse, this); - mOnSuccessCallback_57 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_57_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt16s(mOnSuccessCallback_57->Cancel(), mOnFailureCallback_57->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_57; - delete mOnSuccessCallback_57; - } + err = cluster.ReadAttributeInt16s(mOnSuccessCallback_57.Cancel(), mOnFailureCallback_57.Cancel()); return err; } @@ -8061,9 +6788,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_57; - delete runner->mOnSuccessCallback_57; - if (runner->mIsFailureExpected_57 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8080,9 +6804,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_57; - delete runner->mOnSuccessCallback_57; - if (runner->mIsFailureExpected_57 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8101,33 +6822,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT16S Min Value - typedef void (*SuccessCallback_58)(void * context, int16_t int16s); - chip::Callback::Callback * mOnSuccessCallback_58 = nullptr; - chip::Callback::Callback * mOnFailureCallback_58 = nullptr; - bool mIsFailureExpected_58 = 0; + using SuccessCallback_58 = void (*)(void * context, int16_t int16s); + chip::Callback::Callback mOnSuccessCallback_58{ + OnTestSendClusterTestClusterCommandWriteAttribute_58_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_58{ + OnTestSendClusterTestClusterCommandWriteAttribute_58_FailureResponse, this + }; + bool mIsFailureExpected_58 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_58() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT16S Min Value: Sending command..."); - mOnFailureCallback_58 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_58_FailureResponse, this); - mOnSuccessCallback_58 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_58_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int16_t int16sArgument = -32768; - err = cluster.WriteAttributeInt16s(mOnSuccessCallback_58->Cancel(), mOnFailureCallback_58->Cancel(), int16sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_58; - delete mOnSuccessCallback_58; - } + err = cluster.WriteAttributeInt16s(mOnSuccessCallback_58.Cancel(), mOnFailureCallback_58.Cancel(), int16sArgument); return err; } @@ -8138,9 +6852,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_58; - delete runner->mOnSuccessCallback_58; - if (runner->mIsFailureExpected_58 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8157,9 +6868,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_58; - delete runner->mOnSuccessCallback_58; - if (runner->mIsFailureExpected_58 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8171,32 +6879,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT16S Min Value - typedef void (*SuccessCallback_59)(void * context, int16_t int16s); - chip::Callback::Callback * mOnSuccessCallback_59 = nullptr; - chip::Callback::Callback * mOnFailureCallback_59 = nullptr; - bool mIsFailureExpected_59 = 0; + using SuccessCallback_59 = void (*)(void * context, int16_t int16s); + chip::Callback::Callback mOnSuccessCallback_59{ + OnTestSendClusterTestClusterCommandReadAttribute_59_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_59{ + OnTestSendClusterTestClusterCommandReadAttribute_59_FailureResponse, this + }; + bool mIsFailureExpected_59 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_59() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT16S Min Value: Sending command..."); - mOnFailureCallback_59 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_59_FailureResponse, this); - mOnSuccessCallback_59 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_59_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt16s(mOnSuccessCallback_59->Cancel(), mOnFailureCallback_59->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_59; - delete mOnSuccessCallback_59; - } + err = cluster.ReadAttributeInt16s(mOnSuccessCallback_59.Cancel(), mOnFailureCallback_59.Cancel()); return err; } @@ -8207,9 +6908,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_59; - delete runner->mOnSuccessCallback_59; - if (runner->mIsFailureExpected_59 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8226,9 +6924,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_59; - delete runner->mOnSuccessCallback_59; - if (runner->mIsFailureExpected_59 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8247,33 +6942,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT16S Default Value - typedef void (*SuccessCallback_60)(void * context, int16_t int16s); - chip::Callback::Callback * mOnSuccessCallback_60 = nullptr; - chip::Callback::Callback * mOnFailureCallback_60 = nullptr; - bool mIsFailureExpected_60 = 0; + using SuccessCallback_60 = void (*)(void * context, int16_t int16s); + chip::Callback::Callback mOnSuccessCallback_60{ + OnTestSendClusterTestClusterCommandWriteAttribute_60_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_60{ + OnTestSendClusterTestClusterCommandWriteAttribute_60_FailureResponse, this + }; + bool mIsFailureExpected_60 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_60() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT16S Default Value: Sending command..."); - mOnFailureCallback_60 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_60_FailureResponse, this); - mOnSuccessCallback_60 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_60_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int16_t int16sArgument = 0; - err = cluster.WriteAttributeInt16s(mOnSuccessCallback_60->Cancel(), mOnFailureCallback_60->Cancel(), int16sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_60; - delete mOnSuccessCallback_60; - } + err = cluster.WriteAttributeInt16s(mOnSuccessCallback_60.Cancel(), mOnFailureCallback_60.Cancel(), int16sArgument); return err; } @@ -8284,9 +6972,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_60; - delete runner->mOnSuccessCallback_60; - if (runner->mIsFailureExpected_60 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8303,9 +6988,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_60; - delete runner->mOnSuccessCallback_60; - if (runner->mIsFailureExpected_60 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8317,32 +6999,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT16S Default Value - typedef void (*SuccessCallback_61)(void * context, int16_t int16s); - chip::Callback::Callback * mOnSuccessCallback_61 = nullptr; - chip::Callback::Callback * mOnFailureCallback_61 = nullptr; - bool mIsFailureExpected_61 = 0; + using SuccessCallback_61 = void (*)(void * context, int16_t int16s); + chip::Callback::Callback mOnSuccessCallback_61{ + OnTestSendClusterTestClusterCommandReadAttribute_61_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_61{ + OnTestSendClusterTestClusterCommandReadAttribute_61_FailureResponse, this + }; + bool mIsFailureExpected_61 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_61() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT16S Default Value: Sending command..."); - mOnFailureCallback_61 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_61_FailureResponse, this); - mOnSuccessCallback_61 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_61_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt16s(mOnSuccessCallback_61->Cancel(), mOnFailureCallback_61->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_61; - delete mOnSuccessCallback_61; - } + err = cluster.ReadAttributeInt16s(mOnSuccessCallback_61.Cancel(), mOnFailureCallback_61.Cancel()); return err; } @@ -8353,9 +7028,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_61; - delete runner->mOnSuccessCallback_61; - if (runner->mIsFailureExpected_61 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8372,9 +7044,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_61; - delete runner->mOnSuccessCallback_61; - if (runner->mIsFailureExpected_61 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8393,32 +7062,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT32S Default Value - typedef void (*SuccessCallback_62)(void * context, int32_t int32s); - chip::Callback::Callback * mOnSuccessCallback_62 = nullptr; - chip::Callback::Callback * mOnFailureCallback_62 = nullptr; - bool mIsFailureExpected_62 = 0; + using SuccessCallback_62 = void (*)(void * context, int32_t int32s); + chip::Callback::Callback mOnSuccessCallback_62{ + OnTestSendClusterTestClusterCommandReadAttribute_62_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_62{ + OnTestSendClusterTestClusterCommandReadAttribute_62_FailureResponse, this + }; + bool mIsFailureExpected_62 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_62() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT32S Default Value: Sending command..."); - mOnFailureCallback_62 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_62_FailureResponse, this); - mOnSuccessCallback_62 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_62_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt32s(mOnSuccessCallback_62->Cancel(), mOnFailureCallback_62->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_62; - delete mOnSuccessCallback_62; - } + err = cluster.ReadAttributeInt32s(mOnSuccessCallback_62.Cancel(), mOnFailureCallback_62.Cancel()); return err; } @@ -8429,9 +7091,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_62; - delete runner->mOnSuccessCallback_62; - if (runner->mIsFailureExpected_62 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8448,9 +7107,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_62; - delete runner->mOnSuccessCallback_62; - if (runner->mIsFailureExpected_62 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8469,33 +7125,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT32S Max Value - typedef void (*SuccessCallback_63)(void * context, int32_t int32s); - chip::Callback::Callback * mOnSuccessCallback_63 = nullptr; - chip::Callback::Callback * mOnFailureCallback_63 = nullptr; - bool mIsFailureExpected_63 = 0; + using SuccessCallback_63 = void (*)(void * context, int32_t int32s); + chip::Callback::Callback mOnSuccessCallback_63{ + OnTestSendClusterTestClusterCommandWriteAttribute_63_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_63{ + OnTestSendClusterTestClusterCommandWriteAttribute_63_FailureResponse, this + }; + bool mIsFailureExpected_63 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_63() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT32S Max Value: Sending command..."); - mOnFailureCallback_63 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_63_FailureResponse, this); - mOnSuccessCallback_63 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_63_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int32_t int32sArgument = 2147483647L; - err = cluster.WriteAttributeInt32s(mOnSuccessCallback_63->Cancel(), mOnFailureCallback_63->Cancel(), int32sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_63; - delete mOnSuccessCallback_63; - } + err = cluster.WriteAttributeInt32s(mOnSuccessCallback_63.Cancel(), mOnFailureCallback_63.Cancel(), int32sArgument); return err; } @@ -8506,9 +7155,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_63; - delete runner->mOnSuccessCallback_63; - if (runner->mIsFailureExpected_63 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8525,9 +7171,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_63; - delete runner->mOnSuccessCallback_63; - if (runner->mIsFailureExpected_63 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8539,32 +7182,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT32S Max Value - typedef void (*SuccessCallback_64)(void * context, int32_t int32s); - chip::Callback::Callback * mOnSuccessCallback_64 = nullptr; - chip::Callback::Callback * mOnFailureCallback_64 = nullptr; - bool mIsFailureExpected_64 = 0; + using SuccessCallback_64 = void (*)(void * context, int32_t int32s); + chip::Callback::Callback mOnSuccessCallback_64{ + OnTestSendClusterTestClusterCommandReadAttribute_64_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_64{ + OnTestSendClusterTestClusterCommandReadAttribute_64_FailureResponse, this + }; + bool mIsFailureExpected_64 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_64() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT32S Max Value: Sending command..."); - mOnFailureCallback_64 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_64_FailureResponse, this); - mOnSuccessCallback_64 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_64_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt32s(mOnSuccessCallback_64->Cancel(), mOnFailureCallback_64->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_64; - delete mOnSuccessCallback_64; - } + err = cluster.ReadAttributeInt32s(mOnSuccessCallback_64.Cancel(), mOnFailureCallback_64.Cancel()); return err; } @@ -8575,9 +7211,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_64; - delete runner->mOnSuccessCallback_64; - if (runner->mIsFailureExpected_64 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8594,9 +7227,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_64; - delete runner->mOnSuccessCallback_64; - if (runner->mIsFailureExpected_64 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8615,33 +7245,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT32S Min Value - typedef void (*SuccessCallback_65)(void * context, int32_t int32s); - chip::Callback::Callback * mOnSuccessCallback_65 = nullptr; - chip::Callback::Callback * mOnFailureCallback_65 = nullptr; - bool mIsFailureExpected_65 = 0; + using SuccessCallback_65 = void (*)(void * context, int32_t int32s); + chip::Callback::Callback mOnSuccessCallback_65{ + OnTestSendClusterTestClusterCommandWriteAttribute_65_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_65{ + OnTestSendClusterTestClusterCommandWriteAttribute_65_FailureResponse, this + }; + bool mIsFailureExpected_65 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_65() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT32S Min Value: Sending command..."); - mOnFailureCallback_65 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_65_FailureResponse, this); - mOnSuccessCallback_65 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_65_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int32_t int32sArgument = -2147483648L; - err = cluster.WriteAttributeInt32s(mOnSuccessCallback_65->Cancel(), mOnFailureCallback_65->Cancel(), int32sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_65; - delete mOnSuccessCallback_65; - } + err = cluster.WriteAttributeInt32s(mOnSuccessCallback_65.Cancel(), mOnFailureCallback_65.Cancel(), int32sArgument); return err; } @@ -8652,9 +7275,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_65; - delete runner->mOnSuccessCallback_65; - if (runner->mIsFailureExpected_65 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8671,9 +7291,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_65; - delete runner->mOnSuccessCallback_65; - if (runner->mIsFailureExpected_65 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8685,32 +7302,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT32S Min Value - typedef void (*SuccessCallback_66)(void * context, int32_t int32s); - chip::Callback::Callback * mOnSuccessCallback_66 = nullptr; - chip::Callback::Callback * mOnFailureCallback_66 = nullptr; - bool mIsFailureExpected_66 = 0; + using SuccessCallback_66 = void (*)(void * context, int32_t int32s); + chip::Callback::Callback mOnSuccessCallback_66{ + OnTestSendClusterTestClusterCommandReadAttribute_66_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_66{ + OnTestSendClusterTestClusterCommandReadAttribute_66_FailureResponse, this + }; + bool mIsFailureExpected_66 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_66() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT32S Min Value: Sending command..."); - mOnFailureCallback_66 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_66_FailureResponse, this); - mOnSuccessCallback_66 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_66_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt32s(mOnSuccessCallback_66->Cancel(), mOnFailureCallback_66->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_66; - delete mOnSuccessCallback_66; - } + err = cluster.ReadAttributeInt32s(mOnSuccessCallback_66.Cancel(), mOnFailureCallback_66.Cancel()); return err; } @@ -8721,9 +7331,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_66; - delete runner->mOnSuccessCallback_66; - if (runner->mIsFailureExpected_66 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8740,9 +7347,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_66; - delete runner->mOnSuccessCallback_66; - if (runner->mIsFailureExpected_66 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8761,33 +7365,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT32S Default Value - typedef void (*SuccessCallback_67)(void * context, int32_t int32s); - chip::Callback::Callback * mOnSuccessCallback_67 = nullptr; - chip::Callback::Callback * mOnFailureCallback_67 = nullptr; - bool mIsFailureExpected_67 = 0; + using SuccessCallback_67 = void (*)(void * context, int32_t int32s); + chip::Callback::Callback mOnSuccessCallback_67{ + OnTestSendClusterTestClusterCommandWriteAttribute_67_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_67{ + OnTestSendClusterTestClusterCommandWriteAttribute_67_FailureResponse, this + }; + bool mIsFailureExpected_67 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_67() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT32S Default Value: Sending command..."); - mOnFailureCallback_67 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_67_FailureResponse, this); - mOnSuccessCallback_67 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_67_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int32_t int32sArgument = 0L; - err = cluster.WriteAttributeInt32s(mOnSuccessCallback_67->Cancel(), mOnFailureCallback_67->Cancel(), int32sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_67; - delete mOnSuccessCallback_67; - } + err = cluster.WriteAttributeInt32s(mOnSuccessCallback_67.Cancel(), mOnFailureCallback_67.Cancel(), int32sArgument); return err; } @@ -8798,9 +7395,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_67; - delete runner->mOnSuccessCallback_67; - if (runner->mIsFailureExpected_67 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8817,9 +7411,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_67; - delete runner->mOnSuccessCallback_67; - if (runner->mIsFailureExpected_67 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8831,32 +7422,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT32S Default Value - typedef void (*SuccessCallback_68)(void * context, int32_t int32s); - chip::Callback::Callback * mOnSuccessCallback_68 = nullptr; - chip::Callback::Callback * mOnFailureCallback_68 = nullptr; - bool mIsFailureExpected_68 = 0; + using SuccessCallback_68 = void (*)(void * context, int32_t int32s); + chip::Callback::Callback mOnSuccessCallback_68{ + OnTestSendClusterTestClusterCommandReadAttribute_68_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_68{ + OnTestSendClusterTestClusterCommandReadAttribute_68_FailureResponse, this + }; + bool mIsFailureExpected_68 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_68() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT32S Default Value: Sending command..."); - mOnFailureCallback_68 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_68_FailureResponse, this); - mOnSuccessCallback_68 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_68_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt32s(mOnSuccessCallback_68->Cancel(), mOnFailureCallback_68->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_68; - delete mOnSuccessCallback_68; - } + err = cluster.ReadAttributeInt32s(mOnSuccessCallback_68.Cancel(), mOnFailureCallback_68.Cancel()); return err; } @@ -8867,9 +7451,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_68; - delete runner->mOnSuccessCallback_68; - if (runner->mIsFailureExpected_68 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8886,9 +7467,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_68; - delete runner->mOnSuccessCallback_68; - if (runner->mIsFailureExpected_68 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8907,32 +7485,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT64S Default Value - typedef void (*SuccessCallback_69)(void * context, int64_t int64s); - chip::Callback::Callback * mOnSuccessCallback_69 = nullptr; - chip::Callback::Callback * mOnFailureCallback_69 = nullptr; - bool mIsFailureExpected_69 = 0; + using SuccessCallback_69 = void (*)(void * context, int64_t int64s); + chip::Callback::Callback mOnSuccessCallback_69{ + OnTestSendClusterTestClusterCommandReadAttribute_69_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_69{ + OnTestSendClusterTestClusterCommandReadAttribute_69_FailureResponse, this + }; + bool mIsFailureExpected_69 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_69() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT64S Default Value: Sending command..."); - mOnFailureCallback_69 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_69_FailureResponse, this); - mOnSuccessCallback_69 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_69_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt64s(mOnSuccessCallback_69->Cancel(), mOnFailureCallback_69->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_69; - delete mOnSuccessCallback_69; - } + err = cluster.ReadAttributeInt64s(mOnSuccessCallback_69.Cancel(), mOnFailureCallback_69.Cancel()); return err; } @@ -8943,9 +7514,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_69; - delete runner->mOnSuccessCallback_69; - if (runner->mIsFailureExpected_69 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -8962,9 +7530,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_69; - delete runner->mOnSuccessCallback_69; - if (runner->mIsFailureExpected_69 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -8983,33 +7548,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT64S Max Value - typedef void (*SuccessCallback_70)(void * context, int64_t int64s); - chip::Callback::Callback * mOnSuccessCallback_70 = nullptr; - chip::Callback::Callback * mOnFailureCallback_70 = nullptr; - bool mIsFailureExpected_70 = 0; + using SuccessCallback_70 = void (*)(void * context, int64_t int64s); + chip::Callback::Callback mOnSuccessCallback_70{ + OnTestSendClusterTestClusterCommandWriteAttribute_70_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_70{ + OnTestSendClusterTestClusterCommandWriteAttribute_70_FailureResponse, this + }; + bool mIsFailureExpected_70 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_70() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT64S Max Value: Sending command..."); - mOnFailureCallback_70 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_70_FailureResponse, this); - mOnSuccessCallback_70 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_70_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int64_t int64sArgument = 9223372036854775807LL; - err = cluster.WriteAttributeInt64s(mOnSuccessCallback_70->Cancel(), mOnFailureCallback_70->Cancel(), int64sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_70; - delete mOnSuccessCallback_70; - } + err = cluster.WriteAttributeInt64s(mOnSuccessCallback_70.Cancel(), mOnFailureCallback_70.Cancel(), int64sArgument); return err; } @@ -9020,9 +7578,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_70; - delete runner->mOnSuccessCallback_70; - if (runner->mIsFailureExpected_70 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9039,9 +7594,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_70; - delete runner->mOnSuccessCallback_70; - if (runner->mIsFailureExpected_70 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9053,32 +7605,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT64S Max Value - typedef void (*SuccessCallback_71)(void * context, int64_t int64s); - chip::Callback::Callback * mOnSuccessCallback_71 = nullptr; - chip::Callback::Callback * mOnFailureCallback_71 = nullptr; - bool mIsFailureExpected_71 = 0; + using SuccessCallback_71 = void (*)(void * context, int64_t int64s); + chip::Callback::Callback mOnSuccessCallback_71{ + OnTestSendClusterTestClusterCommandReadAttribute_71_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_71{ + OnTestSendClusterTestClusterCommandReadAttribute_71_FailureResponse, this + }; + bool mIsFailureExpected_71 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_71() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT64S Max Value: Sending command..."); - mOnFailureCallback_71 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_71_FailureResponse, this); - mOnSuccessCallback_71 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_71_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt64s(mOnSuccessCallback_71->Cancel(), mOnFailureCallback_71->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_71; - delete mOnSuccessCallback_71; - } + err = cluster.ReadAttributeInt64s(mOnSuccessCallback_71.Cancel(), mOnFailureCallback_71.Cancel()); return err; } @@ -9089,9 +7634,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_71; - delete runner->mOnSuccessCallback_71; - if (runner->mIsFailureExpected_71 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9108,9 +7650,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_71; - delete runner->mOnSuccessCallback_71; - if (runner->mIsFailureExpected_71 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9129,33 +7668,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT64S Min Value - typedef void (*SuccessCallback_72)(void * context, int64_t int64s); - chip::Callback::Callback * mOnSuccessCallback_72 = nullptr; - chip::Callback::Callback * mOnFailureCallback_72 = nullptr; - bool mIsFailureExpected_72 = 0; + using SuccessCallback_72 = void (*)(void * context, int64_t int64s); + chip::Callback::Callback mOnSuccessCallback_72{ + OnTestSendClusterTestClusterCommandWriteAttribute_72_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_72{ + OnTestSendClusterTestClusterCommandWriteAttribute_72_FailureResponse, this + }; + bool mIsFailureExpected_72 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_72() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT64S Min Value: Sending command..."); - mOnFailureCallback_72 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_72_FailureResponse, this); - mOnSuccessCallback_72 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_72_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int64_t int64sArgument = -9223372036854775807LL; - err = cluster.WriteAttributeInt64s(mOnSuccessCallback_72->Cancel(), mOnFailureCallback_72->Cancel(), int64sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_72; - delete mOnSuccessCallback_72; - } + err = cluster.WriteAttributeInt64s(mOnSuccessCallback_72.Cancel(), mOnFailureCallback_72.Cancel(), int64sArgument); return err; } @@ -9166,9 +7698,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_72; - delete runner->mOnSuccessCallback_72; - if (runner->mIsFailureExpected_72 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9185,9 +7714,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_72; - delete runner->mOnSuccessCallback_72; - if (runner->mIsFailureExpected_72 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9199,32 +7725,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT64S Min Value - typedef void (*SuccessCallback_73)(void * context, int64_t int64s); - chip::Callback::Callback * mOnSuccessCallback_73 = nullptr; - chip::Callback::Callback * mOnFailureCallback_73 = nullptr; - bool mIsFailureExpected_73 = 0; + using SuccessCallback_73 = void (*)(void * context, int64_t int64s); + chip::Callback::Callback mOnSuccessCallback_73{ + OnTestSendClusterTestClusterCommandReadAttribute_73_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_73{ + OnTestSendClusterTestClusterCommandReadAttribute_73_FailureResponse, this + }; + bool mIsFailureExpected_73 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_73() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT64S Min Value: Sending command..."); - mOnFailureCallback_73 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_73_FailureResponse, this); - mOnSuccessCallback_73 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_73_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt64s(mOnSuccessCallback_73->Cancel(), mOnFailureCallback_73->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_73; - delete mOnSuccessCallback_73; - } + err = cluster.ReadAttributeInt64s(mOnSuccessCallback_73.Cancel(), mOnFailureCallback_73.Cancel()); return err; } @@ -9235,9 +7754,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_73; - delete runner->mOnSuccessCallback_73; - if (runner->mIsFailureExpected_73 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9254,9 +7770,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_73; - delete runner->mOnSuccessCallback_73; - if (runner->mIsFailureExpected_73 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9275,33 +7788,26 @@ class TestCluster : public TestCommand } // Test Write attribute INT64S Default Value - typedef void (*SuccessCallback_74)(void * context, int64_t int64s); - chip::Callback::Callback * mOnSuccessCallback_74 = nullptr; - chip::Callback::Callback * mOnFailureCallback_74 = nullptr; - bool mIsFailureExpected_74 = 0; + using SuccessCallback_74 = void (*)(void * context, int64_t int64s); + chip::Callback::Callback mOnSuccessCallback_74{ + OnTestSendClusterTestClusterCommandWriteAttribute_74_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_74{ + OnTestSendClusterTestClusterCommandWriteAttribute_74_FailureResponse, this + }; + bool mIsFailureExpected_74 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_74() { ChipLogProgress(chipTool, "Test Cluster - Write attribute INT64S Default Value: Sending command..."); - mOnFailureCallback_74 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_74_FailureResponse, this); - mOnSuccessCallback_74 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_74_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; int64_t int64sArgument = 0LL; - err = cluster.WriteAttributeInt64s(mOnSuccessCallback_74->Cancel(), mOnFailureCallback_74->Cancel(), int64sArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_74; - delete mOnSuccessCallback_74; - } + err = cluster.WriteAttributeInt64s(mOnSuccessCallback_74.Cancel(), mOnFailureCallback_74.Cancel(), int64sArgument); return err; } @@ -9312,9 +7818,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_74; - delete runner->mOnSuccessCallback_74; - if (runner->mIsFailureExpected_74 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9331,9 +7834,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_74; - delete runner->mOnSuccessCallback_74; - if (runner->mIsFailureExpected_74 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9345,32 +7845,25 @@ class TestCluster : public TestCommand } // Test Read attribute INT64S Default Value - typedef void (*SuccessCallback_75)(void * context, int64_t int64s); - chip::Callback::Callback * mOnSuccessCallback_75 = nullptr; - chip::Callback::Callback * mOnFailureCallback_75 = nullptr; - bool mIsFailureExpected_75 = 0; + using SuccessCallback_75 = void (*)(void * context, int64_t int64s); + chip::Callback::Callback mOnSuccessCallback_75{ + OnTestSendClusterTestClusterCommandReadAttribute_75_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_75{ + OnTestSendClusterTestClusterCommandReadAttribute_75_FailureResponse, this + }; + bool mIsFailureExpected_75 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_75() { ChipLogProgress(chipTool, "Test Cluster - Read attribute INT64S Default Value: Sending command..."); - mOnFailureCallback_75 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_75_FailureResponse, this); - mOnSuccessCallback_75 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_75_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInt64s(mOnSuccessCallback_75->Cancel(), mOnFailureCallback_75->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_75; - delete mOnSuccessCallback_75; - } + err = cluster.ReadAttributeInt64s(mOnSuccessCallback_75.Cancel(), mOnFailureCallback_75.Cancel()); return err; } @@ -9381,9 +7874,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_75; - delete runner->mOnSuccessCallback_75; - if (runner->mIsFailureExpected_75 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9400,9 +7890,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_75; - delete runner->mOnSuccessCallback_75; - if (runner->mIsFailureExpected_75 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9421,32 +7908,25 @@ class TestCluster : public TestCommand } // Test Read attribute ENUM8 Default Value - typedef void (*SuccessCallback_76)(void * context, uint8_t enum8); - chip::Callback::Callback * mOnSuccessCallback_76 = nullptr; - chip::Callback::Callback * mOnFailureCallback_76 = nullptr; - bool mIsFailureExpected_76 = 0; + using SuccessCallback_76 = void (*)(void * context, uint8_t enum8); + chip::Callback::Callback mOnSuccessCallback_76{ + OnTestSendClusterTestClusterCommandReadAttribute_76_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_76{ + OnTestSendClusterTestClusterCommandReadAttribute_76_FailureResponse, this + }; + bool mIsFailureExpected_76 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_76() { ChipLogProgress(chipTool, "Test Cluster - Read attribute ENUM8 Default Value: Sending command..."); - mOnFailureCallback_76 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_76_FailureResponse, this); - mOnSuccessCallback_76 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_76_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeEnum8(mOnSuccessCallback_76->Cancel(), mOnFailureCallback_76->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_76; - delete mOnSuccessCallback_76; - } + err = cluster.ReadAttributeEnum8(mOnSuccessCallback_76.Cancel(), mOnFailureCallback_76.Cancel()); return err; } @@ -9457,9 +7937,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_76; - delete runner->mOnSuccessCallback_76; - if (runner->mIsFailureExpected_76 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9476,9 +7953,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_76; - delete runner->mOnSuccessCallback_76; - if (runner->mIsFailureExpected_76 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9497,33 +7971,26 @@ class TestCluster : public TestCommand } // Test Write attribute ENUM8 Max Value - typedef void (*SuccessCallback_77)(void * context, uint8_t enum8); - chip::Callback::Callback * mOnSuccessCallback_77 = nullptr; - chip::Callback::Callback * mOnFailureCallback_77 = nullptr; - bool mIsFailureExpected_77 = 0; + using SuccessCallback_77 = void (*)(void * context, uint8_t enum8); + chip::Callback::Callback mOnSuccessCallback_77{ + OnTestSendClusterTestClusterCommandWriteAttribute_77_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_77{ + OnTestSendClusterTestClusterCommandWriteAttribute_77_FailureResponse, this + }; + bool mIsFailureExpected_77 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_77() { ChipLogProgress(chipTool, "Test Cluster - Write attribute ENUM8 Max Value: Sending command..."); - mOnFailureCallback_77 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_77_FailureResponse, this); - mOnSuccessCallback_77 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_77_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t enum8Argument = 255; - err = cluster.WriteAttributeEnum8(mOnSuccessCallback_77->Cancel(), mOnFailureCallback_77->Cancel(), enum8Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_77; - delete mOnSuccessCallback_77; - } + err = cluster.WriteAttributeEnum8(mOnSuccessCallback_77.Cancel(), mOnFailureCallback_77.Cancel(), enum8Argument); return err; } @@ -9534,9 +8001,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_77; - delete runner->mOnSuccessCallback_77; - if (runner->mIsFailureExpected_77 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9553,9 +8017,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_77; - delete runner->mOnSuccessCallback_77; - if (runner->mIsFailureExpected_77 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9567,32 +8028,25 @@ class TestCluster : public TestCommand } // Test Read attribute ENUM8 Max Value - typedef void (*SuccessCallback_78)(void * context, uint8_t enum8); - chip::Callback::Callback * mOnSuccessCallback_78 = nullptr; - chip::Callback::Callback * mOnFailureCallback_78 = nullptr; - bool mIsFailureExpected_78 = 0; + using SuccessCallback_78 = void (*)(void * context, uint8_t enum8); + chip::Callback::Callback mOnSuccessCallback_78{ + OnTestSendClusterTestClusterCommandReadAttribute_78_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_78{ + OnTestSendClusterTestClusterCommandReadAttribute_78_FailureResponse, this + }; + bool mIsFailureExpected_78 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_78() { ChipLogProgress(chipTool, "Test Cluster - Read attribute ENUM8 Max Value: Sending command..."); - mOnFailureCallback_78 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_78_FailureResponse, this); - mOnSuccessCallback_78 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_78_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeEnum8(mOnSuccessCallback_78->Cancel(), mOnFailureCallback_78->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_78; - delete mOnSuccessCallback_78; - } + err = cluster.ReadAttributeEnum8(mOnSuccessCallback_78.Cancel(), mOnFailureCallback_78.Cancel()); return err; } @@ -9603,9 +8057,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_78; - delete runner->mOnSuccessCallback_78; - if (runner->mIsFailureExpected_78 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9622,9 +8073,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_78; - delete runner->mOnSuccessCallback_78; - if (runner->mIsFailureExpected_78 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9643,33 +8091,26 @@ class TestCluster : public TestCommand } // Test Write attribute ENUM8 Min Value - typedef void (*SuccessCallback_79)(void * context, uint8_t enum8); - chip::Callback::Callback * mOnSuccessCallback_79 = nullptr; - chip::Callback::Callback * mOnFailureCallback_79 = nullptr; - bool mIsFailureExpected_79 = 0; + using SuccessCallback_79 = void (*)(void * context, uint8_t enum8); + chip::Callback::Callback mOnSuccessCallback_79{ + OnTestSendClusterTestClusterCommandWriteAttribute_79_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_79{ + OnTestSendClusterTestClusterCommandWriteAttribute_79_FailureResponse, this + }; + bool mIsFailureExpected_79 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_79() { ChipLogProgress(chipTool, "Test Cluster - Write attribute ENUM8 Min Value: Sending command..."); - mOnFailureCallback_79 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_79_FailureResponse, this); - mOnSuccessCallback_79 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_79_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t enum8Argument = 0; - err = cluster.WriteAttributeEnum8(mOnSuccessCallback_79->Cancel(), mOnFailureCallback_79->Cancel(), enum8Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_79; - delete mOnSuccessCallback_79; - } + err = cluster.WriteAttributeEnum8(mOnSuccessCallback_79.Cancel(), mOnFailureCallback_79.Cancel(), enum8Argument); return err; } @@ -9680,9 +8121,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_79; - delete runner->mOnSuccessCallback_79; - if (runner->mIsFailureExpected_79 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9699,9 +8137,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_79; - delete runner->mOnSuccessCallback_79; - if (runner->mIsFailureExpected_79 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9713,32 +8148,25 @@ class TestCluster : public TestCommand } // Test Read attribute ENUM8 Min Value - typedef void (*SuccessCallback_80)(void * context, uint8_t enum8); - chip::Callback::Callback * mOnSuccessCallback_80 = nullptr; - chip::Callback::Callback * mOnFailureCallback_80 = nullptr; - bool mIsFailureExpected_80 = 0; + using SuccessCallback_80 = void (*)(void * context, uint8_t enum8); + chip::Callback::Callback mOnSuccessCallback_80{ + OnTestSendClusterTestClusterCommandReadAttribute_80_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_80{ + OnTestSendClusterTestClusterCommandReadAttribute_80_FailureResponse, this + }; + bool mIsFailureExpected_80 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_80() { ChipLogProgress(chipTool, "Test Cluster - Read attribute ENUM8 Min Value: Sending command..."); - mOnFailureCallback_80 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_80_FailureResponse, this); - mOnSuccessCallback_80 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_80_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeEnum8(mOnSuccessCallback_80->Cancel(), mOnFailureCallback_80->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_80; - delete mOnSuccessCallback_80; - } + err = cluster.ReadAttributeEnum8(mOnSuccessCallback_80.Cancel(), mOnFailureCallback_80.Cancel()); return err; } @@ -9749,9 +8177,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_80; - delete runner->mOnSuccessCallback_80; - if (runner->mIsFailureExpected_80 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9768,9 +8193,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_80; - delete runner->mOnSuccessCallback_80; - if (runner->mIsFailureExpected_80 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9789,32 +8211,25 @@ class TestCluster : public TestCommand } // Test Read attribute ENUM16 Default Value - typedef void (*SuccessCallback_81)(void * context, uint16_t enum16); - chip::Callback::Callback * mOnSuccessCallback_81 = nullptr; - chip::Callback::Callback * mOnFailureCallback_81 = nullptr; - bool mIsFailureExpected_81 = 0; + using SuccessCallback_81 = void (*)(void * context, uint16_t enum16); + chip::Callback::Callback mOnSuccessCallback_81{ + OnTestSendClusterTestClusterCommandReadAttribute_81_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_81{ + OnTestSendClusterTestClusterCommandReadAttribute_81_FailureResponse, this + }; + bool mIsFailureExpected_81 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_81() { ChipLogProgress(chipTool, "Test Cluster - Read attribute ENUM16 Default Value: Sending command..."); - mOnFailureCallback_81 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_81_FailureResponse, this); - mOnSuccessCallback_81 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_81_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeEnum16(mOnSuccessCallback_81->Cancel(), mOnFailureCallback_81->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_81; - delete mOnSuccessCallback_81; - } + err = cluster.ReadAttributeEnum16(mOnSuccessCallback_81.Cancel(), mOnFailureCallback_81.Cancel()); return err; } @@ -9825,9 +8240,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_81; - delete runner->mOnSuccessCallback_81; - if (runner->mIsFailureExpected_81 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9844,9 +8256,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_81; - delete runner->mOnSuccessCallback_81; - if (runner->mIsFailureExpected_81 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9865,33 +8274,26 @@ class TestCluster : public TestCommand } // Test Write attribute ENUM16 Max Value - typedef void (*SuccessCallback_82)(void * context, uint16_t enum16); - chip::Callback::Callback * mOnSuccessCallback_82 = nullptr; - chip::Callback::Callback * mOnFailureCallback_82 = nullptr; - bool mIsFailureExpected_82 = 0; + using SuccessCallback_82 = void (*)(void * context, uint16_t enum16); + chip::Callback::Callback mOnSuccessCallback_82{ + OnTestSendClusterTestClusterCommandWriteAttribute_82_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_82{ + OnTestSendClusterTestClusterCommandWriteAttribute_82_FailureResponse, this + }; + bool mIsFailureExpected_82 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_82() { ChipLogProgress(chipTool, "Test Cluster - Write attribute ENUM16 Max Value: Sending command..."); - mOnFailureCallback_82 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_82_FailureResponse, this); - mOnSuccessCallback_82 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_82_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t enum16Argument = 65535U; - err = cluster.WriteAttributeEnum16(mOnSuccessCallback_82->Cancel(), mOnFailureCallback_82->Cancel(), enum16Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_82; - delete mOnSuccessCallback_82; - } + err = cluster.WriteAttributeEnum16(mOnSuccessCallback_82.Cancel(), mOnFailureCallback_82.Cancel(), enum16Argument); return err; } @@ -9902,9 +8304,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_82; - delete runner->mOnSuccessCallback_82; - if (runner->mIsFailureExpected_82 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9921,9 +8320,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_82; - delete runner->mOnSuccessCallback_82; - if (runner->mIsFailureExpected_82 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -9935,32 +8331,25 @@ class TestCluster : public TestCommand } // Test Read attribute ENUM16 Max Value - typedef void (*SuccessCallback_83)(void * context, uint16_t enum16); - chip::Callback::Callback * mOnSuccessCallback_83 = nullptr; - chip::Callback::Callback * mOnFailureCallback_83 = nullptr; - bool mIsFailureExpected_83 = 0; + using SuccessCallback_83 = void (*)(void * context, uint16_t enum16); + chip::Callback::Callback mOnSuccessCallback_83{ + OnTestSendClusterTestClusterCommandReadAttribute_83_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_83{ + OnTestSendClusterTestClusterCommandReadAttribute_83_FailureResponse, this + }; + bool mIsFailureExpected_83 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_83() { ChipLogProgress(chipTool, "Test Cluster - Read attribute ENUM16 Max Value: Sending command..."); - mOnFailureCallback_83 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_83_FailureResponse, this); - mOnSuccessCallback_83 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_83_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeEnum16(mOnSuccessCallback_83->Cancel(), mOnFailureCallback_83->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_83; - delete mOnSuccessCallback_83; - } + err = cluster.ReadAttributeEnum16(mOnSuccessCallback_83.Cancel(), mOnFailureCallback_83.Cancel()); return err; } @@ -9971,9 +8360,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_83; - delete runner->mOnSuccessCallback_83; - if (runner->mIsFailureExpected_83 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -9990,9 +8376,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_83; - delete runner->mOnSuccessCallback_83; - if (runner->mIsFailureExpected_83 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10011,33 +8394,26 @@ class TestCluster : public TestCommand } // Test Write attribute ENUM16 Min Value - typedef void (*SuccessCallback_84)(void * context, uint16_t enum16); - chip::Callback::Callback * mOnSuccessCallback_84 = nullptr; - chip::Callback::Callback * mOnFailureCallback_84 = nullptr; - bool mIsFailureExpected_84 = 0; + using SuccessCallback_84 = void (*)(void * context, uint16_t enum16); + chip::Callback::Callback mOnSuccessCallback_84{ + OnTestSendClusterTestClusterCommandWriteAttribute_84_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_84{ + OnTestSendClusterTestClusterCommandWriteAttribute_84_FailureResponse, this + }; + bool mIsFailureExpected_84 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_84() { ChipLogProgress(chipTool, "Test Cluster - Write attribute ENUM16 Min Value: Sending command..."); - mOnFailureCallback_84 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_84_FailureResponse, this); - mOnSuccessCallback_84 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_84_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t enum16Argument = 0U; - err = cluster.WriteAttributeEnum16(mOnSuccessCallback_84->Cancel(), mOnFailureCallback_84->Cancel(), enum16Argument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_84; - delete mOnSuccessCallback_84; - } + err = cluster.WriteAttributeEnum16(mOnSuccessCallback_84.Cancel(), mOnFailureCallback_84.Cancel(), enum16Argument); return err; } @@ -10048,9 +8424,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_84; - delete runner->mOnSuccessCallback_84; - if (runner->mIsFailureExpected_84 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10067,9 +8440,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_84; - delete runner->mOnSuccessCallback_84; - if (runner->mIsFailureExpected_84 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10081,32 +8451,25 @@ class TestCluster : public TestCommand } // Test Read attribute ENUM16 Min Value - typedef void (*SuccessCallback_85)(void * context, uint16_t enum16); - chip::Callback::Callback * mOnSuccessCallback_85 = nullptr; - chip::Callback::Callback * mOnFailureCallback_85 = nullptr; - bool mIsFailureExpected_85 = 0; + using SuccessCallback_85 = void (*)(void * context, uint16_t enum16); + chip::Callback::Callback mOnSuccessCallback_85{ + OnTestSendClusterTestClusterCommandReadAttribute_85_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_85{ + OnTestSendClusterTestClusterCommandReadAttribute_85_FailureResponse, this + }; + bool mIsFailureExpected_85 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_85() { ChipLogProgress(chipTool, "Test Cluster - Read attribute ENUM16 Min Value: Sending command..."); - mOnFailureCallback_85 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_85_FailureResponse, this); - mOnSuccessCallback_85 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_85_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeEnum16(mOnSuccessCallback_85->Cancel(), mOnFailureCallback_85->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_85; - delete mOnSuccessCallback_85; - } + err = cluster.ReadAttributeEnum16(mOnSuccessCallback_85.Cancel(), mOnFailureCallback_85.Cancel()); return err; } @@ -10117,9 +8480,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_85; - delete runner->mOnSuccessCallback_85; - if (runner->mIsFailureExpected_85 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10136,9 +8496,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_85; - delete runner->mOnSuccessCallback_85; - if (runner->mIsFailureExpected_85 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10157,32 +8514,25 @@ class TestCluster : public TestCommand } // Test Read attribute OCTET_STRING Default Value - typedef void (*SuccessCallback_86)(void * context, chip::ByteSpan octetString); - chip::Callback::Callback * mOnSuccessCallback_86 = nullptr; - chip::Callback::Callback * mOnFailureCallback_86 = nullptr; - bool mIsFailureExpected_86 = 0; + using SuccessCallback_86 = void (*)(void * context, chip::ByteSpan octetString); + chip::Callback::Callback mOnSuccessCallback_86{ + OnTestSendClusterTestClusterCommandReadAttribute_86_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_86{ + OnTestSendClusterTestClusterCommandReadAttribute_86_FailureResponse, this + }; + bool mIsFailureExpected_86 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_86() { ChipLogProgress(chipTool, "Test Cluster - Read attribute OCTET_STRING Default Value: Sending command..."); - mOnFailureCallback_86 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_86_FailureResponse, this); - mOnSuccessCallback_86 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_86_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOctetString(mOnSuccessCallback_86->Cancel(), mOnFailureCallback_86->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_86; - delete mOnSuccessCallback_86; - } + err = cluster.ReadAttributeOctetString(mOnSuccessCallback_86.Cancel(), mOnFailureCallback_86.Cancel()); return err; } @@ -10193,9 +8543,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_86; - delete runner->mOnSuccessCallback_86; - if (runner->mIsFailureExpected_86 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10212,9 +8559,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_86; - delete runner->mOnSuccessCallback_86; - if (runner->mIsFailureExpected_86 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10234,34 +8578,27 @@ class TestCluster : public TestCommand } // Test Write attribute OCTET_STRING - typedef void (*SuccessCallback_87)(void * context, chip::ByteSpan octetString); - chip::Callback::Callback * mOnSuccessCallback_87 = nullptr; - chip::Callback::Callback * mOnFailureCallback_87 = nullptr; - bool mIsFailureExpected_87 = 0; + using SuccessCallback_87 = void (*)(void * context, chip::ByteSpan octetString); + chip::Callback::Callback mOnSuccessCallback_87{ + OnTestSendClusterTestClusterCommandWriteAttribute_87_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_87{ + OnTestSendClusterTestClusterCommandWriteAttribute_87_FailureResponse, this + }; + bool mIsFailureExpected_87 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_87() { ChipLogProgress(chipTool, "Test Cluster - Write attribute OCTET_STRING: Sending command..."); - mOnFailureCallback_87 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_87_FailureResponse, this); - mOnSuccessCallback_87 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_87_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; chip::ByteSpan octetStringArgument = chip::ByteSpan(chip::Uint8::from_const_char("TestValue"), strlen("TestValue")); - err = cluster.WriteAttributeOctetString(mOnSuccessCallback_87->Cancel(), mOnFailureCallback_87->Cancel(), - octetStringArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_87; - delete mOnSuccessCallback_87; - } + err = + cluster.WriteAttributeOctetString(mOnSuccessCallback_87.Cancel(), mOnFailureCallback_87.Cancel(), octetStringArgument); return err; } @@ -10272,9 +8609,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_87; - delete runner->mOnSuccessCallback_87; - if (runner->mIsFailureExpected_87 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10291,9 +8625,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_87; - delete runner->mOnSuccessCallback_87; - if (runner->mIsFailureExpected_87 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10305,32 +8636,25 @@ class TestCluster : public TestCommand } // Test Read attribute OCTET_STRING - typedef void (*SuccessCallback_88)(void * context, chip::ByteSpan octetString); - chip::Callback::Callback * mOnSuccessCallback_88 = nullptr; - chip::Callback::Callback * mOnFailureCallback_88 = nullptr; - bool mIsFailureExpected_88 = 0; + using SuccessCallback_88 = void (*)(void * context, chip::ByteSpan octetString); + chip::Callback::Callback mOnSuccessCallback_88{ + OnTestSendClusterTestClusterCommandReadAttribute_88_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_88{ + OnTestSendClusterTestClusterCommandReadAttribute_88_FailureResponse, this + }; + bool mIsFailureExpected_88 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_88() { ChipLogProgress(chipTool, "Test Cluster - Read attribute OCTET_STRING: Sending command..."); - mOnFailureCallback_88 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_88_FailureResponse, this); - mOnSuccessCallback_88 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_88_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOctetString(mOnSuccessCallback_88->Cancel(), mOnFailureCallback_88->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_88; - delete mOnSuccessCallback_88; - } + err = cluster.ReadAttributeOctetString(mOnSuccessCallback_88.Cancel(), mOnFailureCallback_88.Cancel()); return err; } @@ -10341,9 +8665,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_88; - delete runner->mOnSuccessCallback_88; - if (runner->mIsFailureExpected_88 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10360,9 +8681,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_88; - delete runner->mOnSuccessCallback_88; - if (runner->mIsFailureExpected_88 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10382,20 +8700,19 @@ class TestCluster : public TestCommand } // Test Write attribute OCTET_STRING - typedef void (*SuccessCallback_89)(void * context, chip::ByteSpan octetString); - chip::Callback::Callback * mOnSuccessCallback_89 = nullptr; - chip::Callback::Callback * mOnFailureCallback_89 = nullptr; - bool mIsFailureExpected_89 = 0; + using SuccessCallback_89 = void (*)(void * context, chip::ByteSpan octetString); + chip::Callback::Callback mOnSuccessCallback_89{ + OnTestSendClusterTestClusterCommandWriteAttribute_89_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_89{ + OnTestSendClusterTestClusterCommandWriteAttribute_89_FailureResponse, this + }; + bool mIsFailureExpected_89 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_89() { ChipLogProgress(chipTool, "Test Cluster - Write attribute OCTET_STRING: Sending command..."); - mOnFailureCallback_89 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_89_FailureResponse, this); - mOnSuccessCallback_89 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_89_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); @@ -10403,14 +8720,8 @@ class TestCluster : public TestCommand chip::ByteSpan octetStringArgument = chip::ByteSpan(chip::Uint8::from_const_char("TestValueLongerThan10"), strlen("TestValueLongerThan10")); - err = cluster.WriteAttributeOctetString(mOnSuccessCallback_89->Cancel(), mOnFailureCallback_89->Cancel(), - octetStringArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_89; - delete mOnSuccessCallback_89; - } + err = + cluster.WriteAttributeOctetString(mOnSuccessCallback_89.Cancel(), mOnFailureCallback_89.Cancel(), octetStringArgument); return err; } @@ -10421,9 +8732,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_89; - delete runner->mOnSuccessCallback_89; - if (runner->mIsFailureExpected_89 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10440,9 +8748,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_89; - delete runner->mOnSuccessCallback_89; - if (runner->mIsFailureExpected_89 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10454,32 +8759,25 @@ class TestCluster : public TestCommand } // Test Read attribute OCTET_STRING - typedef void (*SuccessCallback_90)(void * context, chip::ByteSpan octetString); - chip::Callback::Callback * mOnSuccessCallback_90 = nullptr; - chip::Callback::Callback * mOnFailureCallback_90 = nullptr; - bool mIsFailureExpected_90 = 0; + using SuccessCallback_90 = void (*)(void * context, chip::ByteSpan octetString); + chip::Callback::Callback mOnSuccessCallback_90{ + OnTestSendClusterTestClusterCommandReadAttribute_90_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_90{ + OnTestSendClusterTestClusterCommandReadAttribute_90_FailureResponse, this + }; + bool mIsFailureExpected_90 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_90() { ChipLogProgress(chipTool, "Test Cluster - Read attribute OCTET_STRING: Sending command..."); - mOnFailureCallback_90 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_90_FailureResponse, this); - mOnSuccessCallback_90 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_90_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOctetString(mOnSuccessCallback_90->Cancel(), mOnFailureCallback_90->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_90; - delete mOnSuccessCallback_90; - } + err = cluster.ReadAttributeOctetString(mOnSuccessCallback_90.Cancel(), mOnFailureCallback_90.Cancel()); return err; } @@ -10490,9 +8788,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_90; - delete runner->mOnSuccessCallback_90; - if (runner->mIsFailureExpected_90 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10509,9 +8804,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_90; - delete runner->mOnSuccessCallback_90; - if (runner->mIsFailureExpected_90 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10531,34 +8823,27 @@ class TestCluster : public TestCommand } // Test Write attribute OCTET_STRING - typedef void (*SuccessCallback_91)(void * context, chip::ByteSpan octetString); - chip::Callback::Callback * mOnSuccessCallback_91 = nullptr; - chip::Callback::Callback * mOnFailureCallback_91 = nullptr; - bool mIsFailureExpected_91 = 0; + using SuccessCallback_91 = void (*)(void * context, chip::ByteSpan octetString); + chip::Callback::Callback mOnSuccessCallback_91{ + OnTestSendClusterTestClusterCommandWriteAttribute_91_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_91{ + OnTestSendClusterTestClusterCommandWriteAttribute_91_FailureResponse, this + }; + bool mIsFailureExpected_91 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_91() { ChipLogProgress(chipTool, "Test Cluster - Write attribute OCTET_STRING: Sending command..."); - mOnFailureCallback_91 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_91_FailureResponse, this); - mOnSuccessCallback_91 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_91_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; chip::ByteSpan octetStringArgument = chip::ByteSpan(chip::Uint8::from_const_char(""), strlen("")); - err = cluster.WriteAttributeOctetString(mOnSuccessCallback_91->Cancel(), mOnFailureCallback_91->Cancel(), - octetStringArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_91; - delete mOnSuccessCallback_91; - } + err = + cluster.WriteAttributeOctetString(mOnSuccessCallback_91.Cancel(), mOnFailureCallback_91.Cancel(), octetStringArgument); return err; } @@ -10569,9 +8854,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_91; - delete runner->mOnSuccessCallback_91; - if (runner->mIsFailureExpected_91 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10588,9 +8870,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_91; - delete runner->mOnSuccessCallback_91; - if (runner->mIsFailureExpected_91 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10602,32 +8881,25 @@ class TestCluster : public TestCommand } // Test Read attribute LONG_OCTET_STRING Default Value - typedef void (*SuccessCallback_92)(void * context, chip::ByteSpan longOctetString); - chip::Callback::Callback * mOnSuccessCallback_92 = nullptr; - chip::Callback::Callback * mOnFailureCallback_92 = nullptr; - bool mIsFailureExpected_92 = 0; + using SuccessCallback_92 = void (*)(void * context, chip::ByteSpan longOctetString); + chip::Callback::Callback mOnSuccessCallback_92{ + OnTestSendClusterTestClusterCommandReadAttribute_92_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_92{ + OnTestSendClusterTestClusterCommandReadAttribute_92_FailureResponse, this + }; + bool mIsFailureExpected_92 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_92() { ChipLogProgress(chipTool, "Test Cluster - Read attribute LONG_OCTET_STRING Default Value: Sending command..."); - mOnFailureCallback_92 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_92_FailureResponse, this); - mOnSuccessCallback_92 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_92_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeLongOctetString(mOnSuccessCallback_92->Cancel(), mOnFailureCallback_92->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_92; - delete mOnSuccessCallback_92; - } + err = cluster.ReadAttributeLongOctetString(mOnSuccessCallback_92.Cancel(), mOnFailureCallback_92.Cancel()); return err; } @@ -10638,9 +8910,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_92; - delete runner->mOnSuccessCallback_92; - if (runner->mIsFailureExpected_92 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10657,9 +8926,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_92; - delete runner->mOnSuccessCallback_92; - if (runner->mIsFailureExpected_92 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10679,20 +8945,19 @@ class TestCluster : public TestCommand } // Test Write attribute LONG_OCTET_STRING - typedef void (*SuccessCallback_93)(void * context, chip::ByteSpan longOctetString); - chip::Callback::Callback * mOnSuccessCallback_93 = nullptr; - chip::Callback::Callback * mOnFailureCallback_93 = nullptr; - bool mIsFailureExpected_93 = 0; + using SuccessCallback_93 = void (*)(void * context, chip::ByteSpan longOctetString); + chip::Callback::Callback mOnSuccessCallback_93{ + OnTestSendClusterTestClusterCommandWriteAttribute_93_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_93{ + OnTestSendClusterTestClusterCommandWriteAttribute_93_FailureResponse, this + }; + bool mIsFailureExpected_93 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_93() { ChipLogProgress(chipTool, "Test Cluster - Write attribute LONG_OCTET_STRING: Sending command..."); - mOnFailureCallback_93 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_93_FailureResponse, this); - mOnSuccessCallback_93 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_93_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); @@ -10706,15 +8971,9 @@ class TestCluster : public TestCommand strlen("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" "111111111111111111111111111111111111111111111111111111111111111111111111111111")); - err = cluster.WriteAttributeLongOctetString(mOnSuccessCallback_93->Cancel(), mOnFailureCallback_93->Cancel(), + err = cluster.WriteAttributeLongOctetString(mOnSuccessCallback_93.Cancel(), mOnFailureCallback_93.Cancel(), longOctetStringArgument); - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_93; - delete mOnSuccessCallback_93; - } - return err; } @@ -10724,9 +8983,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_93; - delete runner->mOnSuccessCallback_93; - if (runner->mIsFailureExpected_93 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10743,9 +8999,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_93; - delete runner->mOnSuccessCallback_93; - if (runner->mIsFailureExpected_93 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10757,32 +9010,25 @@ class TestCluster : public TestCommand } // Test Read attribute LONG_OCTET_STRING - typedef void (*SuccessCallback_94)(void * context, chip::ByteSpan longOctetString); - chip::Callback::Callback * mOnSuccessCallback_94 = nullptr; - chip::Callback::Callback * mOnFailureCallback_94 = nullptr; - bool mIsFailureExpected_94 = 0; + using SuccessCallback_94 = void (*)(void * context, chip::ByteSpan longOctetString); + chip::Callback::Callback mOnSuccessCallback_94{ + OnTestSendClusterTestClusterCommandReadAttribute_94_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_94{ + OnTestSendClusterTestClusterCommandReadAttribute_94_FailureResponse, this + }; + bool mIsFailureExpected_94 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_94() { ChipLogProgress(chipTool, "Test Cluster - Read attribute LONG_OCTET_STRING: Sending command..."); - mOnFailureCallback_94 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_94_FailureResponse, this); - mOnSuccessCallback_94 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_94_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeLongOctetString(mOnSuccessCallback_94->Cancel(), mOnFailureCallback_94->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_94; - delete mOnSuccessCallback_94; - } + err = cluster.ReadAttributeLongOctetString(mOnSuccessCallback_94.Cancel(), mOnFailureCallback_94.Cancel()); return err; } @@ -10793,9 +9039,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_94; - delete runner->mOnSuccessCallback_94; - if (runner->mIsFailureExpected_94 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10812,9 +9055,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_94; - delete runner->mOnSuccessCallback_94; - if (runner->mIsFailureExpected_94 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10844,35 +9084,28 @@ class TestCluster : public TestCommand } // Test Write attribute LONG_OCTET_STRING - typedef void (*SuccessCallback_95)(void * context, chip::ByteSpan longOctetString); - chip::Callback::Callback * mOnSuccessCallback_95 = nullptr; - chip::Callback::Callback * mOnFailureCallback_95 = nullptr; - bool mIsFailureExpected_95 = 0; + using SuccessCallback_95 = void (*)(void * context, chip::ByteSpan longOctetString); + chip::Callback::Callback mOnSuccessCallback_95{ + OnTestSendClusterTestClusterCommandWriteAttribute_95_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_95{ + OnTestSendClusterTestClusterCommandWriteAttribute_95_FailureResponse, this + }; + bool mIsFailureExpected_95 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_95() { ChipLogProgress(chipTool, "Test Cluster - Write attribute LONG_OCTET_STRING: Sending command..."); - mOnFailureCallback_95 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_95_FailureResponse, this); - mOnSuccessCallback_95 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_95_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; chip::ByteSpan longOctetStringArgument = chip::ByteSpan(chip::Uint8::from_const_char(""), strlen("")); - err = cluster.WriteAttributeLongOctetString(mOnSuccessCallback_95->Cancel(), mOnFailureCallback_95->Cancel(), + err = cluster.WriteAttributeLongOctetString(mOnSuccessCallback_95.Cancel(), mOnFailureCallback_95.Cancel(), longOctetStringArgument); - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_95; - delete mOnSuccessCallback_95; - } - return err; } @@ -10882,9 +9115,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_95; - delete runner->mOnSuccessCallback_95; - if (runner->mIsFailureExpected_95 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10901,9 +9131,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_95; - delete runner->mOnSuccessCallback_95; - if (runner->mIsFailureExpected_95 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10915,32 +9142,25 @@ class TestCluster : public TestCommand } // Test Read attribute LIST - typedef void (*SuccessCallback_96)(void * context, uint16_t count, uint8_t * listInt8u); - chip::Callback::Callback * mOnSuccessCallback_96 = nullptr; - chip::Callback::Callback * mOnFailureCallback_96 = nullptr; - bool mIsFailureExpected_96 = 0; + using SuccessCallback_96 = void (*)(void * context, uint16_t count, uint8_t * listInt8u); + chip::Callback::Callback mOnSuccessCallback_96{ + OnTestSendClusterTestClusterCommandReadAttribute_96_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_96{ + OnTestSendClusterTestClusterCommandReadAttribute_96_FailureResponse, this + }; + bool mIsFailureExpected_96 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_96() { ChipLogProgress(chipTool, "Test Cluster - Read attribute LIST: Sending command..."); - mOnFailureCallback_96 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_96_FailureResponse, this); - mOnSuccessCallback_96 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_96_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeListInt8u(mOnSuccessCallback_96->Cancel(), mOnFailureCallback_96->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_96; - delete mOnSuccessCallback_96; - } + err = cluster.ReadAttributeListInt8u(mOnSuccessCallback_96.Cancel(), mOnFailureCallback_96.Cancel()); return err; } @@ -10951,9 +9171,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_96; - delete runner->mOnSuccessCallback_96; - if (runner->mIsFailureExpected_96 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -10971,9 +9188,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_96; - delete runner->mOnSuccessCallback_96; - if (runner->mIsFailureExpected_96 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -10992,32 +9206,25 @@ class TestCluster : public TestCommand } // Test Read attribute LIST_OCTET_STRING - typedef void (*SuccessCallback_97)(void * context, uint16_t count, chip::ByteSpan * listOctetString); - chip::Callback::Callback * mOnSuccessCallback_97 = nullptr; - chip::Callback::Callback * mOnFailureCallback_97 = nullptr; - bool mIsFailureExpected_97 = 0; + using SuccessCallback_97 = void (*)(void * context, uint16_t count, chip::ByteSpan * listOctetString); + chip::Callback::Callback mOnSuccessCallback_97{ + OnTestSendClusterTestClusterCommandReadAttribute_97_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_97{ + OnTestSendClusterTestClusterCommandReadAttribute_97_FailureResponse, this + }; + bool mIsFailureExpected_97 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_97() { ChipLogProgress(chipTool, "Test Cluster - Read attribute LIST_OCTET_STRING: Sending command..."); - mOnFailureCallback_97 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_97_FailureResponse, this); - mOnSuccessCallback_97 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_97_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeListOctetString(mOnSuccessCallback_97->Cancel(), mOnFailureCallback_97->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_97; - delete mOnSuccessCallback_97; - } + err = cluster.ReadAttributeListOctetString(mOnSuccessCallback_97.Cancel(), mOnFailureCallback_97.Cancel()); return err; } @@ -11028,9 +9235,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_97; - delete runner->mOnSuccessCallback_97; - if (runner->mIsFailureExpected_97 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11048,9 +9252,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_97; - delete runner->mOnSuccessCallback_97; - if (runner->mIsFailureExpected_97 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11069,32 +9270,25 @@ class TestCluster : public TestCommand } // Test Read attribute LIST_STRUCT_OCTET_STRING - typedef void (*SuccessCallback_98)(void * context, uint16_t count, _TestListStructOctet * listStructOctetString); - chip::Callback::Callback * mOnSuccessCallback_98 = nullptr; - chip::Callback::Callback * mOnFailureCallback_98 = nullptr; - bool mIsFailureExpected_98 = 0; + using SuccessCallback_98 = void (*)(void * context, uint16_t count, _TestListStructOctet * listStructOctetString); + chip::Callback::Callback mOnSuccessCallback_98{ + OnTestSendClusterTestClusterCommandReadAttribute_98_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_98{ + OnTestSendClusterTestClusterCommandReadAttribute_98_FailureResponse, this + }; + bool mIsFailureExpected_98 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_98() { ChipLogProgress(chipTool, "Test Cluster - Read attribute LIST_STRUCT_OCTET_STRING: Sending command..."); - mOnFailureCallback_98 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_98_FailureResponse, this); - mOnSuccessCallback_98 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_98_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeListStructOctetString(mOnSuccessCallback_98->Cancel(), mOnFailureCallback_98->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_98; - delete mOnSuccessCallback_98; - } + err = cluster.ReadAttributeListStructOctetString(mOnSuccessCallback_98.Cancel(), mOnFailureCallback_98.Cancel()); return err; } @@ -11105,9 +9299,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_98; - delete runner->mOnSuccessCallback_98; - if (runner->mIsFailureExpected_98 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11125,9 +9316,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_98; - delete runner->mOnSuccessCallback_98; - if (runner->mIsFailureExpected_98 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11147,32 +9335,25 @@ class TestCluster : public TestCommand } // Test Read attribute UNSUPPORTED - typedef void (*SuccessCallback_99)(void * context, uint8_t unsupported); - chip::Callback::Callback * mOnSuccessCallback_99 = nullptr; - chip::Callback::Callback * mOnFailureCallback_99 = nullptr; - bool mIsFailureExpected_99 = 0; + using SuccessCallback_99 = void (*)(void * context, uint8_t unsupported); + chip::Callback::Callback mOnSuccessCallback_99{ + OnTestSendClusterTestClusterCommandReadAttribute_99_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_99{ + OnTestSendClusterTestClusterCommandReadAttribute_99_FailureResponse, this + }; + bool mIsFailureExpected_99 = 0; CHIP_ERROR TestSendClusterTestClusterCommandReadAttribute_99() { ChipLogProgress(chipTool, "Test Cluster - Read attribute UNSUPPORTED: Sending command..."); - mOnFailureCallback_99 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_99_FailureResponse, this); - mOnSuccessCallback_99 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandReadAttribute_99_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeUnsupported(mOnSuccessCallback_99->Cancel(), mOnFailureCallback_99->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_99; - delete mOnSuccessCallback_99; - } + err = cluster.ReadAttributeUnsupported(mOnSuccessCallback_99.Cancel(), mOnFailureCallback_99.Cancel()); return err; } @@ -11183,9 +9364,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_99; - delete runner->mOnSuccessCallback_99; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -11208,9 +9386,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_99; - delete runner->mOnSuccessCallback_99; - if (runner->mIsFailureExpected_99 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11229,35 +9404,28 @@ class TestCluster : public TestCommand } // Test Writeattribute UNSUPPORTED - typedef void (*SuccessCallback_100)(void * context, uint8_t unsupported); - chip::Callback::Callback * mOnSuccessCallback_100 = nullptr; - chip::Callback::Callback * mOnFailureCallback_100 = nullptr; - bool mIsFailureExpected_100 = 0; + using SuccessCallback_100 = void (*)(void * context, uint8_t unsupported); + chip::Callback::Callback mOnSuccessCallback_100{ + OnTestSendClusterTestClusterCommandWriteAttribute_100_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_100{ + OnTestSendClusterTestClusterCommandWriteAttribute_100_FailureResponse, this + }; + bool mIsFailureExpected_100 = 0; CHIP_ERROR TestSendClusterTestClusterCommandWriteAttribute_100() { ChipLogProgress(chipTool, "Test Cluster - Writeattribute UNSUPPORTED: Sending command..."); - mOnFailureCallback_100 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_100_FailureResponse, this); - mOnSuccessCallback_100 = new chip::Callback::Callback( - OnTestSendClusterTestClusterCommandWriteAttribute_100_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t unsupportedArgument = 0; - err = cluster.WriteAttributeUnsupported(mOnSuccessCallback_100->Cancel(), mOnFailureCallback_100->Cancel(), + err = cluster.WriteAttributeUnsupported(mOnSuccessCallback_100.Cancel(), mOnFailureCallback_100.Cancel(), unsupportedArgument); - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_100; - delete mOnSuccessCallback_100; - } - return err; } @@ -11267,9 +9435,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_100; - delete runner->mOnSuccessCallback_100; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -11292,9 +9457,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_100; - delete runner->mOnSuccessCallback_100; - if (runner->mIsFailureExpected_100 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11306,32 +9468,25 @@ class TestCluster : public TestCommand } // Test Send Test Command to unsupported endpoint - typedef void (*SuccessCallback_101)(void * context); - chip::Callback::Callback * mOnSuccessCallback_101 = nullptr; - chip::Callback::Callback * mOnFailureCallback_101 = nullptr; - bool mIsFailureExpected_101 = 1; + using SuccessCallback_101 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_101{ + OnTestSendClusterTestClusterCommandTest_101_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_101{ + OnTestSendClusterTestClusterCommandTest_101_FailureResponse, this + }; + bool mIsFailureExpected_101 = 1; CHIP_ERROR TestSendClusterTestClusterCommandTest_101() { ChipLogProgress(chipTool, "Test Cluster - Send Test Command to unsupported endpoint: Sending command..."); - mOnFailureCallback_101 = - new chip::Callback::Callback(OnTestSendClusterTestClusterCommandTest_101_FailureResponse, this); - mOnSuccessCallback_101 = - new chip::Callback::Callback(OnTestSendClusterTestClusterCommandTest_101_SuccessResponse, this); - chip::Controller::TestClusterCluster cluster; cluster.Associate(mDevice, 200); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.Test(mOnSuccessCallback_101->Cancel(), mOnFailureCallback_101->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_101; - delete mOnSuccessCallback_101; - } + err = cluster.Test(mOnSuccessCallback_101.Cancel(), mOnFailureCallback_101.Cancel()); return err; } @@ -11342,9 +9497,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_101; - delete runner->mOnSuccessCallback_101; - if (runner->mIsFailureExpected_101 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11361,9 +9513,6 @@ class TestCluster : public TestCommand TestCluster * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_101; - delete runner->mOnSuccessCallback_101; - if (runner->mIsFailureExpected_101 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11427,32 +9576,24 @@ class Test_TC_OO_1_1 : public TestCommand // // Test read the global attribute: ClusterRevision - typedef void (*SuccessCallback_0)(void * context, uint16_t clusterRevision); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint16_t clusterRevision); + chip::Callback::Callback mOnSuccessCallback_0{ OnTestSendClusterOnOffCommandReadAttribute_0_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterOnOffCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_0() { ChipLogProgress(chipTool, "On/Off - read the global attribute: ClusterRevision: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeClusterRevision(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeClusterRevision(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -11463,9 +9604,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11482,9 +9620,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11503,32 +9638,24 @@ class Test_TC_OO_1_1 : public TestCommand } // Test reads back global attribute: ClusterRevision - typedef void (*SuccessCallback_1)(void * context, uint16_t clusterRevision); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, uint16_t clusterRevision); + chip::Callback::Callback mOnSuccessCallback_1{ OnTestSendClusterOnOffCommandReadAttribute_1_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterOnOffCommandReadAttribute_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_1() { ChipLogProgress(chipTool, "On/Off - reads back global attribute: ClusterRevision: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_1_FailureResponse, this); - mOnSuccessCallback_1 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_1_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeClusterRevision(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.ReadAttributeClusterRevision(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel()); return err; } @@ -11539,9 +9666,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11558,9 +9682,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11579,32 +9700,24 @@ class Test_TC_OO_1_1 : public TestCommand } // Test read the optional global attribute: FeatureMap - typedef void (*SuccessCallback_2)(void * context, uint32_t featureMap); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint32_t featureMap); + chip::Callback::Callback mOnSuccessCallback_2{ OnTestSendClusterOnOffCommandReadAttribute_2_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterOnOffCommandReadAttribute_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_2() { ChipLogProgress(chipTool, "On/Off - read the optional global attribute: FeatureMap: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_2_FailureResponse, this); - mOnSuccessCallback_2 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_2_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeFeatureMap(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.ReadAttributeFeatureMap(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -11615,9 +9728,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11634,9 +9744,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11655,32 +9762,24 @@ class Test_TC_OO_1_1 : public TestCommand } // Test reads back optional global attribute: FeatureMap - typedef void (*SuccessCallback_3)(void * context, uint32_t featureMap); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, uint32_t featureMap); + chip::Callback::Callback mOnSuccessCallback_3{ OnTestSendClusterOnOffCommandReadAttribute_3_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterOnOffCommandReadAttribute_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_3() { ChipLogProgress(chipTool, "On/Off - reads back optional global attribute: FeatureMap: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_3_FailureResponse, this); - mOnSuccessCallback_3 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_3_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeFeatureMap(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.ReadAttributeFeatureMap(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -11691,9 +9790,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11710,9 +9806,6 @@ class Test_TC_OO_1_1 : public TestCommand Test_TC_OO_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11807,32 +9900,24 @@ class Test_TC_OO_2_1 : public TestCommand // // Test read the mandatory attribute: OnOff - typedef void (*SuccessCallback_0)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_0{ OnTestSendClusterOnOffCommandReadAttribute_0_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterOnOffCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_0() { ChipLogProgress(chipTool, "On/Off - read the mandatory attribute: OnOff: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -11843,9 +9928,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11862,9 +9944,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11883,32 +9962,24 @@ class Test_TC_OO_2_1 : public TestCommand } // Test reads back mandatory attribute: OnOff - typedef void (*SuccessCallback_1)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_1{ OnTestSendClusterOnOffCommandReadAttribute_1_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterOnOffCommandReadAttribute_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_1() { ChipLogProgress(chipTool, "On/Off - reads back mandatory attribute: OnOff: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_1_FailureResponse, this); - mOnSuccessCallback_1 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_1_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel()); return err; } @@ -11919,9 +9990,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -11938,9 +10006,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -11959,32 +10024,24 @@ class Test_TC_OO_2_1 : public TestCommand } // Test read LT attribute: GlobalSceneControl - typedef void (*SuccessCallback_2)(void * context, uint8_t globalSceneControl); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint8_t globalSceneControl); + chip::Callback::Callback mOnSuccessCallback_2{ OnTestSendClusterOnOffCommandReadAttribute_2_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterOnOffCommandReadAttribute_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_2() { ChipLogProgress(chipTool, "On/Off - read LT attribute: GlobalSceneControl: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_2_FailureResponse, this); - mOnSuccessCallback_2 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_2_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeGlobalSceneControl(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.ReadAttributeGlobalSceneControl(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -11995,9 +10052,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12014,9 +10068,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12035,32 +10086,24 @@ class Test_TC_OO_2_1 : public TestCommand } // Test read LT attribute: OnTime - typedef void (*SuccessCallback_3)(void * context, uint16_t onTime); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, uint16_t onTime); + chip::Callback::Callback mOnSuccessCallback_3{ OnTestSendClusterOnOffCommandReadAttribute_3_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterOnOffCommandReadAttribute_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_3() { ChipLogProgress(chipTool, "On/Off - read LT attribute: OnTime: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_3_FailureResponse, this); - mOnSuccessCallback_3 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_3_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnTime(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.ReadAttributeOnTime(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -12071,9 +10114,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12090,9 +10130,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12111,32 +10148,24 @@ class Test_TC_OO_2_1 : public TestCommand } // Test read LT attribute: OffWaitTime - typedef void (*SuccessCallback_4)(void * context, uint16_t offWaitTime); - chip::Callback::Callback * mOnSuccessCallback_4 = nullptr; - chip::Callback::Callback * mOnFailureCallback_4 = nullptr; - bool mIsFailureExpected_4 = 0; + using SuccessCallback_4 = void (*)(void * context, uint16_t offWaitTime); + chip::Callback::Callback mOnSuccessCallback_4{ OnTestSendClusterOnOffCommandReadAttribute_4_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_4{ + OnTestSendClusterOnOffCommandReadAttribute_4_FailureResponse, this + }; + bool mIsFailureExpected_4 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_4() { ChipLogProgress(chipTool, "On/Off - read LT attribute: OffWaitTime: Sending command..."); - mOnFailureCallback_4 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_4_FailureResponse, this); - mOnSuccessCallback_4 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_4_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOffWaitTime(mOnSuccessCallback_4->Cancel(), mOnFailureCallback_4->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_4; - delete mOnSuccessCallback_4; - } + err = cluster.ReadAttributeOffWaitTime(mOnSuccessCallback_4.Cancel(), mOnFailureCallback_4.Cancel()); return err; } @@ -12147,9 +10176,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12166,9 +10192,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12187,32 +10210,24 @@ class Test_TC_OO_2_1 : public TestCommand } // Test read LT attribute: StartUpOnOff - typedef void (*SuccessCallback_5)(void * context, uint8_t startUpOnOff); - chip::Callback::Callback * mOnSuccessCallback_5 = nullptr; - chip::Callback::Callback * mOnFailureCallback_5 = nullptr; - bool mIsFailureExpected_5 = 0; + using SuccessCallback_5 = void (*)(void * context, uint8_t startUpOnOff); + chip::Callback::Callback mOnSuccessCallback_5{ OnTestSendClusterOnOffCommandReadAttribute_5_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_5{ + OnTestSendClusterOnOffCommandReadAttribute_5_FailureResponse, this + }; + bool mIsFailureExpected_5 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_5() { ChipLogProgress(chipTool, "On/Off - read LT attribute: StartUpOnOff: Sending command..."); - mOnFailureCallback_5 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_5_FailureResponse, this); - mOnSuccessCallback_5 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_5_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeStartUpOnOff(mOnSuccessCallback_5->Cancel(), mOnFailureCallback_5->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_5; - delete mOnSuccessCallback_5; - } + err = cluster.ReadAttributeStartUpOnOff(mOnSuccessCallback_5.Cancel(), mOnFailureCallback_5.Cancel()); return err; } @@ -12223,9 +10238,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12242,9 +10254,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12263,33 +10272,25 @@ class Test_TC_OO_2_1 : public TestCommand } // Test write the default value to LT attribute: OnTime - typedef void (*SuccessCallback_6)(void * context, uint16_t onTime); - chip::Callback::Callback * mOnSuccessCallback_6 = nullptr; - chip::Callback::Callback * mOnFailureCallback_6 = nullptr; - bool mIsFailureExpected_6 = 0; + using SuccessCallback_6 = void (*)(void * context, uint16_t onTime); + chip::Callback::Callback mOnSuccessCallback_6{ OnTestSendClusterOnOffCommandWriteAttribute_6_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_6{ + OnTestSendClusterOnOffCommandWriteAttribute_6_FailureResponse, this + }; + bool mIsFailureExpected_6 = 0; CHIP_ERROR TestSendClusterOnOffCommandWriteAttribute_6() { ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: OnTime: Sending command..."); - mOnFailureCallback_6 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandWriteAttribute_6_FailureResponse, this); - mOnSuccessCallback_6 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandWriteAttribute_6_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t onTimeArgument = 0U; - err = cluster.WriteAttributeOnTime(mOnSuccessCallback_6->Cancel(), mOnFailureCallback_6->Cancel(), onTimeArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_6; - delete mOnSuccessCallback_6; - } + err = cluster.WriteAttributeOnTime(mOnSuccessCallback_6.Cancel(), mOnFailureCallback_6.Cancel(), onTimeArgument); return err; } @@ -12300,9 +10301,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12319,9 +10317,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12333,34 +10328,25 @@ class Test_TC_OO_2_1 : public TestCommand } // Test write the default value to LT attribute: OffWaitTime - typedef void (*SuccessCallback_7)(void * context, uint16_t offWaitTime); - chip::Callback::Callback * mOnSuccessCallback_7 = nullptr; - chip::Callback::Callback * mOnFailureCallback_7 = nullptr; - bool mIsFailureExpected_7 = 0; + using SuccessCallback_7 = void (*)(void * context, uint16_t offWaitTime); + chip::Callback::Callback mOnSuccessCallback_7{ OnTestSendClusterOnOffCommandWriteAttribute_7_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_7{ + OnTestSendClusterOnOffCommandWriteAttribute_7_FailureResponse, this + }; + bool mIsFailureExpected_7 = 0; CHIP_ERROR TestSendClusterOnOffCommandWriteAttribute_7() { ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: OffWaitTime: Sending command..."); - mOnFailureCallback_7 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandWriteAttribute_7_FailureResponse, this); - mOnSuccessCallback_7 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandWriteAttribute_7_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint16_t offWaitTimeArgument = 0U; - err = - cluster.WriteAttributeOffWaitTime(mOnSuccessCallback_7->Cancel(), mOnFailureCallback_7->Cancel(), offWaitTimeArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_7; - delete mOnSuccessCallback_7; - } + err = cluster.WriteAttributeOffWaitTime(mOnSuccessCallback_7.Cancel(), mOnFailureCallback_7.Cancel(), offWaitTimeArgument); return err; } @@ -12371,9 +10357,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12390,9 +10373,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12404,34 +10384,26 @@ class Test_TC_OO_2_1 : public TestCommand } // Test write the default value to LT attribute: StartUpOnOff - typedef void (*SuccessCallback_8)(void * context, uint8_t startUpOnOff); - chip::Callback::Callback * mOnSuccessCallback_8 = nullptr; - chip::Callback::Callback * mOnFailureCallback_8 = nullptr; - bool mIsFailureExpected_8 = 0; + using SuccessCallback_8 = void (*)(void * context, uint8_t startUpOnOff); + chip::Callback::Callback mOnSuccessCallback_8{ OnTestSendClusterOnOffCommandWriteAttribute_8_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_8{ + OnTestSendClusterOnOffCommandWriteAttribute_8_FailureResponse, this + }; + bool mIsFailureExpected_8 = 0; CHIP_ERROR TestSendClusterOnOffCommandWriteAttribute_8() { ChipLogProgress(chipTool, "On/Off - write the default value to LT attribute: StartUpOnOff: Sending command..."); - mOnFailureCallback_8 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandWriteAttribute_8_FailureResponse, this); - mOnSuccessCallback_8 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandWriteAttribute_8_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; uint8_t startUpOnOffArgument = 0; - err = cluster.WriteAttributeStartUpOnOff(mOnSuccessCallback_8->Cancel(), mOnFailureCallback_8->Cancel(), - startUpOnOffArgument); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_8; - delete mOnSuccessCallback_8; - } + err = + cluster.WriteAttributeStartUpOnOff(mOnSuccessCallback_8.Cancel(), mOnFailureCallback_8.Cancel(), startUpOnOffArgument); return err; } @@ -12442,9 +10414,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12461,9 +10430,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12475,32 +10441,24 @@ class Test_TC_OO_2_1 : public TestCommand } // Test reads back LT attribute: OnTime - typedef void (*SuccessCallback_9)(void * context, uint16_t onTime); - chip::Callback::Callback * mOnSuccessCallback_9 = nullptr; - chip::Callback::Callback * mOnFailureCallback_9 = nullptr; - bool mIsFailureExpected_9 = 0; + using SuccessCallback_9 = void (*)(void * context, uint16_t onTime); + chip::Callback::Callback mOnSuccessCallback_9{ OnTestSendClusterOnOffCommandReadAttribute_9_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_9{ + OnTestSendClusterOnOffCommandReadAttribute_9_FailureResponse, this + }; + bool mIsFailureExpected_9 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_9() { ChipLogProgress(chipTool, "On/Off - reads back LT attribute: OnTime: Sending command..."); - mOnFailureCallback_9 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_9_FailureResponse, this); - mOnSuccessCallback_9 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_9_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnTime(mOnSuccessCallback_9->Cancel(), mOnFailureCallback_9->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_9; - delete mOnSuccessCallback_9; - } + err = cluster.ReadAttributeOnTime(mOnSuccessCallback_9.Cancel(), mOnFailureCallback_9.Cancel()); return err; } @@ -12511,9 +10469,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12530,9 +10485,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12551,32 +10503,25 @@ class Test_TC_OO_2_1 : public TestCommand } // Test reads back LT attribute: OffWaitTime - typedef void (*SuccessCallback_10)(void * context, uint16_t offWaitTime); - chip::Callback::Callback * mOnSuccessCallback_10 = nullptr; - chip::Callback::Callback * mOnFailureCallback_10 = nullptr; - bool mIsFailureExpected_10 = 0; + using SuccessCallback_10 = void (*)(void * context, uint16_t offWaitTime); + chip::Callback::Callback mOnSuccessCallback_10{ + OnTestSendClusterOnOffCommandReadAttribute_10_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_10{ + OnTestSendClusterOnOffCommandReadAttribute_10_FailureResponse, this + }; + bool mIsFailureExpected_10 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_10() { ChipLogProgress(chipTool, "On/Off - reads back LT attribute: OffWaitTime: Sending command..."); - mOnFailureCallback_10 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_10_FailureResponse, this); - mOnSuccessCallback_10 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_10_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOffWaitTime(mOnSuccessCallback_10->Cancel(), mOnFailureCallback_10->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_10; - delete mOnSuccessCallback_10; - } + err = cluster.ReadAttributeOffWaitTime(mOnSuccessCallback_10.Cancel(), mOnFailureCallback_10.Cancel()); return err; } @@ -12587,9 +10532,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12606,9 +10548,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12627,32 +10566,25 @@ class Test_TC_OO_2_1 : public TestCommand } // Test reads back LT attribute: StartUpOnOff - typedef void (*SuccessCallback_11)(void * context, uint8_t startUpOnOff); - chip::Callback::Callback * mOnSuccessCallback_11 = nullptr; - chip::Callback::Callback * mOnFailureCallback_11 = nullptr; - bool mIsFailureExpected_11 = 0; + using SuccessCallback_11 = void (*)(void * context, uint8_t startUpOnOff); + chip::Callback::Callback mOnSuccessCallback_11{ + OnTestSendClusterOnOffCommandReadAttribute_11_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_11{ + OnTestSendClusterOnOffCommandReadAttribute_11_FailureResponse, this + }; + bool mIsFailureExpected_11 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_11() { ChipLogProgress(chipTool, "On/Off - reads back LT attribute: StartUpOnOff: Sending command..."); - mOnFailureCallback_11 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_11_FailureResponse, this); - mOnSuccessCallback_11 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_11_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeStartUpOnOff(mOnSuccessCallback_11->Cancel(), mOnFailureCallback_11->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_11; - delete mOnSuccessCallback_11; - } + err = cluster.ReadAttributeStartUpOnOff(mOnSuccessCallback_11.Cancel(), mOnFailureCallback_11.Cancel()); return err; } @@ -12663,9 +10595,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (runner->mIsFailureExpected_11 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12682,9 +10611,6 @@ class Test_TC_OO_2_1 : public TestCommand Test_TC_OO_2_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (runner->mIsFailureExpected_11 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12785,32 +10711,22 @@ class Test_TC_OO_2_2 : public TestCommand // // Test Send Off Command - typedef void (*SuccessCallback_0)(void * context); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_0{ OnTestSendClusterOnOffCommandOff_0_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_0{ OnTestSendClusterOnOffCommandOff_0_FailureResponse, + this }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterOnOffCommandOff_0() { ChipLogProgress(chipTool, "On/Off - Send Off Command: Sending command..."); - mOnFailureCallback_0 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOff_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOff_0_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); - CHIP_ERROR err = CHIP_NO_ERROR; - - err = cluster.Off(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + CHIP_ERROR err = CHIP_NO_ERROR; + + err = cluster.Off(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -12821,9 +10737,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12840,9 +10753,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12854,32 +10764,24 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Check on/off attribute value is false after off command - typedef void (*SuccessCallback_1)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_1{ OnTestSendClusterOnOffCommandReadAttribute_1_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterOnOffCommandReadAttribute_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_1() { ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_1_FailureResponse, this); - mOnSuccessCallback_1 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_1_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel()); return err; } @@ -12890,9 +10792,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12909,9 +10808,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12930,32 +10826,22 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Send On Command - typedef void (*SuccessCallback_2)(void * context); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_2{ OnTestSendClusterOnOffCommandOn_2_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_2{ OnTestSendClusterOnOffCommandOn_2_FailureResponse, + this }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterOnOffCommandOn_2() { ChipLogProgress(chipTool, "On/Off - Send On Command: Sending command..."); - mOnFailureCallback_2 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOn_2_FailureResponse, this); - mOnSuccessCallback_2 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOn_2_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.On(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.On(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -12966,9 +10852,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -12985,9 +10868,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -12999,32 +10879,24 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Check on/off attribute value is true after on command - typedef void (*SuccessCallback_3)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_3{ OnTestSendClusterOnOffCommandReadAttribute_3_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterOnOffCommandReadAttribute_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_3() { ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after on command: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_3_FailureResponse, this); - mOnSuccessCallback_3 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_3_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -13035,9 +10907,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13054,9 +10923,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13075,32 +10941,22 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Send Off Command - typedef void (*SuccessCallback_4)(void * context); - chip::Callback::Callback * mOnSuccessCallback_4 = nullptr; - chip::Callback::Callback * mOnFailureCallback_4 = nullptr; - bool mIsFailureExpected_4 = 0; + using SuccessCallback_4 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_4{ OnTestSendClusterOnOffCommandOff_4_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_4{ OnTestSendClusterOnOffCommandOff_4_FailureResponse, + this }; + bool mIsFailureExpected_4 = 0; CHIP_ERROR TestSendClusterOnOffCommandOff_4() { ChipLogProgress(chipTool, "On/Off - Send Off Command: Sending command..."); - mOnFailureCallback_4 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOff_4_FailureResponse, this); - mOnSuccessCallback_4 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOff_4_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.Off(mOnSuccessCallback_4->Cancel(), mOnFailureCallback_4->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_4; - delete mOnSuccessCallback_4; - } + err = cluster.Off(mOnSuccessCallback_4.Cancel(), mOnFailureCallback_4.Cancel()); return err; } @@ -13111,9 +10967,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13130,9 +10983,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13144,32 +10994,24 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Check on/off attribute value is false after off command - typedef void (*SuccessCallback_5)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_5 = nullptr; - chip::Callback::Callback * mOnFailureCallback_5 = nullptr; - bool mIsFailureExpected_5 = 0; + using SuccessCallback_5 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_5{ OnTestSendClusterOnOffCommandReadAttribute_5_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_5{ + OnTestSendClusterOnOffCommandReadAttribute_5_FailureResponse, this + }; + bool mIsFailureExpected_5 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_5() { ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Sending command..."); - mOnFailureCallback_5 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_5_FailureResponse, this); - mOnSuccessCallback_5 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_5_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_5->Cancel(), mOnFailureCallback_5->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_5; - delete mOnSuccessCallback_5; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_5.Cancel(), mOnFailureCallback_5.Cancel()); return err; } @@ -13180,9 +11022,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13199,9 +11038,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13220,32 +11056,22 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Send Toggle Command - typedef void (*SuccessCallback_6)(void * context); - chip::Callback::Callback * mOnSuccessCallback_6 = nullptr; - chip::Callback::Callback * mOnFailureCallback_6 = nullptr; - bool mIsFailureExpected_6 = 0; + using SuccessCallback_6 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_6{ OnTestSendClusterOnOffCommandToggle_6_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_6{ OnTestSendClusterOnOffCommandToggle_6_FailureResponse, + this }; + bool mIsFailureExpected_6 = 0; CHIP_ERROR TestSendClusterOnOffCommandToggle_6() { ChipLogProgress(chipTool, "On/Off - Send Toggle Command: Sending command..."); - mOnFailureCallback_6 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandToggle_6_FailureResponse, this); - mOnSuccessCallback_6 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandToggle_6_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.Toggle(mOnSuccessCallback_6->Cancel(), mOnFailureCallback_6->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_6; - delete mOnSuccessCallback_6; - } + err = cluster.Toggle(mOnSuccessCallback_6.Cancel(), mOnFailureCallback_6.Cancel()); return err; } @@ -13256,9 +11082,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13275,9 +11098,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13289,32 +11109,24 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Check on/off attribute value is true after toggle command - typedef void (*SuccessCallback_7)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_7 = nullptr; - chip::Callback::Callback * mOnFailureCallback_7 = nullptr; - bool mIsFailureExpected_7 = 0; + using SuccessCallback_7 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_7{ OnTestSendClusterOnOffCommandReadAttribute_7_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_7{ + OnTestSendClusterOnOffCommandReadAttribute_7_FailureResponse, this + }; + bool mIsFailureExpected_7 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_7() { ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after toggle command: Sending command..."); - mOnFailureCallback_7 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_7_FailureResponse, this); - mOnSuccessCallback_7 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_7_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_7->Cancel(), mOnFailureCallback_7->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_7; - delete mOnSuccessCallback_7; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_7.Cancel(), mOnFailureCallback_7.Cancel()); return err; } @@ -13325,9 +11137,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13344,9 +11153,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13365,32 +11171,22 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Send Toggle Command - typedef void (*SuccessCallback_8)(void * context); - chip::Callback::Callback * mOnSuccessCallback_8 = nullptr; - chip::Callback::Callback * mOnFailureCallback_8 = nullptr; - bool mIsFailureExpected_8 = 0; + using SuccessCallback_8 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_8{ OnTestSendClusterOnOffCommandToggle_8_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_8{ OnTestSendClusterOnOffCommandToggle_8_FailureResponse, + this }; + bool mIsFailureExpected_8 = 0; CHIP_ERROR TestSendClusterOnOffCommandToggle_8() { ChipLogProgress(chipTool, "On/Off - Send Toggle Command: Sending command..."); - mOnFailureCallback_8 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandToggle_8_FailureResponse, this); - mOnSuccessCallback_8 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandToggle_8_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.Toggle(mOnSuccessCallback_8->Cancel(), mOnFailureCallback_8->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_8; - delete mOnSuccessCallback_8; - } + err = cluster.Toggle(mOnSuccessCallback_8.Cancel(), mOnFailureCallback_8.Cancel()); return err; } @@ -13401,9 +11197,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13420,9 +11213,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13434,32 +11224,24 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Check on/off attribute value is false after toggle command - typedef void (*SuccessCallback_9)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_9 = nullptr; - chip::Callback::Callback * mOnFailureCallback_9 = nullptr; - bool mIsFailureExpected_9 = 0; + using SuccessCallback_9 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_9{ OnTestSendClusterOnOffCommandReadAttribute_9_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_9{ + OnTestSendClusterOnOffCommandReadAttribute_9_FailureResponse, this + }; + bool mIsFailureExpected_9 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_9() { ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after toggle command: Sending command..."); - mOnFailureCallback_9 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_9_FailureResponse, this); - mOnSuccessCallback_9 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_9_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_9->Cancel(), mOnFailureCallback_9->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_9; - delete mOnSuccessCallback_9; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_9.Cancel(), mOnFailureCallback_9.Cancel()); return err; } @@ -13470,9 +11252,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13489,9 +11268,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13510,32 +11286,22 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Send On Command - typedef void (*SuccessCallback_10)(void * context); - chip::Callback::Callback * mOnSuccessCallback_10 = nullptr; - chip::Callback::Callback * mOnFailureCallback_10 = nullptr; - bool mIsFailureExpected_10 = 0; + using SuccessCallback_10 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_10{ OnTestSendClusterOnOffCommandOn_10_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_10{ OnTestSendClusterOnOffCommandOn_10_FailureResponse, + this }; + bool mIsFailureExpected_10 = 0; CHIP_ERROR TestSendClusterOnOffCommandOn_10() { ChipLogProgress(chipTool, "On/Off - Send On Command: Sending command..."); - mOnFailureCallback_10 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOn_10_FailureResponse, this); - mOnSuccessCallback_10 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOn_10_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.On(mOnSuccessCallback_10->Cancel(), mOnFailureCallback_10->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_10; - delete mOnSuccessCallback_10; - } + err = cluster.On(mOnSuccessCallback_10.Cancel(), mOnFailureCallback_10.Cancel()); return err; } @@ -13546,9 +11312,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13565,9 +11328,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13579,32 +11339,25 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Check on/off attribute value is true after on command - typedef void (*SuccessCallback_11)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_11 = nullptr; - chip::Callback::Callback * mOnFailureCallback_11 = nullptr; - bool mIsFailureExpected_11 = 0; + using SuccessCallback_11 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_11{ + OnTestSendClusterOnOffCommandReadAttribute_11_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_11{ + OnTestSendClusterOnOffCommandReadAttribute_11_FailureResponse, this + }; + bool mIsFailureExpected_11 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_11() { ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is true after on command: Sending command..."); - mOnFailureCallback_11 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_11_FailureResponse, this); - mOnSuccessCallback_11 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_11_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_11->Cancel(), mOnFailureCallback_11->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_11; - delete mOnSuccessCallback_11; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_11.Cancel(), mOnFailureCallback_11.Cancel()); return err; } @@ -13615,9 +11368,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (runner->mIsFailureExpected_11 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13634,9 +11384,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (runner->mIsFailureExpected_11 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13655,32 +11402,22 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Send Off Command - typedef void (*SuccessCallback_12)(void * context); - chip::Callback::Callback * mOnSuccessCallback_12 = nullptr; - chip::Callback::Callback * mOnFailureCallback_12 = nullptr; - bool mIsFailureExpected_12 = 0; + using SuccessCallback_12 = void (*)(void * context); + chip::Callback::Callback mOnSuccessCallback_12{ OnTestSendClusterOnOffCommandOff_12_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_12{ OnTestSendClusterOnOffCommandOff_12_FailureResponse, + this }; + bool mIsFailureExpected_12 = 0; CHIP_ERROR TestSendClusterOnOffCommandOff_12() { ChipLogProgress(chipTool, "On/Off - Send Off Command: Sending command..."); - mOnFailureCallback_12 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOff_12_FailureResponse, this); - mOnSuccessCallback_12 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandOff_12_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.Off(mOnSuccessCallback_12->Cancel(), mOnFailureCallback_12->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_12; - delete mOnSuccessCallback_12; - } + err = cluster.Off(mOnSuccessCallback_12.Cancel(), mOnFailureCallback_12.Cancel()); return err; } @@ -13691,9 +11428,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_12; - delete runner->mOnSuccessCallback_12; - if (runner->mIsFailureExpected_12 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13710,9 +11444,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_12; - delete runner->mOnSuccessCallback_12; - if (runner->mIsFailureExpected_12 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13724,32 +11455,25 @@ class Test_TC_OO_2_2 : public TestCommand } // Test Check on/off attribute value is false after off command - typedef void (*SuccessCallback_13)(void * context, uint8_t onOff); - chip::Callback::Callback * mOnSuccessCallback_13 = nullptr; - chip::Callback::Callback * mOnFailureCallback_13 = nullptr; - bool mIsFailureExpected_13 = 0; + using SuccessCallback_13 = void (*)(void * context, uint8_t onOff); + chip::Callback::Callback mOnSuccessCallback_13{ + OnTestSendClusterOnOffCommandReadAttribute_13_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_13{ + OnTestSendClusterOnOffCommandReadAttribute_13_FailureResponse, this + }; + bool mIsFailureExpected_13 = 0; CHIP_ERROR TestSendClusterOnOffCommandReadAttribute_13() { ChipLogProgress(chipTool, "On/Off - Check on/off attribute value is false after off command: Sending command..."); - mOnFailureCallback_13 = new chip::Callback::Callback( - OnTestSendClusterOnOffCommandReadAttribute_13_FailureResponse, this); - mOnSuccessCallback_13 = - new chip::Callback::Callback(OnTestSendClusterOnOffCommandReadAttribute_13_SuccessResponse, this); - chip::Controller::OnOffCluster cluster; cluster.Associate(mDevice, 1); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeOnOff(mOnSuccessCallback_13->Cancel(), mOnFailureCallback_13->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_13; - delete mOnSuccessCallback_13; - } + err = cluster.ReadAttributeOnOff(mOnSuccessCallback_13.Cancel(), mOnFailureCallback_13.Cancel()); return err; } @@ -13760,9 +11484,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_13; - delete runner->mOnSuccessCallback_13; - if (runner->mIsFailureExpected_13 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13779,9 +11500,6 @@ class Test_TC_OO_2_2 : public TestCommand Test_TC_OO_2_2 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_13; - delete runner->mOnSuccessCallback_13; - if (runner->mIsFailureExpected_13 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13894,32 +11612,24 @@ class Test_TC_DM_1_1 : public TestCommand // // Test Query Interaction Model Version - typedef void (*SuccessCallback_0)(void * context, uint16_t interactionModelVersion); - chip::Callback::Callback * mOnSuccessCallback_0 = nullptr; - chip::Callback::Callback * mOnFailureCallback_0 = nullptr; - bool mIsFailureExpected_0 = 0; + using SuccessCallback_0 = void (*)(void * context, uint16_t interactionModelVersion); + chip::Callback::Callback mOnSuccessCallback_0{ OnTestSendClusterBasicCommandReadAttribute_0_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_0{ + OnTestSendClusterBasicCommandReadAttribute_0_FailureResponse, this + }; + bool mIsFailureExpected_0 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_0() { ChipLogProgress(chipTool, "Basic - Query Interaction Model Version: Sending command..."); - mOnFailureCallback_0 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_0_FailureResponse, this); - mOnSuccessCallback_0 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_0_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeInteractionModelVersion(mOnSuccessCallback_0->Cancel(), mOnFailureCallback_0->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_0; - delete mOnSuccessCallback_0; - } + err = cluster.ReadAttributeInteractionModelVersion(mOnSuccessCallback_0.Cancel(), mOnFailureCallback_0.Cancel()); return err; } @@ -13930,9 +11640,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -13949,9 +11656,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_0; - delete runner->mOnSuccessCallback_0; - if (runner->mIsFailureExpected_0 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -13966,32 +11670,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query Vendor Name - typedef void (*SuccessCallback_1)(void * context, chip::ByteSpan vendorName); - chip::Callback::Callback * mOnSuccessCallback_1 = nullptr; - chip::Callback::Callback * mOnFailureCallback_1 = nullptr; - bool mIsFailureExpected_1 = 0; + using SuccessCallback_1 = void (*)(void * context, chip::ByteSpan vendorName); + chip::Callback::Callback mOnSuccessCallback_1{ OnTestSendClusterBasicCommandReadAttribute_1_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_1{ + OnTestSendClusterBasicCommandReadAttribute_1_FailureResponse, this + }; + bool mIsFailureExpected_1 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_1() { ChipLogProgress(chipTool, "Basic - Query Vendor Name: Sending command..."); - mOnFailureCallback_1 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_1_FailureResponse, this); - mOnSuccessCallback_1 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_1_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeVendorName(mOnSuccessCallback_1->Cancel(), mOnFailureCallback_1->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_1; - delete mOnSuccessCallback_1; - } + err = cluster.ReadAttributeVendorName(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel()); return err; } @@ -14002,9 +11698,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14021,9 +11714,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_1; - delete runner->mOnSuccessCallback_1; - if (runner->mIsFailureExpected_1 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14044,32 +11734,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query VendorID - typedef void (*SuccessCallback_2)(void * context, uint16_t vendorID); - chip::Callback::Callback * mOnSuccessCallback_2 = nullptr; - chip::Callback::Callback * mOnFailureCallback_2 = nullptr; - bool mIsFailureExpected_2 = 0; + using SuccessCallback_2 = void (*)(void * context, uint16_t vendorID); + chip::Callback::Callback mOnSuccessCallback_2{ OnTestSendClusterBasicCommandReadAttribute_2_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_2{ + OnTestSendClusterBasicCommandReadAttribute_2_FailureResponse, this + }; + bool mIsFailureExpected_2 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_2() { ChipLogProgress(chipTool, "Basic - Query VendorID: Sending command..."); - mOnFailureCallback_2 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_2_FailureResponse, this); - mOnSuccessCallback_2 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_2_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeVendorID(mOnSuccessCallback_2->Cancel(), mOnFailureCallback_2->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_2; - delete mOnSuccessCallback_2; - } + err = cluster.ReadAttributeVendorID(mOnSuccessCallback_2.Cancel(), mOnFailureCallback_2.Cancel()); return err; } @@ -14080,9 +11762,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14099,9 +11778,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_2; - delete runner->mOnSuccessCallback_2; - if (runner->mIsFailureExpected_2 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14115,32 +11791,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query Product Name - typedef void (*SuccessCallback_3)(void * context, chip::ByteSpan productName); - chip::Callback::Callback * mOnSuccessCallback_3 = nullptr; - chip::Callback::Callback * mOnFailureCallback_3 = nullptr; - bool mIsFailureExpected_3 = 0; + using SuccessCallback_3 = void (*)(void * context, chip::ByteSpan productName); + chip::Callback::Callback mOnSuccessCallback_3{ OnTestSendClusterBasicCommandReadAttribute_3_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_3{ + OnTestSendClusterBasicCommandReadAttribute_3_FailureResponse, this + }; + bool mIsFailureExpected_3 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_3() { ChipLogProgress(chipTool, "Basic - Query Product Name: Sending command..."); - mOnFailureCallback_3 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_3_FailureResponse, this); - mOnSuccessCallback_3 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_3_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeProductName(mOnSuccessCallback_3->Cancel(), mOnFailureCallback_3->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_3; - delete mOnSuccessCallback_3; - } + err = cluster.ReadAttributeProductName(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel()); return err; } @@ -14151,9 +11819,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14170,9 +11835,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_3; - delete runner->mOnSuccessCallback_3; - if (runner->mIsFailureExpected_3 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14193,32 +11855,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query ProductID - typedef void (*SuccessCallback_4)(void * context, uint16_t productID); - chip::Callback::Callback * mOnSuccessCallback_4 = nullptr; - chip::Callback::Callback * mOnFailureCallback_4 = nullptr; - bool mIsFailureExpected_4 = 0; + using SuccessCallback_4 = void (*)(void * context, uint16_t productID); + chip::Callback::Callback mOnSuccessCallback_4{ OnTestSendClusterBasicCommandReadAttribute_4_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_4{ + OnTestSendClusterBasicCommandReadAttribute_4_FailureResponse, this + }; + bool mIsFailureExpected_4 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_4() { ChipLogProgress(chipTool, "Basic - Query ProductID: Sending command..."); - mOnFailureCallback_4 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_4_FailureResponse, this); - mOnSuccessCallback_4 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_4_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeProductID(mOnSuccessCallback_4->Cancel(), mOnFailureCallback_4->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_4; - delete mOnSuccessCallback_4; - } + err = cluster.ReadAttributeProductID(mOnSuccessCallback_4.Cancel(), mOnFailureCallback_4.Cancel()); return err; } @@ -14229,9 +11883,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14248,9 +11899,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_4; - delete runner->mOnSuccessCallback_4; - if (runner->mIsFailureExpected_4 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14264,32 +11912,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query User Label - typedef void (*SuccessCallback_5)(void * context, chip::ByteSpan userLabel); - chip::Callback::Callback * mOnSuccessCallback_5 = nullptr; - chip::Callback::Callback * mOnFailureCallback_5 = nullptr; - bool mIsFailureExpected_5 = 0; + using SuccessCallback_5 = void (*)(void * context, chip::ByteSpan userLabel); + chip::Callback::Callback mOnSuccessCallback_5{ OnTestSendClusterBasicCommandReadAttribute_5_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_5{ + OnTestSendClusterBasicCommandReadAttribute_5_FailureResponse, this + }; + bool mIsFailureExpected_5 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_5() { ChipLogProgress(chipTool, "Basic - Query User Label: Sending command..."); - mOnFailureCallback_5 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_5_FailureResponse, this); - mOnSuccessCallback_5 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_5_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeUserLabel(mOnSuccessCallback_5->Cancel(), mOnFailureCallback_5->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_5; - delete mOnSuccessCallback_5; - } + err = cluster.ReadAttributeUserLabel(mOnSuccessCallback_5.Cancel(), mOnFailureCallback_5.Cancel()); return err; } @@ -14300,9 +11940,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14319,9 +11956,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_5; - delete runner->mOnSuccessCallback_5; - if (runner->mIsFailureExpected_5 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14342,32 +11976,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query User Location - typedef void (*SuccessCallback_6)(void * context, chip::ByteSpan location); - chip::Callback::Callback * mOnSuccessCallback_6 = nullptr; - chip::Callback::Callback * mOnFailureCallback_6 = nullptr; - bool mIsFailureExpected_6 = 0; + using SuccessCallback_6 = void (*)(void * context, chip::ByteSpan location); + chip::Callback::Callback mOnSuccessCallback_6{ OnTestSendClusterBasicCommandReadAttribute_6_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_6{ + OnTestSendClusterBasicCommandReadAttribute_6_FailureResponse, this + }; + bool mIsFailureExpected_6 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_6() { ChipLogProgress(chipTool, "Basic - Query User Location: Sending command..."); - mOnFailureCallback_6 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_6_FailureResponse, this); - mOnSuccessCallback_6 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_6_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeLocation(mOnSuccessCallback_6->Cancel(), mOnFailureCallback_6->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_6; - delete mOnSuccessCallback_6; - } + err = cluster.ReadAttributeLocation(mOnSuccessCallback_6.Cancel(), mOnFailureCallback_6.Cancel()); return err; } @@ -14378,9 +12004,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14397,9 +12020,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_6; - delete runner->mOnSuccessCallback_6; - if (runner->mIsFailureExpected_6 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14423,32 +12043,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query HardwareVersion - typedef void (*SuccessCallback_7)(void * context, uint16_t hardwareVersion); - chip::Callback::Callback * mOnSuccessCallback_7 = nullptr; - chip::Callback::Callback * mOnFailureCallback_7 = nullptr; - bool mIsFailureExpected_7 = 0; + using SuccessCallback_7 = void (*)(void * context, uint16_t hardwareVersion); + chip::Callback::Callback mOnSuccessCallback_7{ OnTestSendClusterBasicCommandReadAttribute_7_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_7{ + OnTestSendClusterBasicCommandReadAttribute_7_FailureResponse, this + }; + bool mIsFailureExpected_7 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_7() { ChipLogProgress(chipTool, "Basic - Query HardwareVersion: Sending command..."); - mOnFailureCallback_7 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_7_FailureResponse, this); - mOnSuccessCallback_7 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_7_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeHardwareVersion(mOnSuccessCallback_7->Cancel(), mOnFailureCallback_7->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_7; - delete mOnSuccessCallback_7; - } + err = cluster.ReadAttributeHardwareVersion(mOnSuccessCallback_7.Cancel(), mOnFailureCallback_7.Cancel()); return err; } @@ -14459,9 +12071,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14478,9 +12087,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_7; - delete runner->mOnSuccessCallback_7; - if (runner->mIsFailureExpected_7 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14494,32 +12100,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query HardwareVersionString - typedef void (*SuccessCallback_8)(void * context, chip::ByteSpan hardwareVersionString); - chip::Callback::Callback * mOnSuccessCallback_8 = nullptr; - chip::Callback::Callback * mOnFailureCallback_8 = nullptr; - bool mIsFailureExpected_8 = 0; + using SuccessCallback_8 = void (*)(void * context, chip::ByteSpan hardwareVersionString); + chip::Callback::Callback mOnSuccessCallback_8{ OnTestSendClusterBasicCommandReadAttribute_8_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_8{ + OnTestSendClusterBasicCommandReadAttribute_8_FailureResponse, this + }; + bool mIsFailureExpected_8 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_8() { ChipLogProgress(chipTool, "Basic - Query HardwareVersionString: Sending command..."); - mOnFailureCallback_8 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_8_FailureResponse, this); - mOnSuccessCallback_8 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_8_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeHardwareVersionString(mOnSuccessCallback_8->Cancel(), mOnFailureCallback_8->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_8; - delete mOnSuccessCallback_8; - } + err = cluster.ReadAttributeHardwareVersionString(mOnSuccessCallback_8.Cancel(), mOnFailureCallback_8.Cancel()); return err; } @@ -14530,9 +12128,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14549,9 +12144,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_8; - delete runner->mOnSuccessCallback_8; - if (runner->mIsFailureExpected_8 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14582,32 +12174,24 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query SoftwareVersion - typedef void (*SuccessCallback_9)(void * context, uint32_t softwareVersion); - chip::Callback::Callback * mOnSuccessCallback_9 = nullptr; - chip::Callback::Callback * mOnFailureCallback_9 = nullptr; - bool mIsFailureExpected_9 = 0; + using SuccessCallback_9 = void (*)(void * context, uint32_t softwareVersion); + chip::Callback::Callback mOnSuccessCallback_9{ OnTestSendClusterBasicCommandReadAttribute_9_SuccessResponse, + this }; + chip::Callback::Callback mOnFailureCallback_9{ + OnTestSendClusterBasicCommandReadAttribute_9_FailureResponse, this + }; + bool mIsFailureExpected_9 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_9() { ChipLogProgress(chipTool, "Basic - Query SoftwareVersion: Sending command..."); - mOnFailureCallback_9 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_9_FailureResponse, this); - mOnSuccessCallback_9 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_9_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeSoftwareVersion(mOnSuccessCallback_9->Cancel(), mOnFailureCallback_9->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_9; - delete mOnSuccessCallback_9; - } + err = cluster.ReadAttributeSoftwareVersion(mOnSuccessCallback_9.Cancel(), mOnFailureCallback_9.Cancel()); return err; } @@ -14618,9 +12202,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14637,9 +12218,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_9; - delete runner->mOnSuccessCallback_9; - if (runner->mIsFailureExpected_9 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14653,32 +12231,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query SoftwareVersionString - typedef void (*SuccessCallback_10)(void * context, chip::ByteSpan softwareVersionString); - chip::Callback::Callback * mOnSuccessCallback_10 = nullptr; - chip::Callback::Callback * mOnFailureCallback_10 = nullptr; - bool mIsFailureExpected_10 = 0; + using SuccessCallback_10 = void (*)(void * context, chip::ByteSpan softwareVersionString); + chip::Callback::Callback mOnSuccessCallback_10{ + OnTestSendClusterBasicCommandReadAttribute_10_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_10{ + OnTestSendClusterBasicCommandReadAttribute_10_FailureResponse, this + }; + bool mIsFailureExpected_10 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_10() { ChipLogProgress(chipTool, "Basic - Query SoftwareVersionString: Sending command..."); - mOnFailureCallback_10 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_10_FailureResponse, this); - mOnSuccessCallback_10 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_10_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeSoftwareVersionString(mOnSuccessCallback_10->Cancel(), mOnFailureCallback_10->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_10; - delete mOnSuccessCallback_10; - } + err = cluster.ReadAttributeSoftwareVersionString(mOnSuccessCallback_10.Cancel(), mOnFailureCallback_10.Cancel()); return err; } @@ -14689,9 +12260,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == false) { ChipLogError(chipTool, "Error: The test was expecting a success callback. Got failure callback"); @@ -14708,9 +12276,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_10; - delete runner->mOnSuccessCallback_10; - if (runner->mIsFailureExpected_10 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14744,32 +12309,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query ManufacturingDate - typedef void (*SuccessCallback_11)(void * context, chip::ByteSpan manufacturingDate); - chip::Callback::Callback * mOnSuccessCallback_11 = nullptr; - chip::Callback::Callback * mOnFailureCallback_11 = nullptr; - bool mIsFailureExpected_11 = 0; + using SuccessCallback_11 = void (*)(void * context, chip::ByteSpan manufacturingDate); + chip::Callback::Callback mOnSuccessCallback_11{ + OnTestSendClusterBasicCommandReadAttribute_11_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_11{ + OnTestSendClusterBasicCommandReadAttribute_11_FailureResponse, this + }; + bool mIsFailureExpected_11 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_11() { ChipLogProgress(chipTool, "Basic - Query ManufacturingDate: Sending command..."); - mOnFailureCallback_11 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_11_FailureResponse, this); - mOnSuccessCallback_11 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_11_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeManufacturingDate(mOnSuccessCallback_11->Cancel(), mOnFailureCallback_11->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_11; - delete mOnSuccessCallback_11; - } + err = cluster.ReadAttributeManufacturingDate(mOnSuccessCallback_11.Cancel(), mOnFailureCallback_11.Cancel()); return err; } @@ -14780,9 +12338,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -14805,9 +12360,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_11; - delete runner->mOnSuccessCallback_11; - if (runner->mIsFailureExpected_11 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14838,32 +12390,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query PartNumber - typedef void (*SuccessCallback_12)(void * context, chip::ByteSpan partNumber); - chip::Callback::Callback * mOnSuccessCallback_12 = nullptr; - chip::Callback::Callback * mOnFailureCallback_12 = nullptr; - bool mIsFailureExpected_12 = 0; + using SuccessCallback_12 = void (*)(void * context, chip::ByteSpan partNumber); + chip::Callback::Callback mOnSuccessCallback_12{ + OnTestSendClusterBasicCommandReadAttribute_12_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_12{ + OnTestSendClusterBasicCommandReadAttribute_12_FailureResponse, this + }; + bool mIsFailureExpected_12 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_12() { ChipLogProgress(chipTool, "Basic - Query PartNumber: Sending command..."); - mOnFailureCallback_12 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_12_FailureResponse, this); - mOnSuccessCallback_12 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_12_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributePartNumber(mOnSuccessCallback_12->Cancel(), mOnFailureCallback_12->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_12; - delete mOnSuccessCallback_12; - } + err = cluster.ReadAttributePartNumber(mOnSuccessCallback_12.Cancel(), mOnFailureCallback_12.Cancel()); return err; } @@ -14874,9 +12419,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_12; - delete runner->mOnSuccessCallback_12; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -14899,9 +12441,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_12; - delete runner->mOnSuccessCallback_12; - if (runner->mIsFailureExpected_12 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -14922,32 +12461,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query ProductURL - typedef void (*SuccessCallback_13)(void * context, chip::ByteSpan productURL); - chip::Callback::Callback * mOnSuccessCallback_13 = nullptr; - chip::Callback::Callback * mOnFailureCallback_13 = nullptr; - bool mIsFailureExpected_13 = 0; + using SuccessCallback_13 = void (*)(void * context, chip::ByteSpan productURL); + chip::Callback::Callback mOnSuccessCallback_13{ + OnTestSendClusterBasicCommandReadAttribute_13_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_13{ + OnTestSendClusterBasicCommandReadAttribute_13_FailureResponse, this + }; + bool mIsFailureExpected_13 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_13() { ChipLogProgress(chipTool, "Basic - Query ProductURL: Sending command..."); - mOnFailureCallback_13 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_13_FailureResponse, this); - mOnSuccessCallback_13 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_13_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeProductURL(mOnSuccessCallback_13->Cancel(), mOnFailureCallback_13->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_13; - delete mOnSuccessCallback_13; - } + err = cluster.ReadAttributeProductURL(mOnSuccessCallback_13.Cancel(), mOnFailureCallback_13.Cancel()); return err; } @@ -14958,9 +12490,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_13; - delete runner->mOnSuccessCallback_13; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -14983,9 +12512,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_13; - delete runner->mOnSuccessCallback_13; - if (runner->mIsFailureExpected_13 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -15008,32 +12534,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query ProductLabel - typedef void (*SuccessCallback_14)(void * context, chip::ByteSpan productLabel); - chip::Callback::Callback * mOnSuccessCallback_14 = nullptr; - chip::Callback::Callback * mOnFailureCallback_14 = nullptr; - bool mIsFailureExpected_14 = 0; + using SuccessCallback_14 = void (*)(void * context, chip::ByteSpan productLabel); + chip::Callback::Callback mOnSuccessCallback_14{ + OnTestSendClusterBasicCommandReadAttribute_14_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_14{ + OnTestSendClusterBasicCommandReadAttribute_14_FailureResponse, this + }; + bool mIsFailureExpected_14 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_14() { ChipLogProgress(chipTool, "Basic - Query ProductLabel: Sending command..."); - mOnFailureCallback_14 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_14_FailureResponse, this); - mOnSuccessCallback_14 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_14_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeProductLabel(mOnSuccessCallback_14->Cancel(), mOnFailureCallback_14->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_14; - delete mOnSuccessCallback_14; - } + err = cluster.ReadAttributeProductLabel(mOnSuccessCallback_14.Cancel(), mOnFailureCallback_14.Cancel()); return err; } @@ -15044,9 +12563,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_14; - delete runner->mOnSuccessCallback_14; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -15069,9 +12585,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_14; - delete runner->mOnSuccessCallback_14; - if (runner->mIsFailureExpected_14 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -15092,32 +12605,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query SerialNumber - typedef void (*SuccessCallback_15)(void * context, chip::ByteSpan serialNumber); - chip::Callback::Callback * mOnSuccessCallback_15 = nullptr; - chip::Callback::Callback * mOnFailureCallback_15 = nullptr; - bool mIsFailureExpected_15 = 0; + using SuccessCallback_15 = void (*)(void * context, chip::ByteSpan serialNumber); + chip::Callback::Callback mOnSuccessCallback_15{ + OnTestSendClusterBasicCommandReadAttribute_15_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_15{ + OnTestSendClusterBasicCommandReadAttribute_15_FailureResponse, this + }; + bool mIsFailureExpected_15 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_15() { ChipLogProgress(chipTool, "Basic - Query SerialNumber: Sending command..."); - mOnFailureCallback_15 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_15_FailureResponse, this); - mOnSuccessCallback_15 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_15_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeSerialNumber(mOnSuccessCallback_15->Cancel(), mOnFailureCallback_15->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_15; - delete mOnSuccessCallback_15; - } + err = cluster.ReadAttributeSerialNumber(mOnSuccessCallback_15.Cancel(), mOnFailureCallback_15.Cancel()); return err; } @@ -15128,9 +12634,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_15; - delete runner->mOnSuccessCallback_15; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -15153,9 +12656,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_15; - delete runner->mOnSuccessCallback_15; - if (runner->mIsFailureExpected_15 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -15176,32 +12676,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query LocalConfigDisabled - typedef void (*SuccessCallback_16)(void * context, uint8_t localConfigDisabled); - chip::Callback::Callback * mOnSuccessCallback_16 = nullptr; - chip::Callback::Callback * mOnFailureCallback_16 = nullptr; - bool mIsFailureExpected_16 = 0; + using SuccessCallback_16 = void (*)(void * context, uint8_t localConfigDisabled); + chip::Callback::Callback mOnSuccessCallback_16{ + OnTestSendClusterBasicCommandReadAttribute_16_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_16{ + OnTestSendClusterBasicCommandReadAttribute_16_FailureResponse, this + }; + bool mIsFailureExpected_16 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_16() { ChipLogProgress(chipTool, "Basic - Query LocalConfigDisabled: Sending command..."); - mOnFailureCallback_16 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_16_FailureResponse, this); - mOnSuccessCallback_16 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_16_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeLocalConfigDisabled(mOnSuccessCallback_16->Cancel(), mOnFailureCallback_16->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_16; - delete mOnSuccessCallback_16; - } + err = cluster.ReadAttributeLocalConfigDisabled(mOnSuccessCallback_16.Cancel(), mOnFailureCallback_16.Cancel()); return err; } @@ -15212,9 +12705,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_16; - delete runner->mOnSuccessCallback_16; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -15237,9 +12727,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_16; - delete runner->mOnSuccessCallback_16; - if (runner->mIsFailureExpected_16 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); @@ -15253,32 +12740,25 @@ class Test_TC_DM_1_1 : public TestCommand } // Test Query Reachable - typedef void (*SuccessCallback_17)(void * context, uint8_t reachable); - chip::Callback::Callback * mOnSuccessCallback_17 = nullptr; - chip::Callback::Callback * mOnFailureCallback_17 = nullptr; - bool mIsFailureExpected_17 = 0; + using SuccessCallback_17 = void (*)(void * context, uint8_t reachable); + chip::Callback::Callback mOnSuccessCallback_17{ + OnTestSendClusterBasicCommandReadAttribute_17_SuccessResponse, this + }; + chip::Callback::Callback mOnFailureCallback_17{ + OnTestSendClusterBasicCommandReadAttribute_17_FailureResponse, this + }; + bool mIsFailureExpected_17 = 0; CHIP_ERROR TestSendClusterBasicCommandReadAttribute_17() { ChipLogProgress(chipTool, "Basic - Query Reachable: Sending command..."); - mOnFailureCallback_17 = new chip::Callback::Callback( - OnTestSendClusterBasicCommandReadAttribute_17_FailureResponse, this); - mOnSuccessCallback_17 = - new chip::Callback::Callback(OnTestSendClusterBasicCommandReadAttribute_17_SuccessResponse, this); - chip::Controller::BasicCluster cluster; cluster.Associate(mDevice, 0); CHIP_ERROR err = CHIP_NO_ERROR; - err = cluster.ReadAttributeReachable(mOnSuccessCallback_17->Cancel(), mOnFailureCallback_17->Cancel()); - - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_17; - delete mOnSuccessCallback_17; - } + err = cluster.ReadAttributeReachable(mOnSuccessCallback_17.Cancel(), mOnFailureCallback_17.Cancel()); return err; } @@ -15289,9 +12769,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_17; - delete runner->mOnSuccessCallback_17; - if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -15314,9 +12791,6 @@ class Test_TC_DM_1_1 : public TestCommand Test_TC_DM_1_1 * runner = reinterpret_cast(context); - delete runner->mOnFailureCallback_17; - delete runner->mOnSuccessCallback_17; - if (runner->mIsFailureExpected_17 == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback"); diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt index 21f432801f454c..f11d03d371bacc 100644 --- a/examples/chip-tool/templates/partials/test_cluster.zapt +++ b/examples/chip-tool/templates/partials/test_cluster.zapt @@ -46,18 +46,15 @@ class {{filename}}: public TestCommand {{#chip_tests_items}} // Test {{label}} - typedef void (*SuccessCallback_{{index}})(void * context{{#chip_tests_item_response_parameters}}, {{#if isList}}uint16_t count, {{/if}}{{chipType}} {{#if isList}}* {{/if}}{{asCamelCased name true}}{{/chip_tests_item_response_parameters}}); - chip::Callback::Callback * mOnSuccessCallback_{{index}} = nullptr; - chip::Callback::Callback * mOnFailureCallback_{{index}} = nullptr; + using SuccessCallback_{{index}} = void (*)(void * context{{#chip_tests_item_response_parameters}}, {{#if isList}}uint16_t count, {{/if}}{{chipType}} {{#if isList}}* {{/if}}{{asCamelCased name true}}{{/chip_tests_item_response_parameters}}); + chip::Callback::Callback mOnSuccessCallback_{{index}} { OnTestSendCluster{{asCamelCased cluster false}}Command{{asCamelCased command false}}_{{index}}_SuccessResponse, this }; + chip::Callback::Callback mOnFailureCallback_{{index}} { OnTestSendCluster{{asCamelCased cluster false}}Command{{asCamelCased command false}}_{{index}}_FailureResponse, this }; bool mIsFailureExpected_{{index}} = {{response.error}}; CHIP_ERROR TestSendCluster{{asCamelCased cluster false}}Command{{asCamelCased command false}}_{{index}}() { ChipLogProgress(chipTool, "{{cluster}} - {{label}}: Sending command..."); - mOnFailureCallback_{{index}} = new chip::Callback::Callback(OnTestSendCluster{{asCamelCased cluster false}}Command{{asCamelCased command false}}_{{index}}_FailureResponse, this); - mOnSuccessCallback_{{index}} = new chip::Callback::Callback(OnTestSendCluster{{asCamelCased cluster false}}Command{{asCamelCased command false}}_{{index}}_SuccessResponse, this); - chip::Controller::{{asCamelCased cluster false}}Cluster cluster; cluster.Associate(mDevice, {{endpoint}}); @@ -71,9 +68,9 @@ class {{filename}}: public TestCommand {{chipType}} {{asCamelCased name true}}Argument = {{definedValue}}{{asTypeLiteralSuffix chipType}}; {{/if}} {{/chip_tests_item_parameters}} - err = cluster.{{asCamelCased command false}}(mOnSuccessCallback_{{index}}->Cancel(), mOnFailureCallback_{{index}}->Cancel(){{#chip_tests_item_parameters}}, {{asCamelCased name true}}Argument{{/chip_tests_item_parameters}}); + err = cluster.{{asCamelCased command false}}(mOnSuccessCallback_{{index}}.Cancel(), mOnFailureCallback_{{index}}.Cancel(){{#chip_tests_item_parameters}}, {{asCamelCased name true}}Argument{{/chip_tests_item_parameters}}); {{else if isReadAttribute}} - err = cluster.ReadAttribute{{asCamelCased attribute false}}(mOnSuccessCallback_{{index}}->Cancel(), mOnFailureCallback_{{index}}->Cancel()); + err = cluster.ReadAttribute{{asCamelCased attribute false}}(mOnSuccessCallback_{{index}}.Cancel(), mOnFailureCallback_{{index}}.Cancel()); {{else if isWriteAttribute}} {{#chip_tests_item_parameters}} {{#if (isString type)}} @@ -82,17 +79,11 @@ class {{filename}}: public TestCommand {{chipType}} {{asCamelCased name true}}Argument = {{definedValue}}{{asTypeLiteralSuffix chipType}}; {{/if}} {{/chip_tests_item_parameters}} - err = cluster.WriteAttribute{{asCamelCased attribute false}}(mOnSuccessCallback_{{index}}->Cancel(), mOnFailureCallback_{{index}}->Cancel(), {{#chip_tests_item_parameters}}{{asCamelCased name true}}Argument{{/chip_tests_item_parameters}}); + err = cluster.WriteAttribute{{asCamelCased attribute false}}(mOnSuccessCallback_{{index}}.Cancel(), mOnFailureCallback_{{index}}.Cancel(), {{#chip_tests_item_parameters}}{{asCamelCased name true}}Argument{{/chip_tests_item_parameters}}); {{else}} err = CHIP_ERROR_NOT_IMPLEMENTED; {{/if}} - if (CHIP_NO_ERROR != err) - { - delete mOnFailureCallback_{{index}}; - delete mOnSuccessCallback_{{index}}; - } - return err; } @@ -102,9 +93,6 @@ class {{filename}}: public TestCommand {{parent.filename}} * runner = reinterpret_cast<{{parent.filename}} *>(context); - delete runner->mOnFailureCallback_{{index}}; - delete runner->mOnSuccessCallback_{{index}}; - {{#if optional}} if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { runner->NextTest(); @@ -127,9 +115,6 @@ class {{filename}}: public TestCommand {{parent.filename}} * runner = reinterpret_cast<{{parent.filename}} *>(context); - delete runner->mOnFailureCallback_{{index}}; - delete runner->mOnSuccessCallback_{{index}}; - if (runner->mIsFailureExpected_{{index}} == true) { ChipLogError(chipTool, "Error: The test was expecting a failure callback. Got success callback");