From 934c25ed2a4ed5c83f72d914c63b17356cdc38f5 Mon Sep 17 00:00:00 2001 From: JongChern Date: Thu, 15 Oct 2026 13:37:08 +0800 Subject: [PATCH] DEV-1198 Re-enable the three ShimmerDriverPC simulator test classes API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only, _w_sync_master and _w_sync_slave were excluded from the test task in Feb 2026 as failing on CI. Their CI logs have expired, so the cause cannot be confirmed, but it fits the read-status timer deadlock the previous commit avoids: these classes assert values from the post-connect config read (SD log sync, Bluetooth disabled, sync nodes, trial duration), which a stalled connect never reaches. They now build their device through newShimmerPCWithoutStatusTimer() like the other simulator classes, and run again. Co-Authored-By: Claude Opus 5.5 --- ShimmerDriverPC/build.gradle | 3 --- ...PI_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java | 2 +- ...000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java | 2 +- ...0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ShimmerDriverPC/build.gradle b/ShimmerDriverPC/build.gradle index 00ee312ac..fb8ce399e 100644 --- a/ShimmerDriverPC/build.gradle +++ b/ShimmerDriverPC/build.gradle @@ -32,9 +32,6 @@ repositories { test { // this test requires a physical Shimmer2r to run exclude '**/API_00001_ShimmerPC_GeneralBluetoothShimmer2R.class' - exclude '**/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.class' - exclude '**/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.class' - exclude '**/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.class' } publishing { diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java index 7eb4ec253..4b40b8ba2 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.java @@ -31,7 +31,7 @@ public class API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only extends Bas ShimmerPC mDevice; @Before public void setUp() { - mDevice = new ShimmerPC("COM99"); + mDevice = ByteCommunicationTestUtils.newShimmerPCWithoutStatusTimer("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11_w_sd_only("COM99")); setWaitForData(mDevice); } diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java index 6b0695dbf..725719a8e 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.java @@ -31,7 +31,7 @@ public class API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master extends ShimmerPC mDevice; @Before public void setUp() { - mDevice = new ShimmerPC("COM99"); + mDevice = ByteCommunicationTestUtils.newShimmerPCWithoutStatusTimer("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11_w_sync_master("COM99")); setWaitForData(mDevice); } diff --git a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java index 2b20f77a4..75aff1e45 100644 --- a/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java +++ b/ShimmerDriverPC/src/test/java/com/shimmerresearch/shimmer3/communication/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.java @@ -31,7 +31,7 @@ public class API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave extends ShimmerPC mDevice; @Before public void setUp() { - mDevice = new ShimmerPC("COM99"); + mDevice = ByteCommunicationTestUtils.newShimmerPCWithoutStatusTimer("COM99"); mDevice.setTestRadio(new ByteCommunicationSimulatorS3LNS0_16_11_w_sync_slave("COM99")); setWaitForData(mDevice); }