From 045e961cd168016983d847c601ddfe93b88306cb Mon Sep 17 00:00:00 2001 From: yunhanw Date: Sun, 12 Mar 2023 16:16:23 -0700 Subject: [PATCH] Fix android tv cast CI --- .../app/src/main/jni/cpp/TvCastingApp-JNI.cpp | 64 ++++++++++++++----- scripts/tests/java/commissioning_test.py | 20 ------ 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp index 66a710d137ff7d..eb584e2589bd5b 100644 --- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp +++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp @@ -477,7 +477,7 @@ JNI_METHOD(jboolean, contentLauncher_1subscribeToSupportedStreamingProtocols) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(ContentLauncher_SupportedStreamingProtocols).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { + [](void * context, chip::SubscriptionId) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ContentLauncher_SupportedStreamingProtocols).Handle(); }); @@ -584,7 +584,9 @@ JNI_METHOD(jboolean, levelControl_1subscribeToCurrentLevel) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(LevelControl_CurrentLevel).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(LevelControl_CurrentLevel).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(LevelControl_CurrentLevel).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -628,7 +630,9 @@ JNI_METHOD(jboolean, levelControl_1subscribeToMinLevel) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(LevelControl_MinLevel).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(LevelControl_MinLevel).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(LevelControl_MinLevel).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -672,7 +676,9 @@ JNI_METHOD(jboolean, levelControl_1subscribeToMaxLevel) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(LevelControl_MaxLevel).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(LevelControl_MaxLevel).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(LevelControl_MaxLevel).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1054,7 +1060,9 @@ JNI_METHOD(jboolean, mediaPlayback_1subscribeToCurrentState) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(MediaPlayback_CurrentState).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_CurrentState).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_CurrentState).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1099,7 +1107,9 @@ JNI_METHOD(jboolean, mediaPlayback_1subscribeToDuration) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(MediaPlayback_Duration).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_Duration).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_Duration).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1146,7 +1156,9 @@ JNI_METHOD(jboolean, mediaPlayback_1subscribeToSampledPosition) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(MediaPlayback_SampledPosition).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_SampledPosition).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_SampledPosition).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1192,7 +1204,9 @@ JNI_METHOD(jboolean, mediaPlayback_1subscribeToPlaybackSpeed) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(MediaPlayback_PlaybackSpeed).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_PlaybackSpeed).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_PlaybackSpeed).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1238,7 +1252,9 @@ JNI_METHOD(jboolean, mediaPlayback_1subscribeToSeekRangeEnd) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(MediaPlayback_SeekRangeEnd).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_SeekRangeEnd).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_SeekRangeEnd).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1285,7 +1301,9 @@ JNI_METHOD(jboolean, mediaPlayback_1subscribeToSeekRangeStart) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(MediaPlayback_SeekRangeStart).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_SeekRangeStart).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(MediaPlayback_SeekRangeStart).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1467,7 +1485,9 @@ JNI_METHOD(jboolean, targetNavigator_1subscribeToCurrentTarget) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(TargetNavigator_CurrentTarget).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(TargetNavigator_CurrentTarget).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(TargetNavigator_CurrentTarget).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1513,7 +1533,9 @@ JNI_METHOD(jboolean, targetNavigator_1subscribeToTargetList) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(TargetNavigator_TargetList).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(TargetNavigator_TargetList).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(TargetNavigator_TargetList).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1587,7 +1609,9 @@ JNI_METHOD(jboolean, applicationBasic_1subscribeToVendorName) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(ApplicationBasic_VendorName).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_VendorName).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_VendorName).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1633,7 +1657,9 @@ JNI_METHOD(jboolean, applicationBasic_1subscribeToVendorID) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(ApplicationBasic_VendorID).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_VendorID).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_VendorID).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1680,7 +1706,9 @@ JNI_METHOD(jboolean, applicationBasic_1subscribeToApplicationName) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(ApplicationBasic_ApplicationName).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_ApplicationName).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_ApplicationName).Handle(); + }); VerifyOrExit(CHIP_NO_ERROR == err, ChipLogError(AppServer, "CastingServer.applicationBasic_subscribeToApplicationName failed %" CHIP_ERROR_FORMAT, @@ -1726,7 +1754,9 @@ JNI_METHOD(jboolean, applicationBasic_1subscribeToProductID) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(ApplicationBasic_ProductID).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_ProductID).Handle(); }); + [](void * context, chip::SubscriptionId) { + TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_ProductID).Handle(); + }); VerifyOrExit( CHIP_NO_ERROR == err, @@ -1774,7 +1804,7 @@ JNI_METHOD(jboolean, applicationBasic_1subscribeToApplicationVersion) TvCastingAppJNIMgr().getSubscriptionReadFailureHandler(ApplicationBasic_ApplicationVersion).Handle(err); }, static_cast(minInterval), static_cast(maxInterval), - [](void * context) { + [](void * context, chip::SubscriptionId) { TvCastingAppJNIMgr().getSubscriptionEstablishedHandler(ApplicationBasic_ApplicationVersion).Handle(); }); diff --git a/scripts/tests/java/commissioning_test.py b/scripts/tests/java/commissioning_test.py index 8a7568b6bf066a..138c9efa49065a 100755 --- a/scripts/tests/java/commissioning_test.py +++ b/scripts/tests/java/commissioning_test.py @@ -93,26 +93,6 @@ def RunTest(self): code = self.TestCmdOnnetworkLong(self.nodeid, self.setup_pin_code, self.discriminator, self.timeout) if code != 0: raise Exception(f"Testing pairing onnetwork-long failed with error {code}") - elif self.command_name == 'onnetwork-long-im-invoke': - logging.info("Testing pairing onnetwork-long-im-invoke") - code = self.TestCmdOnnetworkLongImInvoke(self.nodeid, self.setup_pin_code, self.discriminator, self.timeout) - if code != 0: - raise Exception(f"Testing pairing onnetwork-long-im-invoke failed with error {code}") - elif self.command_name == 'onnetwork-long-im-write': - logging.info("Testing pairing onnetwork-long-im-write") - code = self.TestCmdOnnetworkLongImWrite(self.nodeid, self.setup_pin_code, self.discriminator, self.timeout) - if code != 0: - raise Exception(f"Testing pairing onnetwork-long-im-write failed with error {code}") - elif self.command_name == 'onnetwork-long-im-read': - logging.info("Testing pairing onnetwork-long-im-read") - code = self.TestCmdOnnetworkLongImRead(self.nodeid, self.setup_pin_code, self.discriminator, self.timeout) - if code != 0: - raise Exception(f"Testing pairing onnetwork-long-im-read failed with error {code}") - elif self.command_name == 'onnetwork-long-im-subscribe': - logging.info("Testing pairing onnetwork-long-im-subscribe") - code = self.TestCmdOnnetworkLongImSubscribe(self.nodeid, self.setup_pin_code, self.discriminator, self.timeout) - if code != 0: - raise Exception(f"Testing pairing onnetwork-long-im-subscribe failed with error {code}") elif self.command_name == 'already-discovered': logging.info("Testing pairing already-discovered") code = self.TestCmdAlreadyDiscovered(self.nodeid, self.setup_pin_code, self.address, self.port, self.timeout)