Remove bad default arguments

mullvad · Dec 10, 2024 · dba4496 · dba4496
1 parent 3232f1b
commit dba4496
Show file tree

Hide file tree

Showing 75 changed files with 2,371 additions and 2,194 deletions.
diff --git a/...vpn/compose/screen/ChangelogDialogTest.kt → ...vpn/compose/dialog/ChangelogDialogTest.kt b/...vpn/compose/screen/ChangelogDialogTest.kt → ...vpn/compose/dialog/ChangelogDialogTest.kt
@@ -1,12 +1,12 @@
-package net.mullvad.mullvadvpn.compose.screen
+package net.mullvad.mullvadvpn.compose.dialog
 
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import de.mannodermaus.junit5.compose.ComposeContext
 import io.mockk.MockKAnnotations
 import io.mockk.impl.annotations.MockK
 import net.mullvad.mullvadvpn.compose.createEdgeToEdgeComposeExtension
-import net.mullvad.mullvadvpn.compose.dialog.ChangelogDialog
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
 import net.mullvad.mullvadvpn.viewmodel.AppInfoViewModel
 import net.mullvad.mullvadvpn.viewmodel.ChangelogUiState
@@ -25,16 +25,19 @@ class ChangelogDialogTest {
         MockKAnnotations.init(this)
     }
 
+    private fun ComposeContext.initScreen(state: ChangelogUiState, onDismiss: () -> Unit = {}) {
+        setContentWithTheme { ChangelogDialog(state = state, onDismiss = onDismiss) }
+    }
+
     @Test
     fun testShowChangeLogWhenNeeded() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme {
-                ChangelogDialog(
+            initScreen(
+                state =
                     ChangelogUiState(changes = listOf(CHANGELOG_ITEM), version = CHANGELOG_VERSION),
-                    onDismiss = {},
-                )
-            }
+                onDismiss = {},
+            )
 
             // Check changelog content showed within dialog
             onNodeWithText(CHANGELOG_ITEM).assertExists()

diff --git a/...rc/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialogTest.kt b/...rc/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialogTest.kt
@@ -5,6 +5,7 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
+import de.mannodermaus.junit5.compose.ComposeContext
 import io.mockk.MockKAnnotations
 import io.mockk.mockk
 import io.mockk.verify
@@ -30,12 +31,30 @@ class CreateCustomListDialogTest {
         MockKAnnotations.init(this)
     }
 
+    private fun ComposeContext.initDialog(
+        state: CreateCustomListUiState = CreateCustomListUiState(),
+        createCustomList: (String) -> Unit = {},
+        onInputChanged: () -> Unit = {},
+        onDismiss: () -> Unit = {},
+    ) {
+        setContentWithTheme {
+            setContentWithTheme {
+                CreateCustomListDialog(
+                    state = state,
+                    createCustomList = createCustomList,
+                    onInputChanged = onInputChanged,
+                    onDismiss = onDismiss,
+                )
+            }
+        }
+    }
+
     @Test
     fun givenNoErrorShouldShowNoErrorMessage() =
         composeExtension.use {
             // Arrange
             val state = CreateCustomListUiState(error = null)
-            setContentWithTheme { CreateCustomListDialog(state = state) }
+            initDialog(state)
 
             // Assert
             onNodeWithText(NAME_EXIST_ERROR_TEXT).assertDoesNotExist()
@@ -50,7 +69,7 @@ class CreateCustomListDialogTest {
                 CreateCustomListUiState(
                     error = CreateWithLocationsError.Create(CustomListAlreadyExists)
                 )
-            setContentWithTheme { CreateCustomListDialog(state = state) }
+            initDialog(state)
 
             // Assert
             onNodeWithText(NAME_EXIST_ERROR_TEXT).assertExists()
@@ -65,7 +84,7 @@ class CreateCustomListDialogTest {
                 CreateCustomListUiState(
                     error = CreateWithLocationsError.Create(UnknownCustomListError(Throwable()))
                 )
-            setContentWithTheme { CreateCustomListDialog(state = state) }
+            initDialog(state)
 
             // Assert
             onNodeWithText(NAME_EXIST_ERROR_TEXT).assertDoesNotExist()
@@ -78,9 +97,7 @@ class CreateCustomListDialogTest {
             // Arrange
             val mockedOnDismiss: () -> Unit = mockk(relaxed = true)
             val state = CreateCustomListUiState()
-            setContentWithTheme {
-                CreateCustomListDialog(state = state, onDismiss = mockedOnDismiss)
-            }
+            initDialog(state, onDismiss = mockedOnDismiss)
 
             // Act
             onNodeWithText(CANCEL_BUTTON_TEXT).performClick()
@@ -95,9 +112,7 @@ class CreateCustomListDialogTest {
             // Arrange
             val mockedCreateCustomList: (String) -> Unit = mockk(relaxed = true)
             val state = CreateCustomListUiState()
-            setContentWithTheme {
-                CreateCustomListDialog(state = state, createCustomList = mockedCreateCustomList)
-            }
+            initDialog(state, createCustomList = mockedCreateCustomList)
 
             // Act
             onNodeWithText(CREATE_BUTTON_TEXT).performClick()
@@ -113,9 +128,7 @@ class CreateCustomListDialogTest {
             val mockedCreateCustomList: (String) -> Unit = mockk(relaxed = true)
             val inputText = "NEW LIST"
             val state = CreateCustomListUiState()
-            setContentWithTheme {
-                CreateCustomListDialog(state = state, createCustomList = mockedCreateCustomList)
-            }
+            initDialog(state, createCustomList = mockedCreateCustomList)
 
             // Act
             onNodeWithTag(CREATE_CUSTOM_LIST_DIALOG_INPUT_TEST_TAG).performTextInput(inputText)
@@ -132,9 +145,7 @@ class CreateCustomListDialogTest {
             val mockedOnInputChanged: () -> Unit = mockk(relaxed = true)
             val inputText = "NEW LIST"
             val state = CreateCustomListUiState()
-            setContentWithTheme {
-                CreateCustomListDialog(state = state, onInputChanged = mockedOnInputChanged)
-            }
+            initDialog(state, onInputChanged = mockedOnInputChanged)
 
             // Act
             onNodeWithTag(CREATE_CUSTOM_LIST_DIALOG_INPUT_TEST_TAG).performTextInput(inputText)

diff --git a/.../app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialogTest.kt b/.../app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialogTest.kt
@@ -1,7 +1,5 @@
 package net.mullvad.mullvadvpn.compose.dialog
 
-import android.annotation.SuppressLint
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -13,6 +11,7 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
+import de.mannodermaus.junit5.compose.ComposeContext
 import io.mockk.MockKAnnotations
 import io.mockk.mockk
 import io.mockk.verify
@@ -36,30 +35,30 @@ class CustomPortDialogTest {
         MockKAnnotations.init(this)
     }
 
-    @SuppressLint("ComposableNaming")
-    @Composable
-    private fun testWireguardCustomPortDialog(
+    private fun ComposeContext.initDialog(
         title: String = "",
         portInput: String = "",
         isValidInput: Boolean = false,
-        showResetToDefault: Boolean = false,
         allowedPortRanges: List<PortRange> = emptyList(),
+        showResetToDefault: Boolean = false,
         onInputChanged: (String) -> Unit = { _ -> },
         onSavePort: (String) -> Unit = { _ -> },
         onResetPort: () -> Unit = {},
         onDismiss: () -> Unit = {},
     ) {
-        CustomPortDialog(
-            title = title,
-            portInput = portInput,
-            isValidInput = isValidInput,
-            showResetToDefault = showResetToDefault,
-            allowedPortRanges = allowedPortRanges,
-            onInputChanged = onInputChanged,
-            onSavePort = onSavePort,
-            onDismiss = onDismiss,
-            onResetPort = onResetPort,
-        )
+        setContentWithTheme {
+            CustomPortDialog(
+                title = title,
+                portInput = portInput,
+                isValidInput = isValidInput,
+                allowedPortRanges = allowedPortRanges,
+                showResetToDefault = showResetToDefault,
+                onInputChanged = onInputChanged,
+                onSavePort = onSavePort,
+                onDismiss = onDismiss,
+                onResetPort = onResetPort,
+            )
+        }
     }
 
     @Test
@@ -71,7 +70,17 @@ class CustomPortDialogTest {
             // Arrange
             setContentWithTheme {
                 var input by remember { mutableStateOf("") }
-                testWireguardCustomPortDialog(portInput = input, onInputChanged = { input = it })
+                CustomPortDialog(
+                    title = "",
+                    portInput = input,
+                    isValidInput = false,
+                    allowedPortRanges = emptyList(),
+                    showResetToDefault = false,
+                    onInputChanged = { input = it },
+                    onSavePort = {},
+                    onDismiss = {},
+                    onResetPort = {},
+                )
             }
 
             // Act
@@ -86,7 +95,7 @@ class CustomPortDialogTest {
     fun testEmptyInputResultsInSetPortButtonBeingDisabled() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme { testWireguardCustomPortDialog(isValidInput = false) }
+            initDialog(isValidInput = false)
 
             // Assert
             onNodeWithText("Set port").assertIsNotEnabled()
@@ -96,9 +105,7 @@ class CustomPortDialogTest {
     fun testValidInputResultsInSetPortButtonBeingEnabled() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme {
-                testWireguardCustomPortDialog(portInput = VALID_CUSTOM_PORT, isValidInput = true)
-            }
+            initDialog(portInput = VALID_CUSTOM_PORT, isValidInput = true)
 
             // Assert
             onNodeWithText("Set port").assertIsEnabled()
@@ -109,9 +116,7 @@ class CustomPortDialogTest {
     fun testInvalidInputResultsInSetPortButtonBeingDisabled() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme {
-                testWireguardCustomPortDialog(portInput = INVALID_CUSTOM_PORT, isValidInput = false)
-            }
+            initDialog(portInput = INVALID_CUSTOM_PORT, isValidInput = false)
 
             // Assert
             onNodeWithText("Set port").assertIsNotEnabled()
@@ -122,13 +127,11 @@ class CustomPortDialogTest {
         composeExtension.use {
             // Arrange
             val mockedSubmitHandler: (String) -> Unit = mockk(relaxed = true)
-            setContentWithTheme {
-                testWireguardCustomPortDialog(
-                    portInput = VALID_CUSTOM_PORT,
-                    isValidInput = true,
-                    onSavePort = mockedSubmitHandler,
-                )
-            }
+            initDialog(
+                portInput = VALID_CUSTOM_PORT,
+                isValidInput = true,
+                onSavePort = mockedSubmitHandler,
+            )
 
             // Act
             onNodeWithText("Set port").assertIsEnabled().performClick()
@@ -142,14 +145,12 @@ class CustomPortDialogTest {
         composeExtension.use {
             // Arrange
             val mockedClickHandler: () -> Unit = mockk(relaxed = true)
-            setContentWithTheme {
-                testWireguardCustomPortDialog(
-                    portInput = VALID_CUSTOM_PORT,
-                    isValidInput = true,
-                    showResetToDefault = true,
-                    onResetPort = mockedClickHandler,
-                )
-            }
+            initDialog(
+                portInput = VALID_CUSTOM_PORT,
+                isValidInput = true,
+                showResetToDefault = true,
+                onResetPort = mockedClickHandler,
+            )
 
             // Act
             onNodeWithText("Remove custom port").performClick()
@@ -163,7 +164,7 @@ class CustomPortDialogTest {
         composeExtension.use {
             // Arrange
             val mockedClickHandler: () -> Unit = mockk(relaxed = true)
-            setContentWithTheme { testWireguardCustomPortDialog(onDismiss = mockedClickHandler) }
+            initDialog(onDismiss = mockedClickHandler)
 
             // Assert
             onNodeWithText("Cancel").performClick()

diff --git a/...st/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialogTest.kt b/...st/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialogTest.kt
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import de.mannodermaus.junit5.compose.ComposeContext
 import io.mockk.MockKAnnotations
 import io.mockk.mockk
 import io.mockk.verify
@@ -25,16 +26,23 @@ class DeleteCustomListConfirmationDialogTest {
         MockKAnnotations.init(this)
     }
 
+    private fun ComposeContext.initDialog(
+        state: DeleteCustomListUiState =
+            DeleteCustomListUiState(CustomListName.fromString("My Custom List"), null),
+        onDelete: () -> Unit = {},
+        onBack: () -> Unit = {},
+    ) {
+        setContentWithTheme {
+            DeleteCustomListConfirmationDialog(state = state, onDelete = onDelete, onBack = onBack)
+        }
+    }
+
     @Test
     fun givenNameShouldShowDeleteNameTitle() =
         composeExtension.use {
             // Arrange
             val name = CustomListName.fromString("List should be deleted")
-            setContentWithTheme {
-                DeleteCustomListConfirmationDialog(
-                    state = DeleteCustomListUiState(name = name, deleteError = null)
-                )
-            }
+            initDialog(state = DeleteCustomListUiState(name = name, deleteError = null))
 
             // Assert
             onNodeWithText(DELETE_TITLE.format(name)).assertExists()
@@ -46,12 +54,10 @@ class DeleteCustomListConfirmationDialogTest {
             // Arrange
             val name = CustomListName.fromString("List should be deleted")
             val mockedOnDelete: () -> Unit = mockk(relaxed = true)
-            setContentWithTheme {
-                DeleteCustomListConfirmationDialog(
-                    state = DeleteCustomListUiState(name = name, deleteError = null),
-                    onDelete = mockedOnDelete,
-                )
-            }
+            initDialog(
+                state = DeleteCustomListUiState(name = name, deleteError = null),
+                onDelete = mockedOnDelete,
+            )
 
             // Act
             onNodeWithText(DELETE_BUTTON_TEXT).performClick()
@@ -66,12 +72,10 @@ class DeleteCustomListConfirmationDialogTest {
             // Arrange
             val name = CustomListName.fromString("List should be deleted")
             val mockedOnBack: () -> Unit = mockk(relaxed = true)
-            setContentWithTheme {
-                DeleteCustomListConfirmationDialog(
-                    state = DeleteCustomListUiState(name = name, deleteError = null),
-                    onBack = mockedOnBack,
-                )
-            }
+            initDialog(
+                state = DeleteCustomListUiState(name = name, deleteError = null),
+                onBack = mockedOnBack,
+            )
 
             // Act
             onNodeWithText(CANCEL_BUTTON_TEXT).performClick()