Skip to content

Commit b336e74

Browse files
committed
Update tests and run formatting
1 parent b2d19b2 commit b336e74

9 files changed

Lines changed: 39 additions & 13 deletions

File tree

core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ class FirebaseAppCheckInitializer : Initializer<FirebaseAppCheck> {
3636
if (BuildConfig.DEBUG) {
3737
Log.i("AndroidifyAppCheck", "Firebase debug")
3838
installAppCheckProviderFactory(
39-
DebugAppCheckProviderFactory.getInstance()
39+
DebugAppCheckProviderFactory.getInstance(),
4040
)
4141
} else {
4242
Log.i("AndroidifyAppCheck", "Play integrity")
4343
installAppCheckProviderFactory(
4444
PlayIntegrityAppCheckProviderFactory.getInstance(),
45-
)
45+
)
4646
}
4747
}
4848
}

core/testing/src/main/java/com/android/developers/testing/network/TestRemoteConfigDataSource.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class TestRemoteConfigDataSource(private val useGeminiNano: Boolean) : RemoteCon
2929
override fun imageModelName(): String {
3030
TODO("Not yet implemented")
3131
}
32-
32+
var backgroundVibeEnabled: Boolean = true
3333
override fun isBackgroundVibesFeatureEnabled(): Boolean {
34-
return true
34+
return backgroundVibeEnabled
3535
}
3636

3737
override fun promptTextVerify(): String {

feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,8 @@ private fun MainCreationPane(
493493
// Workaround for https://issuetracker.google.com/432431393
494494
val showTextPrompt by remember {
495495
derivedStateOf {
496-
pagerState.currentPage == PromptType.TEXT.ordinal
497-
&& pagerState.targetPage == pagerState.currentPage
496+
pagerState.currentPage == PromptType.TEXT.ordinal &&
497+
pagerState.targetPage == pagerState.currentPage
498498
}
499499
}
500500
if (showTextPrompt) {

feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class CreationViewModelTest {
7272
viewModel.uiState.value.screenState,
7373
)
7474
assertEquals(false, viewModel.uiState.value.promptGenerationInProgress)
75-
assertEquals( fakeUri, viewModel.uiState.value.imageUri)
75+
assertEquals(fakeUri, viewModel.uiState.value.imageUri)
7676
}
7777

7878
@Test
@@ -91,7 +91,7 @@ class CreationViewModelTest {
9191
viewModel.uiState.value.screenState,
9292
)
9393
assertEquals(false, viewModel.uiState.value.promptGenerationInProgress)
94-
assertEquals( null, viewModel.uiState.value.imageUri)
94+
assertEquals(null, viewModel.uiState.value.imageUri)
9595
}
9696

9797
@Test

feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import android.content.Context.DISPLAY_SERVICE
2222
import android.graphics.Bitmap
2323
import android.graphics.SurfaceTexture
2424
import android.hardware.display.DisplayManager
25-
import android.hardware.display.VirtualDisplay
2625
import android.view.Display
2726
import android.view.Surface
2827
import android.view.ViewGroup

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ class CustomizeExportViewModel @AssistedInject constructor(
9595
toolState = mapOf(
9696
CustomizeTool.Size to AspectRatioToolState(),
9797
CustomizeTool.Background to BackgroundToolState(
98-
options = backgrounds
98+
options = backgrounds,
9999
),
100-
)
100+
),
101101
)
102102
}
103103
loadInitialBitmap(resultImageUrl)

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ data class BackgroundToolState(
6060
BackgroundOption.None,
6161
BackgroundOption.Plain,
6262
BackgroundOption.Lightspeed,
63-
BackgroundOption.IO
63+
BackgroundOption.IO,
6464
),
6565
) : ToolState
6666

feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import android.net.Uri
2121
import androidx.test.core.app.ApplicationProvider
2222
import com.android.developers.testing.data.TestFileProvider
2323
import com.android.developers.testing.data.bitmapSample
24+
import com.android.developers.testing.network.TestRemoteConfigDataSource
2425
import com.android.developers.testing.repository.FakeImageGenerationRepository
2526
import com.android.developers.testing.util.FakeComposableBitmapRenderer
2627
import com.android.developers.testing.util.MainDispatcherRule
@@ -52,13 +53,16 @@ class CustomizeViewModelTest {
5253

5354
@Before
5455
fun setup() {
56+
val remoteConfigDataSource = TestRemoteConfigDataSource(true)
57+
remoteConfigDataSource.backgroundVibeEnabled = false
5558
viewModel = CustomizeExportViewModel(
5659
fakeUri,
5760
originalFakeUri,
5861
FakeImageGenerationRepository(),
5962
composableBitmapRenderer = FakeComposableBitmapRenderer(),
6063
application = ApplicationProvider.getApplicationContext(),
6164
localFileProvider = TestFileProvider(),
65+
remoteConfigDataSource = remoteConfigDataSource,
6266
)
6367
}
6468

@@ -82,13 +86,16 @@ class CustomizeViewModelTest {
8286

8387
@Test
8488
fun setArgumentsWithPrompt() = runTest {
89+
val remoteConfigDataSource = TestRemoteConfigDataSource(true)
90+
remoteConfigDataSource.backgroundVibeEnabled = false
8591
val viewModel = CustomizeExportViewModel(
8692
fakeUri,
8793
null,
8894
FakeImageGenerationRepository(),
8995
composableBitmapRenderer = FakeComposableBitmapRenderer(),
9096
application = ApplicationProvider.getApplicationContext(),
9197
localFileProvider = TestFileProvider(),
98+
remoteConfigDataSource = remoteConfigDataSource,
9299
)
93100
assertEquals(
94101
CustomizeExportState(
@@ -141,6 +148,7 @@ class CustomizeViewModelTest {
141148
composableBitmapRenderer = FakeComposableBitmapRenderer(),
142149
application = ApplicationProvider.getApplicationContext(),
143150
localFileProvider = TestFileProvider(),
151+
remoteConfigDataSource = TestRemoteConfigDataSource(false),
144152
)
145153
val values = mutableListOf<CustomizeExportState>()
146154
// Launch collector on the backgroundScope directly to use runTest's scheduler
@@ -190,4 +198,23 @@ class CustomizeViewModelTest {
190198
assertTrue { !values[values.lastIndex].showImageEditProgress }
191199
assertNull(values.last().exportImageCanvas.imageWithEdit)
192200
}
201+
202+
@Test
203+
fun remoteConfigDataSource_BackgroundVibesFeatureEnabled_ContainsVibeList() = runTest {
204+
val remoteConfigDataSource = TestRemoteConfigDataSource(true)
205+
remoteConfigDataSource.backgroundVibeEnabled = true
206+
val viewModel = CustomizeExportViewModel(
207+
fakeUri,
208+
null,
209+
FakeImageGenerationRepository(),
210+
composableBitmapRenderer = FakeComposableBitmapRenderer(),
211+
application = ApplicationProvider.getApplicationContext(),
212+
localFileProvider = TestFileProvider(),
213+
remoteConfigDataSource = remoteConfigDataSource,
214+
)
215+
val state = viewModel.state.value.toolState[CustomizeTool.Background] as BackgroundToolState
216+
217+
assertTrue(state.options.size > 5)
218+
assertTrue(state.options.any { it.aiBackground })
219+
}
193220
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ hiltAndroid = "2.56.2"
3434
hiltLifecycleViewmodel = "1.0.0-alpha03"
3535
hiltNavigationCompose = "1.2.0"
3636
junit = "4.13.2"
37-
junitVersion = "1.2.1"
37+
junitVersion = "1.3.0"
3838
kotlin = "2.2.0"
3939
ksp = "2.2.0-2.0.2"
4040
kotlinxCoroutines = "1.10.2"

0 commit comments

Comments
 (0)