Skip to content

Commit 8883c02

Browse files
committed
Fix preferences file override and update test property
Corrects the logic for selecting the preferences file in PreferencesProvider to use the override if present. Updates the test to set the correct system property for the settings folder.
1 parent 243789b commit 8883c02

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

app/src/processing/app/Preferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun PreferencesProvider(content: @Composable () -> Unit) {
8080
val preferencesDebounceOverride: Long? = System.getProperty("processing.app.preferences.debounce")?.toLongOrNull()
8181

8282
val settingsFolder = Settings.getFolder()
83-
val preferencesFile = settingsFolder.resolve(PREFERENCES_FILE_NAME)
83+
val preferencesFile = preferencesFileOverride ?: settingsFolder.resolve(PREFERENCES_FILE_NAME)
8484

8585
if (!preferencesFile.exists()) {
8686
preferencesFile.mkdirs()

app/test/processing/app/LocaleKtTest.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ import androidx.compose.material.Button
44
import androidx.compose.material.Text
55
import androidx.compose.ui.Modifier
66
import androidx.compose.ui.platform.testTag
7-
import androidx.compose.ui.test.ExperimentalTestApi
8-
import androidx.compose.ui.test.assertTextEquals
9-
import androidx.compose.ui.test.onNodeWithTag
10-
import androidx.compose.ui.test.performClick
11-
import androidx.compose.ui.test.runComposeUiTest
7+
import androidx.compose.ui.test.*
128
import processing.app.ui.theme.LocalLocale
139
import processing.app.ui.theme.LocaleProvider
1410
import kotlin.io.path.createTempDirectory
@@ -20,7 +16,7 @@ class LocaleKtTest {
2016
fun testLocale() = runComposeUiTest {
2117
val tempPreferencesDir = createTempDirectory("preferences")
2218

23-
System.setProperty("processing.app.preferences.folder", tempPreferencesDir.toFile().absolutePath)
19+
System.setProperty("processing.settings.folder", tempPreferencesDir.toFile().absolutePath)
2420

2521
setContent {
2622
LocaleProvider {

0 commit comments

Comments
 (0)