From c1d4e1eea11b42ea0bdea7b60ac3b11a57ab9f83 Mon Sep 17 00:00:00 2001 From: Zhanglong Xia Date: Mon, 25 Mar 2024 18:51:26 +0800 Subject: [PATCH] check the Thread required features before running ThreadNetworkControllerTest This CL checks if the device supports Thread specific features before running the test case ThreadNetworkControllerTest. If the device doesn't support specific features, just skip the test case. Bug: b/330879812 Test: atest ThreadNetworkIntegrationTests Change-Id: I1452ab02cc62228102d4a140f39abf13b79542c7 --- .../src/android/net/thread/ThreadNetworkControllerTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/thread/tests/integration/src/android/net/thread/ThreadNetworkControllerTest.java b/thread/tests/integration/src/android/net/thread/ThreadNetworkControllerTest.java index 496ec9fc23..ba04348de3 100644 --- a/thread/tests/integration/src/android/net/thread/ThreadNetworkControllerTest.java +++ b/thread/tests/integration/src/android/net/thread/ThreadNetworkControllerTest.java @@ -27,6 +27,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; import android.content.Context; +import android.net.thread.utils.ThreadFeatureCheckerRule; import android.net.thread.utils.ThreadFeatureCheckerRule.RequiresThreadFeature; import android.os.OutcomeReceiver; import android.util.SparseIntArray; @@ -37,6 +38,7 @@ import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -64,6 +66,8 @@ public class ThreadNetworkControllerTest { } }; + @Rule public final ThreadFeatureCheckerRule mThreadRule = new ThreadFeatureCheckerRule(); + private final Context mContext = ApplicationProvider.getApplicationContext(); private ExecutorService mExecutor; private ThreadNetworkController mController;