mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-11-19 01:52:29 +01:00
Keep incomplete kept groups in the wizard's course
Written-by: Gemini 4 Hydrogen (Antigravity) Written-by: Claude Fable 5.2
This commit is contained in:
2 files changed
+63
-4
No files matched your search
@@ -148,7 +148,7 @@ class SetupWizardState(prefs: ChatPreferences) {
|
|||||||
val keep = loginSource == WizardSource.KEEP
|
val keep = loginSource == WizardSource.KEEP
|
||||||
callsign = if (keep) storedCallsign else ""
|
callsign = if (keep) storedCallsign else ""
|
||||||
password = if (keep) storedPassword else ""
|
password = if (keep) storedPassword else ""
|
||||||
loginShown = !keep
|
loginShown = !keep || !loginComplete
|
||||||
appliedLoginSource = loginSource
|
appliedLoginSource = loginSource
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,7 +161,7 @@ class SetupWizardState(prefs: ChatPreferences) {
|
|||||||
secondCategory = if (keep) storedSecondCategory else null
|
secondCategory = if (keep) storedSecondCategory else null
|
||||||
// A kept category is the operator's; the suggestion must not replace it.
|
// A kept category is the operator's; the suggestion must not replace it.
|
||||||
categoryChosenByOperator = keep
|
categoryChosenByOperator = keep
|
||||||
stationShown = !keep
|
stationShown = !keep || !stationComplete
|
||||||
appliedStationSource = stationSource
|
appliedStationSource = stationSource
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -210,8 +210,8 @@ class SetupWizardState(prefs: ChatPreferences) {
|
|||||||
get() = isPlausibleCallsign(callsign) && password.isNotEmpty()
|
get() = isPlausibleCallsign(callsign) && password.isNotEmpty()
|
||||||
|
|
||||||
private val stationComplete: Boolean
|
private val stationComplete: Boolean
|
||||||
get() = isLocator(locator) && bands.isNotEmpty() && category != null &&
|
get() = isLocator(locator) && bands.isNotEmpty() && category in CATEGORY_NUMBERS &&
|
||||||
(!secondChat || (secondCategory != null && secondCategory != category))
|
(!secondChat || secondCategory in secondCategoryOptions)
|
||||||
|
|
||||||
/** Whether everything the profile needs to log in is there. */
|
/** Whether everything the profile needs to log in is there. */
|
||||||
val mandatoryComplete: Boolean
|
val mandatoryComplete: Boolean
|
||||||
|
|||||||
@@ -292,4 +292,63 @@ class SetupWizardStateTest {
|
|||||||
assertFalse(kept.turnsOffSecondChat)
|
assertFalse(kept.turnsOffSecondChat)
|
||||||
assertFalse(kept.leavesIntegrationsUntouched)
|
assertFalse(kept.leavesIntegrationsUntouched)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun keepingAStationWithMissingLocatorKeepsTheSitePageInTheCourse() {
|
||||||
|
val state = SetupWizardState(duplicatedProfile().apply { setStn_loginLocatorMainCat("") })
|
||||||
|
state.chooseStationSource(WizardSource.KEEP)
|
||||||
|
state.next()
|
||||||
|
|
||||||
|
assertTrue(state.pages.contains(WizardPage.SITE))
|
||||||
|
state.name = "Philipp"
|
||||||
|
state.next()
|
||||||
|
state.callsign = "DL0TEST"
|
||||||
|
state.password = "secret"
|
||||||
|
state.next()
|
||||||
|
|
||||||
|
assertEquals(WizardPage.SITE, state.page)
|
||||||
|
assertEquals(setOf(WizardBand.B144, WizardBand.B432), state.bands)
|
||||||
|
assertEquals(2, state.category)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun keepingALoginWithMissingPasswordKeepsTheLoginPageInTheCourse() {
|
||||||
|
val state = SetupWizardState(configuredProfile().apply { setStn_loginPassword("") })
|
||||||
|
state.chooseLoginSource(WizardSource.KEEP)
|
||||||
|
state.chooseStationSource(WizardSource.KEEP)
|
||||||
|
state.next()
|
||||||
|
|
||||||
|
assertTrue(state.pages.contains(WizardPage.LOGIN))
|
||||||
|
assertEquals("DL0TEST", state.callsign)
|
||||||
|
assertEquals("", state.password)
|
||||||
|
assertFalse(state.mandatoryComplete)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun keepingAnUnknownCategoryIsIncompleteAndKeepsTheSitePage() {
|
||||||
|
val state = SetupWizardState(configuredProfile().apply { setLoginChatCategoryMain(ChatCategory(13)) })
|
||||||
|
state.chooseLoginSource(WizardSource.KEEP)
|
||||||
|
state.chooseStationSource(WizardSource.KEEP)
|
||||||
|
state.next()
|
||||||
|
|
||||||
|
assertFalse(state.mandatoryComplete)
|
||||||
|
assertTrue(state.pages.contains(WizardPage.SITE))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun keepingValidCategoriesOutsideTheBandSuggestionsCompletesAndSkipsSite() {
|
||||||
|
val state = SetupWizardState(
|
||||||
|
configuredProfile().apply {
|
||||||
|
setLoginChatCategoryMain(ChatCategory(7))
|
||||||
|
setLoginToSecondChatEnabled(true)
|
||||||
|
setLoginChatCategorySecond(ChatCategory(9))
|
||||||
|
},
|
||||||
|
)
|
||||||
|
state.chooseLoginSource(WizardSource.KEEP)
|
||||||
|
state.chooseStationSource(WizardSource.KEEP)
|
||||||
|
state.next()
|
||||||
|
|
||||||
|
assertTrue(state.mandatoryComplete)
|
||||||
|
assertFalse(state.pages.contains(WizardPage.SITE))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user