mittwerk
/
element-x-android
mirror of https://github.com/element-hq/element-x-android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add Konsist test to use isTrue() instead of isEqualTo(true), and fix existing issues.

pull/1956/head
Benoit Marty 10 months ago
parent
b2d9b41946
commit
ab8e4f1422
9 changed files with 48 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
  2. 12
      features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
  3. 8
      features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt
  4. 2
      features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerPresenterTest.kt
  5. 22
      features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt
  6. 2
      features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
  7. 12
      features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt
  8. 6
      libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt
  9. 12
      tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt

8
features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
Unescape View File

@ -79,14 +79,14 @@ class SendLocationPresenterTest { @@ -79,14 +79,14 @@ class SendLocationPresenterTest {
val initialState = awaitItem()
assertThat(initialState.permissionDialog).isEqualTo(SendLocationState.Dialog.None)
assertThat(initialState.mode).isEqualTo(SendLocationState.Mode.SenderLocation)
assertThat(initialState.hasLocationPermission).isEqualTo(true)
assertThat(initialState.hasLocationPermission).isTrue()
// Swipe the map to switch mode
initialState.eventSink(SendLocationEvents.SwitchToPinLocationMode)
val myLocationState = awaitItem()
assertThat(myLocationState.permissionDialog).isEqualTo(SendLocationState.Dialog.None)
assertThat(myLocationState.mode).isEqualTo(SendLocationState.Mode.PinLocation)
assertThat(myLocationState.hasLocationPermission).isEqualTo(true)
assertThat(myLocationState.hasLocationPermission).isTrue()
}
}
@ -106,14 +106,14 @@ class SendLocationPresenterTest { @@ -106,14 +106,14 @@ class SendLocationPresenterTest {
val initialState = awaitItem()
assertThat(initialState.permissionDialog).isEqualTo(SendLocationState.Dialog.None)
assertThat(initialState.mode).isEqualTo(SendLocationState.Mode.SenderLocation)
assertThat(initialState.hasLocationPermission).isEqualTo(true)
assertThat(initialState.hasLocationPermission).isTrue()
// Swipe the map to switch mode
initialState.eventSink(SendLocationEvents.SwitchToPinLocationMode)
val myLocationState = awaitItem()
assertThat(myLocationState.permissionDialog).isEqualTo(SendLocationState.Dialog.None)
assertThat(myLocationState.mode).isEqualTo(SendLocationState.Mode.PinLocation)
assertThat(myLocationState.hasLocationPermission).isEqualTo(true)
assertThat(myLocationState.hasLocationPermission).isTrue()
}
}

12
features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
Unescape View File

@ -103,7 +103,7 @@ class ShowLocationPresenterTest { @@ -103,7 +103,7 @@ class ShowLocationPresenterTest {
val initialState = awaitItem()
assertThat(initialState.location).isEqualTo(location)
assertThat(initialState.description).isEqualTo(A_DESCRIPTION)
assertThat(initialState.hasLocationPermission).isEqualTo(true)
assertThat(initialState.hasLocationPermission).isTrue()
assertThat(initialState.isTrackMyLocation).isFalse()
}
}
@ -118,7 +118,7 @@ class ShowLocationPresenterTest { @@ -118,7 +118,7 @@ class ShowLocationPresenterTest {
val initialState = awaitItem()
assertThat(initialState.location).isEqualTo(location)
assertThat(initialState.description).isEqualTo(A_DESCRIPTION)
assertThat(initialState.hasLocationPermission).isEqualTo(true)
assertThat(initialState.hasLocationPermission).isTrue()
assertThat(initialState.isTrackMyLocation).isFalse()
}
}
@ -144,7 +144,7 @@ class ShowLocationPresenterTest { @@ -144,7 +144,7 @@ class ShowLocationPresenterTest {
presenter.present()
}.test {
val initialState = awaitItem()
assertThat(initialState.hasLocationPermission).isEqualTo(true)
assertThat(initialState.hasLocationPermission).isTrue()
assertThat(initialState.isTrackMyLocation).isFalse()
initialState.eventSink(ShowLocationEvents.TrackMyLocation(true))
@ -152,15 +152,15 @@ class ShowLocationPresenterTest { @@ -152,15 +152,15 @@ class ShowLocationPresenterTest {
delay(1)
assertThat(trackMyLocationState.hasLocationPermission).isEqualTo(true)
assertThat(trackMyLocationState.isTrackMyLocation).isEqualTo(true)
assertThat(trackMyLocationState.hasLocationPermission).isTrue()
assertThat(trackMyLocationState.isTrackMyLocation).isTrue()
// Swipe the map to switch mode
initialState.eventSink(ShowLocationEvents.TrackMyLocation(false))
val trackLocationDisabledState = awaitItem()
assertThat(trackLocationDisabledState.permissionDialog).isEqualTo(ShowLocationState.Dialog.None)
assertThat(trackLocationDisabledState.isTrackMyLocation).isFalse()
assertThat(trackLocationDisabledState.hasLocationPermission).isEqualTo(true)
assertThat(trackLocationDisabledState.hasLocationPermission).isTrue()
}
}

8
features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt
Unescape View File

@ -94,7 +94,7 @@ class PinUnlockPresenterTest { @@ -94,7 +94,7 @@ class PinUnlockPresenterTest {
}
awaitLastSequentialItem().also { state ->
assertThat(state.remainingAttempts.dataOrNull()).isEqualTo(0)
assertThat(state.showSignOutPrompt).isEqualTo(true)
assertThat(state.showSignOutPrompt).isTrue()
assertThat(state.isSignOutPromptCancellable).isFalse()
}
}
@ -112,8 +112,8 @@ class PinUnlockPresenterTest { @@ -112,8 +112,8 @@ class PinUnlockPresenterTest {
state.eventSink(PinUnlockEvents.OnForgetPin)
}
awaitLastSequentialItem().also { state ->
assertThat(state.showSignOutPrompt).isEqualTo(true)
assertThat(state.isSignOutPromptCancellable).isEqualTo(true)
assertThat(state.showSignOutPrompt).isTrue()
assertThat(state.isSignOutPromptCancellable).isTrue()
state.eventSink(PinUnlockEvents.ClearSignOutPrompt)
}
awaitLastSequentialItem().also { state ->
@ -121,7 +121,7 @@ class PinUnlockPresenterTest { @@ -121,7 +121,7 @@ class PinUnlockPresenterTest {
state.eventSink(PinUnlockEvents.OnForgetPin)
}
awaitLastSequentialItem().also { state ->
assertThat(state.showSignOutPrompt).isEqualTo(true)
assertThat(state.showSignOutPrompt).isTrue()
state.eventSink(PinUnlockEvents.SignOut)
}
consumeItemsUntilPredicate { state ->

2
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/textcomposer/MessageComposerPresenterTest.kt
Unescape View File

@ -381,7 +381,7 @@ class MessageComposerPresenterTest { @@ -381,7 +381,7 @@ class MessageComposerPresenterTest {
val initialState = awaitItem()
assertThat(initialState.showAttachmentSourcePicker).isFalse()
initialState.eventSink(MessageComposerEvents.AddAttachment)
assertThat(awaitItem().showAttachmentSourcePicker).isEqualTo(true)
assertThat(awaitItem().showAttachmentSourcePicker).isTrue()
}
}

22
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt
Unescape View File

@ -80,7 +80,7 @@ class DefaultVoiceMessagePlayerTest { @@ -80,7 +80,7 @@ class DefaultVoiceMessagePlayerTest {
matchReadyState()
player.play()
awaitItem().let {
assertThat(it.isPlaying).isEqualTo(true)
assertThat(it.isPlaying).isTrue()
assertThat(it.currentPosition).isEqualTo(1000)
}
}
@ -102,7 +102,7 @@ class DefaultVoiceMessagePlayerTest { @@ -102,7 +102,7 @@ class DefaultVoiceMessagePlayerTest {
awaitItem().let {
assertThat(it.isReady).isFalse()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isEqualTo(true)
assertThat(it.isEnded).isTrue()
assertThat(it.currentPosition).isEqualTo(1000)
assertThat(it.duration).isEqualTo(1000)
}
@ -127,7 +127,7 @@ class DefaultVoiceMessagePlayerTest { @@ -127,7 +127,7 @@ class DefaultVoiceMessagePlayerTest {
awaitItem().let { // it plays until the end.
assertThat(it.isReady).isFalse()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isEqualTo(true)
assertThat(it.isEnded).isTrue()
assertThat(it.currentPosition).isEqualTo(1000)
assertThat(it.duration).isEqualTo(1000)
}
@ -140,7 +140,7 @@ class DefaultVoiceMessagePlayerTest { @@ -140,7 +140,7 @@ class DefaultVoiceMessagePlayerTest {
awaitItem().let { // Additional spurious state due to MediaPlayer owner change.
assertThat(it.isReady).isFalse()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isEqualTo(true)
assertThat(it.isEnded).isTrue()
assertThat(it.currentPosition).isEqualTo(1000)
assertThat(it.duration).isEqualTo(1000)
}
@ -156,7 +156,7 @@ class DefaultVoiceMessagePlayerTest { @@ -156,7 +156,7 @@ class DefaultVoiceMessagePlayerTest {
awaitItem().let { // it plays until the end.
assertThat(it.isReady).isFalse()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isEqualTo(true)
assertThat(it.isEnded).isTrue()
assertThat(it.currentPosition).isEqualTo(1000)
assertThat(it.duration).isEqualTo(1000)
}
@ -167,7 +167,7 @@ class DefaultVoiceMessagePlayerTest { @@ -167,7 +167,7 @@ class DefaultVoiceMessagePlayerTest {
awaitItem().let {// Last previous state/
assertThat(it.isReady).isFalse()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isEqualTo(true)
assertThat(it.isEnded).isTrue()
assertThat(it.currentPosition).isEqualTo(1000)
assertThat(it.duration).isEqualTo(1000)
}
@ -184,7 +184,7 @@ class DefaultVoiceMessagePlayerTest { @@ -184,7 +184,7 @@ class DefaultVoiceMessagePlayerTest {
awaitItem().let { // it played again until the end.
assertThat(it.isReady).isFalse()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isEqualTo(true)
assertThat(it.isEnded).isTrue()
assertThat(it.currentPosition).isEqualTo(1000)
assertThat(it.duration).isEqualTo(1000)
}
@ -221,7 +221,7 @@ class DefaultVoiceMessagePlayerTest { @@ -221,7 +221,7 @@ class DefaultVoiceMessagePlayerTest {
skipItems(1) // skip pause state
player.play()
awaitItem().let {
assertThat(it.isPlaying).isEqualTo(true)
assertThat(it.isPlaying).isTrue()
assertThat(it.currentPosition).isEqualTo(2000)
}
}
@ -242,7 +242,7 @@ class DefaultVoiceMessagePlayerTest { @@ -242,7 +242,7 @@ class DefaultVoiceMessagePlayerTest {
}
assertThat(player.prepare().isSuccess).isTrue()
awaitItem().let {
assertThat(it.isReady).isEqualTo(true)
assertThat(it.isReady).isTrue()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isFalse()
assertThat(it.currentPosition).isEqualTo(2000)
@ -260,7 +260,7 @@ class DefaultVoiceMessagePlayerTest { @@ -260,7 +260,7 @@ class DefaultVoiceMessagePlayerTest {
matchReadyState()
player.seekTo(2000)
awaitItem().let {
assertThat(it.isReady).isEqualTo(true)
assertThat(it.isReady).isTrue()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isFalse()
assertThat(it.currentPosition).isEqualTo(2000)
@ -308,7 +308,7 @@ private suspend fun TurbineTestContext<VoiceMessagePlayer.State>.matchReadyState @@ -308,7 +308,7 @@ private suspend fun TurbineTestContext<VoiceMessagePlayer.State>.matchReadyState
fakeTotalDurationMs: Long = FAKE_TOTAL_DURATION_MS,
) {
awaitItem().let {
assertThat(it.isReady).isEqualTo(true)
assertThat(it.isReady).isTrue()
assertThat(it.isPlaying).isFalse()
assertThat(it.isEnded).isFalse()
assertThat(it.currentPosition).isEqualTo(0)

2
features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
Unescape View File

@ -73,7 +73,7 @@ class PreferencesRootPresenterTest { @@ -73,7 +73,7 @@ class PreferencesRootPresenterTest {
avatarUrl = AN_AVATAR_URL
)
)
assertThat(loadedState.showDeveloperSettings).isEqualTo(true)
assertThat(loadedState.showDeveloperSettings).isTrue()
assertThat(loadedState.showAnalyticsSettings).isFalse()
assertThat(loadedState.accountManagementUrl).isNull()
assertThat(loadedState.devicesManagementUrl).isNull()

12
features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditPresenterTest.kt
Unescape View File

@ -304,7 +304,7 @@ class RoomDetailsEditPresenterTest { @@ -304,7 +304,7 @@ class RoomDetailsEditPresenterTest {
// Once a change is made, the save button is enabled
initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("Name II"))
awaitItem().apply {
assertThat(saveButtonEnabled).isEqualTo(true)
assertThat(saveButtonEnabled).isTrue()
}
// If it's reverted then the save disables again
@ -316,7 +316,7 @@ class RoomDetailsEditPresenterTest { @@ -316,7 +316,7 @@ class RoomDetailsEditPresenterTest {
// Make a change...
initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("Another topic"))
awaitItem().apply {
assertThat(saveButtonEnabled).isEqualTo(true)
assertThat(saveButtonEnabled).isTrue()
}
// Revert it...
@ -328,7 +328,7 @@ class RoomDetailsEditPresenterTest { @@ -328,7 +328,7 @@ class RoomDetailsEditPresenterTest {
// Make a change...
initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.Remove))
awaitItem().apply {
assertThat(saveButtonEnabled).isEqualTo(true)
assertThat(saveButtonEnabled).isTrue()
}
// Revert it...
@ -356,7 +356,7 @@ class RoomDetailsEditPresenterTest { @@ -356,7 +356,7 @@ class RoomDetailsEditPresenterTest {
// Once a change is made, the save button is enabled
initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("Name II"))
awaitItem().apply {
assertThat(saveButtonEnabled).isEqualTo(true)
assertThat(saveButtonEnabled).isTrue()
}
// If it's reverted then the save disables again
@ -368,7 +368,7 @@ class RoomDetailsEditPresenterTest { @@ -368,7 +368,7 @@ class RoomDetailsEditPresenterTest {
// Make a change...
initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("Another topic"))
awaitItem().apply {
assertThat(saveButtonEnabled).isEqualTo(true)
assertThat(saveButtonEnabled).isTrue()
}
// Revert it...
@ -380,7 +380,7 @@ class RoomDetailsEditPresenterTest { @@ -380,7 +380,7 @@ class RoomDetailsEditPresenterTest {
// Make a change...
initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
awaitItem().apply {
assertThat(saveButtonEnabled).isEqualTo(true)
assertThat(saveButtonEnabled).isTrue()
}
// Revert it...

6
libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt
Unescape View File

@ -45,7 +45,7 @@ class DefaultFeatureFlagServiceTest { @@ -45,7 +45,7 @@ class DefaultFeatureFlagServiceTest {
val featureFlagProvider = FakeMutableFeatureFlagProvider(0)
val featureFlagService = DefaultFeatureFlagService(setOf(featureFlagProvider))
val result = featureFlagService.setFeatureEnabled(FeatureFlags.LocationSharing, true)
assertThat(result).isEqualTo(true)
assertThat(result).isTrue()
}
@Test
@ -54,7 +54,7 @@ class DefaultFeatureFlagServiceTest { @@ -54,7 +54,7 @@ class DefaultFeatureFlagServiceTest {
val featureFlagService = DefaultFeatureFlagService(setOf(featureFlagProvider))
featureFlagService.setFeatureEnabled(FeatureFlags.LocationSharing, true)
featureFlagService.isFeatureEnabledFlow(FeatureFlags.LocationSharing).test {
assertThat(awaitItem()).isEqualTo(true)
assertThat(awaitItem()).isTrue()
featureFlagService.setFeatureEnabled(FeatureFlags.LocationSharing, false)
assertThat(awaitItem()).isFalse()
}
@ -68,7 +68,7 @@ class DefaultFeatureFlagServiceTest { @@ -68,7 +68,7 @@ class DefaultFeatureFlagServiceTest {
lowPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.LocationSharing, false)
highPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.LocationSharing, true)
featureFlagService.isFeatureEnabledFlow(FeatureFlags.LocationSharing).test {
assertThat(awaitItem()).isEqualTo(true)
assertThat(awaitItem()).isTrue()
}
}
}

12
tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt
Unescape View File

@ -74,4 +74,16 @@ class KonsistTestTest { @@ -74,4 +74,16 @@ class KonsistTestTest {
functionDeclaration.text.contains("isEqualTo(false)")
}
}
@Test
fun `use isTrue() instead of isEqualTo(true)`() {
Konsist
.scopeFromTest()
.functions()
// Exclude self
.withoutName("use isTrue() instead of isEqualTo(true)")
.assertFalse { functionDeclaration ->
functionDeclaration.text.contains("isEqualTo(true)")
}
}
}

Write Preview
Loading…
Cancel
Save