Optimize WarmUpRule #1310

This PR is made of 2 commits.
The first is just a mass rename in order to spare 1 line of code every time `WarmUpRule` is used.
The second tweaks `WarmUpRule` so that the warmup code is only run once per test class.

appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt

@@ -37,8 +37,7 @@ import org.junit.Rule
 import org.junit.Test
 
 class RootPresenterTest {
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt

@@ -37,8 +37,7 @@ import org.junit.Test
 
 class LoggedInPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt

@@ -31,8 +31,7 @@ import org.junit.Test
 
 class AnalyticsOptInPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt

@@ -30,8 +30,7 @@ import org.junit.Test
 
 class AnalyticsPreferencesPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenterTests.kt

@@ -32,8 +32,7 @@ import org.junit.Test
 
 class AddPeoplePresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private lateinit var presenter: AddPeoplePresenter

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenterTests.kt

@@ -60,8 +60,7 @@ private const val AN_URI_FROM_GALLERY = "content://uri_from_gallery"
 @RunWith(RobolectricTestRunner::class)
 class ConfigureRoomPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private lateinit var presenter: ConfigureRoomPresenter

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTests.kt

@@ -44,8 +44,7 @@ import org.junit.Test
 
 class CreateRoomRootPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private lateinit var userRepository: FakeUserRepository

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/userlist/DefaultUserListPresenterTests.kt

@@ -33,8 +33,7 @@ import org.junit.Test
 
 class DefaultUserListPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val userRepository = FakeUserRepository()

features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/migration/MigrationScreenPresenterTest.kt

@@ -32,8 +32,7 @@ import org.junit.Test
 
 class MigrationScreenPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTests.kt

@@ -39,8 +39,7 @@ import org.junit.Test
 
 class NotificationsOptInPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private var isFinished = false

features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt

@@ -50,8 +50,7 @@ import org.junit.Rule
 import org.junit.Test
 
 class InviteListPresenterTests {
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenterImplTest.kt

@@ -39,8 +39,7 @@ import org.junit.Test
 
 class LeaveRoomPresenterImplTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt

@@ -42,8 +42,7 @@ import org.junit.Test
 
 class SendLocationPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val permissionsPresenterFake = PermissionsPresenterFake()

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt

@@ -35,8 +35,7 @@ import org.junit.Test
 
 class ShowLocationPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val permissionsPresenterFake = PermissionsPresenterFake()

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt

@@ -33,8 +33,7 @@ import org.junit.Test
 
 class ChangeServerPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt

@@ -35,8 +35,7 @@ import org.junit.Test
 
 class OidcPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt

@@ -31,8 +31,7 @@ import org.junit.Test
 
 class ChangeAccountProviderPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt

@@ -39,8 +39,7 @@ import org.junit.Test
 
 class ConfirmAccountProviderPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt

@@ -38,8 +38,7 @@ import org.junit.Test
 
 class LoginPasswordPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt

@@ -38,8 +38,7 @@ import org.junit.Test
 
 class SearchAccountProviderPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListPresenterTest.kt

@@ -37,8 +37,7 @@ import org.junit.Test
 
 class WaitListPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPreferencePresenterTest.kt

@@ -32,8 +32,7 @@ import org.junit.Test
 
 class LogoutPreferencePresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt

@@ -86,8 +86,7 @@ import kotlin.time.Duration.Companion.milliseconds
 
 class MessagesPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val mockMediaUrl: Uri = mockk("localMediaUri")

features/messages/impl/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt

@@ -41,8 +41,7 @@ import org.junit.Test
 
 class ActionListPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/messages/impl/src/test/kotlin/io/element/android/features/messages/attachments/AttachmentsPreviewPresenterTest.kt

@@ -43,8 +43,7 @@ import org.junit.Test
 
 class AttachmentsPreviewPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val mediaPreProcessor = FakeMediaPreProcessor()

features/messages/impl/src/test/kotlin/io/element/android/features/messages/forward/ForwardMessagesPresenterTests.kt

@@ -39,8 +39,7 @@ import org.junit.Test
 
 class ForwardMessagesPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
 

features/messages/impl/src/test/kotlin/io/element/android/features/messages/media/viewer/MediaViewerPresenterTest.kt

@@ -44,8 +44,7 @@ private val TESTED_MEDIA_INFO = aFileInfo()
 
 class MediaViewerPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
 

features/messages/impl/src/test/kotlin/io/element/android/features/messages/report/ReportMessagePresenterTests.kt

@@ -35,8 +35,7 @@ import org.junit.Test
 
 class ReportMessagePresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt

@@ -69,8 +69,7 @@ import java.io.File
 
 class MessageComposerPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val pickerProvider = FakePickerProvider().apply {

features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt

@@ -51,8 +51,7 @@ import java.util.Date
 
 class TimelinePresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/components/customreaction/CustomReactionPresenterTests.kt

@@ -33,8 +33,7 @@ import org.junit.Test
 
 class CustomReactionPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val presenter = CustomReactionPresenter(emojibaseProvider = FakeEmojibaseProvider())

features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/components/reactionsummary/ReactionSummaryPresenterTests.kt

@@ -37,8 +37,7 @@ import org.junit.Test
 
 class ReactionSummaryPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val aggregatedReaction = anAggregatedReaction(userId = A_USER_ID, key = "👍", isHighlighted = true)

features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt

@@ -32,8 +32,7 @@ import org.junit.Test
 
 class RetrySendMenuPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private val room = FakeMatrixRoom()

features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt

@@ -29,8 +29,7 @@ import org.junit.Test
 
 class OnBoardingPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt

@@ -35,8 +35,7 @@ import org.junit.Test
 
 class CreatePollPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private var navUpInvocationsCount = 0

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutPresenterTest.kt

@@ -27,8 +27,7 @@ import org.junit.Test
 
 class AboutPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenterTest.kt

@@ -30,8 +30,7 @@ import org.junit.Test
 
 class AnalyticsSettingsPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt

@@ -35,8 +35,7 @@ import org.junit.Test
 
 class DeveloperSettingsPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingPresenterTest.kt

@@ -30,8 +30,7 @@ import org.junit.Test
 
 class ConfigureTracingPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
     @Test
     fun `present - initial state`() = runTest {

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt

@@ -37,8 +37,7 @@ import org.junit.Test
 
 class PreferencesRootPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt

@@ -36,8 +36,7 @@ const val A_LONG_DESCRIPTION = "I have seen a bug!"
 
 class BugReportPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/ui/CrashDetectionPresenterTest.kt

@@ -31,8 +31,7 @@ import org.junit.Test
 
 class CrashDetectionPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/detection/RageshakeDetectionPresenterTest.kt

@@ -38,8 +38,7 @@ import org.junit.Test
 
 class RageshakeDetectionPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     companion object {

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/preferences/RageshakePreferencesPresenterTest.kt

@@ -31,8 +31,7 @@ import org.junit.Test
 
 class RageshakePreferencesPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt

@@ -57,8 +57,7 @@ import kotlin.time.Duration.Companion.milliseconds
 @ExperimentalCoroutinesApi
 class RoomDetailsPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
     private fun aRoomDetailsPresenter(
         room: MatrixRoom,

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt

@@ -48,8 +48,7 @@ import java.io.File
 @ExperimentalCoroutinesApi
 class RoomDetailsEditPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     private lateinit var fakePickerProvider: FakePickerProvider

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersPresenterTest.kt

@@ -46,8 +46,7 @@ import org.junit.Test
 
 internal class RoomInviteMembersPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/RoomMemberListPresenterTests.kt

@@ -43,8 +43,7 @@ import org.junit.Test
 @ExperimentalCoroutinesApi
 class RoomMemberListPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/details/RoomMemberDetailsPresenterTests.kt

@@ -38,8 +38,7 @@ import org.junit.Test
 @ExperimentalCoroutinesApi
 class RoomMemberDetailsPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt

@@ -61,8 +61,7 @@ import org.junit.Test
 
 class RoomListPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenterTests.kt

@@ -35,8 +35,7 @@ import org.junit.Test
 @ExperimentalCoroutinesApi
 class VerifySelfSessionPresenterTests {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt

@@ -35,8 +35,7 @@ const val A_PERMISSION = "A_PERMISSION"
 
 class DefaultPermissionsPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

libraries/permissions/noop/src/test/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenterTest.kt

@@ -27,8 +27,7 @@ import org.junit.Test
 
 class NoopPermissionsPresenterTest {
 
-    @Rule
+    @get:Rule
-    @JvmField
     val warmUpRule = WarmUpRule()
 
     @Test

tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WarmUpRule.kt

@@ -32,17 +32,22 @@ import kotlin.time.Duration.Companion.seconds
  * Applying this test rule ensures that the slow initialisation is not done
  * inside runTest which has a short default timeout.
  */
-class WarmUpRule: TestRule {
+class WarmUpRule : TestRule {
-    override fun apply(base: Statement, description: Description): Statement = object: Statement() {
+    companion object {
-        override fun evaluate() {
+        init {
-            runTest(timeout = 60.seconds) {
+            warmUpMolecule()
-                moleculeFlow(RecompositionMode.Immediate) {
+        }
-                    // Do nothing
+    }
-                }.test {
+
-                    awaitItem() // Await a Unit composition
+    override fun apply(base: Statement, description: Description): Statement = base
-                }
+}
-            }
+
-            base.evaluate()
+private fun warmUpMolecule() {
+    runTest(timeout = 60.seconds) {
+        moleculeFlow(RecompositionMode.Immediate) {
+            // Do nothing
+        }.test {
+            awaitItem() // Await a Unit composition
         }
     }
 }