From f545b3120b7c5ae8d41a5443cf8ccc7f4066c738 Mon Sep 17 00:00:00 2001 From: takahirom Date: Sat, 11 Oct 2025 14:04:52 +0900 Subject: [PATCH 1/2] Rename startClicked to onStartClicked --- .../developers/androidify/creation/CreationScreen.kt | 2 +- .../androidify/creation/CreationViewModel.kt | 2 +- .../androidify/creation/CreationViewModelTest.kt | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt index 20bcb055..85ff16e3 100644 --- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt @@ -89,7 +89,7 @@ fun CreationScreen( onUndoPressed = creationViewModel::onUndoPressed, onPromptGenerationPressed = creationViewModel::onPromptGenerationClicked, onBotColorSelected = creationViewModel::onBotColorChanged, - onStartClicked = creationViewModel::startClicked, + onStartClicked = creationViewModel::onStartClicked, onDropCallback = creationViewModel::onImageSelected, ) } diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt index 22532bb2..537ad96a 100644 --- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt @@ -132,7 +132,7 @@ class CreationViewModel @AssistedInject constructor( } } - fun startClicked() { + fun onStartClicked() { imageGenerationJob?.cancel() imageGenerationJob = viewModelScope.launch { if (internetConnectivityManager.isInternetAvailable()) { diff --git a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt index 81c197b7..72a953e5 100644 --- a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt +++ b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt @@ -116,7 +116,7 @@ class CreationViewModelTest { } @Test - fun onSelectedPromptOptionChanged_updatesUiState() = runTest { + fun selectedPromptOptionChanged_updatesUiState() = runTest { viewModel.onSelectedPromptOptionChanged(PromptType.TEXT) assertEquals(PromptType.TEXT, viewModel.uiState.value.selectedPromptOption) @@ -140,7 +140,7 @@ class CreationViewModelTest { viewModel.onImageSelected(Uri.parse("content://test/image.jpg")) viewModel.onSelectedPromptOptionChanged(PromptType.PHOTO) - viewModel.startClicked() + viewModel.onStartClicked() assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState) assertNotNull(viewModel.uiState.value.resultBitmapUri) } @@ -156,7 +156,7 @@ class CreationViewModelTest { } viewModel.onSelectedPromptOptionChanged(PromptType.PHOTO) - viewModel.startClicked() + viewModel.onStartClicked() assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState) assertNotNull( "Choose an image or use a prompt instead.", @@ -182,7 +182,7 @@ class CreationViewModelTest { imageGenerationRepository.exceptionToThrow = InsufficientInformationException() viewModel.onSelectedPromptOptionChanged(PromptType.TEXT) - viewModel.startClicked() + viewModel.onStartClicked() assertEquals(ScreenState.EDIT, screenStateValues[1]) assertEquals( @@ -204,7 +204,7 @@ class CreationViewModelTest { viewModel.uiState.value.descriptionText.edit { "testing input description" } - viewModel.startClicked() + viewModel.onStartClicked() assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState) assertNotNull(viewModel.uiState.value.resultBitmapUri) } @@ -218,7 +218,7 @@ class CreationViewModelTest { } } internetConnectivityManager.internetAvailable = false - viewModel.startClicked() + viewModel.onStartClicked() advanceUntilIdle() assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState) assertEquals( From 27304194126c22e3db4d202c47baa51f379dbdb1 Mon Sep 17 00:00:00 2001 From: takahirom Date: Sat, 11 Oct 2025 14:12:00 +0900 Subject: [PATCH 2/2] Rename tests --- .../androidify/creation/CreationViewModelTest.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt index 72a953e5..d9285dd6 100644 --- a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt +++ b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt @@ -116,7 +116,7 @@ class CreationViewModelTest { } @Test - fun selectedPromptOptionChanged_updatesUiState() = runTest { + fun onSelectedPromptOptionChanged_updatesUiState() = runTest { viewModel.onSelectedPromptOptionChanged(PromptType.TEXT) assertEquals(PromptType.TEXT, viewModel.uiState.value.selectedPromptOption) @@ -130,7 +130,7 @@ class CreationViewModelTest { } @Test - fun startClicked_GenerateBotFromPhoto() = runTest { + fun onStartClicked_GenerateBotFromPhoto() = runTest { val screenStateValues = mutableListOf() backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect { @@ -146,7 +146,7 @@ class CreationViewModelTest { } @Test - fun startClicked_GenerateBotFromPhoto_NoPhotoSelected() = runTest { + fun onStartClicked_GenerateBotFromPhoto_NoPhotoSelected() = runTest { val values = mutableListOf() backgroundScope.launch(UnconfinedTestDispatcher()) { @@ -165,7 +165,7 @@ class CreationViewModelTest { } @Test - fun startClicked_GenerateBotFromPrompt_TextEmpty() = runTest { + fun onStartClicked_GenerateBotFromPrompt_TextEmpty() = runTest { val values = mutableListOf() backgroundScope.launch(UnconfinedTestDispatcher()) { @@ -193,7 +193,7 @@ class CreationViewModelTest { } @Test - fun startClicked_GenerateBotFromPrompt() = runTest { + fun onStartClicked_GenerateBotFromPrompt() = runTest { val screenStateValues = mutableListOf() backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect { @@ -210,7 +210,7 @@ class CreationViewModelTest { } @Test - fun startClicked_NoInternet_DisplaysError() = runTest { + fun onStartClicked_NoInternet_DisplaysError() = runTest { val values = mutableListOf() backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.snackbarHostState.collect {