Skip to content

Commit

Permalink
Revert TestRead.cpp since SubscribeAttribute arguments now defaults t…
Browse files Browse the repository at this point in the history 
…he same as before
  • Loading branch information
@jtung-apple
jtung-apple committed Oct 14, 2022
1 parent 7f620a2 commit 7c138fb
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/controller/tests/data_model/TestRead.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1723,7 +1723,7 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptions(nlTestSuite * ap
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 20,
onSubscriptionEstablishedCb, nullptr, nullptr, false, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, false, true) == CHIP_NO_ERROR);
}

// There are too many messages and the test (gcc_debug, which includes many sanity checks) will be quite slow. Note: report
Expand Down Expand Up @@ -1787,7 +1787,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionAppRejection(nlTestSuite *
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
onSubscriptionEstablishedCb, nullptr, nullptr, false, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, false, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -1860,7 +1860,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest1(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 5, 5,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -1935,7 +1935,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest2(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -2010,7 +2010,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest3(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -2076,7 +2076,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest4(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -2150,7 +2150,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest5(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -2225,7 +2225,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest6(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -2299,7 +2299,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest7(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -2364,7 +2364,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest8(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 4000,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_NO_ERROR);

ctx.DrainAndServiceIO();

Expand Down Expand Up @@ -2428,7 +2428,7 @@ void TestReadInteraction::TestReadHandler_SubscriptionReportingIntervalsTest9(nl
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 5, 4,
onSubscriptionEstablishedCb, nullptr, nullptr, true) == CHIP_ERROR_INVALID_ARGUMENT);
onSubscriptionEstablishedCb, nullptr, true) == CHIP_ERROR_INVALID_ARGUMENT);

//
// Failures won't get routed to us here since re-subscriptions are enabled by default in the Controller::SubscribeAttribute
Expand Down Expand Up @@ -2533,7 +2533,7 @@ void TestReadInteraction::SubscribeThenReadHelper(nlTestSuite * apSuite, TestCon
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&aCtx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
onSubscriptionEstablishedCb, nullptr, nullptr, false, true) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, false, true) == CHIP_NO_ERROR);
}

aCtx.DrainAndServiceIO();
Expand Down Expand Up @@ -2632,7 +2632,7 @@ void TestReadInteraction::TestReadHandler_MultipleSubscriptionsWithDataVersionFi
NL_TEST_ASSERT(apSuite,
Controller::SubscribeAttribute<TestCluster::Attributes::ListStructOctetString::TypeInfo>(
&ctx.GetExchangeManager(), sessionHandle, kTestEndpointId, onSuccessCb, onFailureCb, 0, 10,
onSubscriptionEstablishedCb, nullptr, nullptr, false, true, dataVersion) == CHIP_NO_ERROR);
onSubscriptionEstablishedCb, nullptr, false, true, dataVersion) == CHIP_NO_ERROR);
}

// There are too many messages and the test (gcc_debug, which includes many sanity checks) will be quite slow. Note: report
Expand Down

0 comments on commit 7c138fb

Please sign in to comment.