From 2b136f11fb3c2025de5fc2f185c32720441264f5 Mon Sep 17 00:00:00 2001 From: Mathieu Kardous Date: Tue, 31 Oct 2023 15:26:37 -0400 Subject: [PATCH] add missing define checks --- src/controller/tests/data_model/TestRead.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/controller/tests/data_model/TestRead.cpp b/src/controller/tests/data_model/TestRead.cpp index 25d204f1bedb98..97f60612005a5d 100644 --- a/src/controller/tests/data_model/TestRead.cpp +++ b/src/controller/tests/data_model/TestRead.cpp @@ -270,13 +270,17 @@ class TestReadInteraction : public app::ReadHandler::ApplicationCallback static void TestReadHandler_OneSubscribeMultipleReads(nlTestSuite * apSuite, void * apContext); static void TestReadHandler_TwoSubscribesMultipleReads(nlTestSuite * apSuite, void * apContext); static void TestReadHandler_MultipleSubscriptionsWithDataVersionFilter(nlTestSuite * apSuite, void * apContext); +#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1 static void TestReadHandler_SubscriptionReportingIntervalsTest1(nlTestSuite * apSuite, void * apContext); static void TestReadHandler_SubscriptionReportingIntervalsTest2(nlTestSuite * apSuite, void * apContext); static void TestReadHandler_SubscriptionReportingIntervalsTest3(nlTestSuite * apSuite, void * apContext); - static void TestReadHandler_SubscriptionReportingIntervalsTest4(nlTestSuite * apSuite, void * apContext); +#endif // CHIP_CONFIG_ENABLE_ICD_SERVER + static void TestReadHandler_SubscriptionReportingIntervalsTest4(nlTestSuite * apSuite, void * apContext);, +#if CHIP_CONFIG_ENABLE_ICD_SERVER != 1 static void TestReadHandler_SubscriptionReportingIntervalsTest5(nlTestSuite * apSuite, void * apContext); static void TestReadHandler_SubscriptionReportingIntervalsTest6(nlTestSuite * apSuite, void * apContext); static void TestReadHandler_SubscriptionReportingIntervalsTest7(nlTestSuite * apSuite, void * apContext); +#endif // CHIP_CONFIG_ENABLE_ICD_SERVER static void TestReadHandler_SubscriptionReportingIntervalsTest8(nlTestSuite * apSuite, void * apContext); static void TestReadHandler_SubscriptionReportingIntervalsTest9(nlTestSuite * apSuite, void * apContext); static void TestReadHandlerResourceExhaustion_MultipleReads(nlTestSuite * apSuite, void * apContext); @@ -1966,6 +1970,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionAppRejection(nlTestSuite * gTestReadInteraction.mEmitSubscriptionError = false; } +#if CHIP_CONFIG_ENABLE_ICD_SERVER == 1 + // Subscriber sends the request with particular max-interval value: // Max interval equal to client-requested min-interval. void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1(nlTestSuite * apSuite, void * apContext) @@ -2193,6 +2199,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest3(nl gTestReadInteraction.mAlterSubscriptionIntervals = false; } +#endif // CHIP_CONFIG_ENABLE_ICD_SERVER + // Subscriber sends the request with particular max-interval value: // Max interval greater than client-requested min-interval but lower than 60m: // server adjustment to a value greater than client-requested, but greater than 60 (not allowed). @@ -2259,6 +2267,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest4(nl gTestReadInteraction.mAlterSubscriptionIntervals = false; } +#if CHIP_CONFIG_ENABLE_ICD_SERVER == 1 + // Subscriber sends the request with particular max-interval value: // Max interval greater than client-requested min-interval but greater than 60m: // With no server adjustment. @@ -2486,6 +2496,8 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest7(nl gTestReadInteraction.mAlterSubscriptionIntervals = false; } +#endif // CHIP_CONFIG_ENABLE_ICD_SERVER + // Subscriber sends the request with particular max-interval value: // Max interval greater than client-requested min-interval but greater than 60m: // With server adjustment to a value larger than 60m, but larger than max interval. Disallowed