6 files changed, 11 insertions, 11 deletions
diff --git a/service/src/ActiveLogTest.kt b/service/src/ActiveLogTest.kt
index dade415975..ccd86a375e 100644
--- a/service/src/ActiveLogTest.kt
+++ b/service/src/ActiveLogTest.kt
@@ -42,8 +42,7 @@ import org.robolectric.RobolectricTestRunner
 @RunWith(RobolectricTestRunner::class)
 @kotlinx.coroutines.ExperimentalCoroutinesApi
 class ActiveLogTest {
-
-    @JvmField @Rule val testName = TestName()
+    @get:Rule val testName = TestName()
 
     @Before
     fun setUp() {
diff --git a/service/src/AdapterStateTest.kt b/service/src/AdapterStateTest.kt
index 0b73558b6c..d61138438a 100644
--- a/service/src/AdapterStateTest.kt
+++ b/service/src/AdapterStateTest.kt
@@ -35,9 +35,9 @@ import org.robolectric.RobolectricTestRunner
 @RunWith(RobolectricTestRunner::class)
 @kotlinx.coroutines.ExperimentalCoroutinesApi
 class BluetoothAdapterStateTest {
+    @get:Rule val testName = TestName()
 
     lateinit var mState: BluetoothAdapterState
-    @JvmField @Rule val testName = TestName()
 
     @Before
     fun setUp() {
diff --git a/service/src/AutoOnFeatureTest.kt b/service/src/AutoOnFeatureTest.kt
index 31bcde3504..2c3bb082ff 100644
--- a/service/src/AutoOnFeatureTest.kt
+++ b/service/src/AutoOnFeatureTest.kt
@@ -56,6 +56,9 @@ import org.robolectric.Shadows.shadowOf
 @RunWith(RobolectricTestRunner::class)
 @kotlinx.coroutines.ExperimentalCoroutinesApi
 class AutoOnFeatureTest {
+    @get:Rule val testName = TestName()
+    @get:Rule val expect = Expect.create()
+
     private val looper = Looper.getMainLooper()
     private val state = BluetoothAdapterState()
     private val context = ApplicationProvider.getApplicationContext<Context>()
@@ -65,9 +68,6 @@ class AutoOnFeatureTest {
 
     private var callback_count = 0
 
-    @JvmField @Rule val testName = TestName()
-    @JvmField @Rule val expect = Expect.create()
-
     @Before
     fun setUp() {
         Log.i("AutoOnFeatureTest", "\t--> setUp(${testName.getMethodName()})")
diff --git a/service/src/RadioModeListenerTest.kt b/service/src/RadioModeListenerTest.kt
index 82b9f023fe..0caa221d08 100644
--- a/service/src/RadioModeListenerTest.kt
+++ b/service/src/RadioModeListenerTest.kt
@@ -57,9 +57,9 @@ internal fun enableMode(resolver: ContentResolver, looper: Looper, modeKey: Stri
 
 @RunWith(RobolectricTestRunner::class)
 class RadioModeListenerTest {
+    @get:Rule val testName = TestName()
     private val resolver: ContentResolver =
         ApplicationProvider.getApplicationContext<Context>().getContentResolver()
-    @JvmField @Rule val testName = TestName()
 
     private val looper: Looper = Looper.getMainLooper()
 
diff --git a/service/src/airplane/ModeListenerTest.kt b/service/src/airplane/ModeListenerTest.kt
index 3fb3da70f7..c2db15c331 100644
--- a/service/src/airplane/ModeListenerTest.kt
+++ b/service/src/airplane/ModeListenerTest.kt
@@ -94,14 +94,14 @@ class ModeListenerTest {
         }
     }
 
+    @get:Rule val testName = TestName()
+    @get:Rule val setFlagsRule = SetFlagsRule()
+
     private val looper: Looper = Looper.getMainLooper()
     private val state = BluetoothAdapterState()
     private val mContext = ApplicationProvider.getApplicationContext<Context>()
     private val resolver: ContentResolver = mContext.contentResolver
 
-    @JvmField @Rule val testName = TestName()
-    @JvmField @Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.NULL_DEFAULT)
-
     private val userContext =
         mContext.createContextAsUser(UserHandle.of(ActivityManager.getCurrentUser()), 0)
 
diff --git a/service/src/satellite/ModeListenerTest.kt b/service/src/satellite/ModeListenerTest.kt
index ea3aa81c97..467e077235 100644
--- a/service/src/satellite/ModeListenerTest.kt
+++ b/service/src/satellite/ModeListenerTest.kt
@@ -57,9 +57,10 @@ class ModeListenerTest {
         }
     }
 
+    @get:Rule val testName = TestName()
+
     private val resolver: ContentResolver =
         ApplicationProvider.getApplicationContext<Context>().getContentResolver()
-    @JvmField @Rule val testName = TestName()
 
     private val looper: Looper = Looper.getMainLooper()