MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix settingsSync and smoke tests

Browse Source 
Signed-off-by: Sergey Pak <sergey.pak@jetbrains.com>

(cherry picked from commit bbfaf6d10bd31b2b7f68d5178b0d2ede5cbdb324)
Signed-off-by: Sergey Pak <sergey.pak@jetbrains.com>

GitOrigin-RevId: 7777fef4cad239d7bf62799511d5708d02078834
This commit is contained in:
Sergey Pak
2025-01-17 15:51:17 +01:00
committed by intellij-monorepo-bot
parent 571fdbca04
commit c1d089565c
10 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -918,8 +918,8 @@
<module fileurl="file://$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" filepath="$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" filepath="$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" filepath="$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/tests/intellij.sh.copyright.tests.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/tests/intellij.sh.copyright.tests.iml" />

2
platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/RemoteCommunicatorHolder.kt
View File

@@ -74,7 +74,7 @@ object RemoteCommunicatorHolder : SettingsSyncEventListener {
}
fun getDefaultProvider(): SettingsSyncCommunicatorProvider? {
return getProvider(DEFAULT_PROVIDER_CODE)!!
return getProvider(DEFAULT_PROVIDER_CODE)
}
fun getProvider(providerCode: String): SettingsSyncCommunicatorProvider? {

4
platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/SettingsSyncCommunicatorProvider.kt
View File

@@ -30,7 +30,7 @@ interface SettingsSyncCommunicatorProvider {
data class SettingsSyncUserData(
val id: String,
val providerCode: String,
val name: String? = null,
val email: String? = null,
val name: String?,
val email: String?,
val printableName: String? = null
)

2
platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncConfigurable.kt
View File

@@ -480,7 +480,7 @@ internal class SettingsSyncConfigurable(private val coroutineScope: CoroutineSco
) {
companion object{
val addAccount = UserProviderHolder(
"<ADDACCOUNT>", SettingsSyncUserData("<ADDACCOUNT>", ""), "",
"<ADDACCOUNT>", SettingsSyncUserData("<ADDACCOUNT>", "", null, null), "",
"", "")
}

2
platform/settings-sync-core/tests/com/intellij/settingsSync/core/GitSettingsLogTest.kt
View File

@@ -463,7 +463,7 @@ internal class GitSettingsLogTest {
val jbaEmail = "some-jba-email@jba-mail.com"
val jbaName = "JBA Name"
userData = SettingsSyncUserData(jbaName, jbaEmail)
userData = SettingsSyncUserData("mockId", MOCK_CODE, jbaName, jbaEmail)
checkUsernameEmail(jbaName, jbaEmail)
}

8
platform/settings-sync-core/tests/com/intellij/settingsSync/core/MockRemoteCommunicator.kt
View File

@@ -18,6 +18,8 @@ import java.util.concurrent.atomic.AtomicInteger
import javax.swing.Icon
import kotlin.isInitialized
internal val MOCK_CODE = "MOCK"
internal class MockRemoteCommunicator(override val userId: String) : AbstractServerCommunicator() {
private val filesAndVersions = mutableMapOf<String, Version>()
private val versionIdStorage = mutableMapOf<String, String>()
@@ -147,10 +149,10 @@ internal class MockRemoteCommunicator(override val userId: String) : AbstractSer
internal class MockCommunicatorProvider (
private val remoteCommunicator: SettingsSyncRemoteCommunicator,
override val authService: SettingsSyncAuthService = MockAuthService(SettingsSyncUserData("", "")),
override val authService: SettingsSyncAuthService = MockAuthService(SettingsSyncUserData("mockId", MOCK_CODE, "", "")),
): SettingsSyncCommunicatorProvider {
override val providerCode: String
get() = "MOCK"
get() = MOCK_CODE
override fun createCommunicator(userId: String): SettingsSyncRemoteCommunicator? = remoteCommunicator
}
@@ -159,7 +161,7 @@ internal class MockAuthService (
private val userData: SettingsSyncUserData
): SettingsSyncAuthService {
override val providerCode: String
get() = "MOCK"
get() = MOCK_CODE
override val providerName: String
get() = TODO("Not yet implemented")
override val icon: Icon?

2
platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncFlowTest.kt
View File

@@ -73,7 +73,7 @@ internal class SettingsSyncFlowTest : SettingsSyncTestBase() {
// emulate first session with initialization
val fileName = "options/laf.xml"
val file = configDir.resolve(fileName).write("LaF Initial")
val log = GitSettingsLog(settingsSyncStorage, configDir, disposable, { SettingsSyncUserData("empty", "dummy") },
val log = GitSettingsLog(settingsSyncStorage, configDir, disposable, { SettingsSyncUserData("mockId", MOCK_CODE, "empty", "dummy") },
initialSnapshotProvider = { MockSettingsSyncIdeMediator.getAllFilesFromSettingsAsSnapshot(configDir) })
log.initialize()
log.logExistingSettings()

2
platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTestBase.kt
View File

@@ -167,7 +167,7 @@ internal abstract class SettingsSyncRealIdeTestBase : SettingsSyncTestBase() {
tempDir.resolve("storage").toPath(),
tempDir.resolve("config").toPath(),
parentDisposable,
{ SettingsSyncUserData("empty", "dummy") },
{ SettingsSyncUserData("mockId", MOCK_CODE,"empty", "dummy") },
initialSnapshotProvider = {
SettingsSnapshot(
SettingsSnapshot.MetaInfo(Instant.now(), null, true),

7
platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncTestBase.kt
View File

@@ -65,9 +65,12 @@ internal abstract class SettingsSyncTestBase {
providerEP.unregisterExtension(it)
}
}
providerEP.registerExtension(MockCommunicatorProvider(
val mockCommunicatorProvider = MockCommunicatorProvider(
remoteCommunicator
), disposable)
)
providerEP.registerExtension(mockCommunicatorProvider, disposable)
SettingsSyncLocalSettings.getInstance().providerCode = mockCommunicatorProvider.providerCode
SettingsSyncLocalSettings.getInstance().userId = "dummyUserId"
val serverState = remoteCommunicator.checkServerState()
if (serverState != ServerState.FileNotExists) {

2
plugins/settings-sync/jba/test/com/intellij/settingsSync/SettingsSyncTestAuthService.kt
View File

@@ -14,7 +14,7 @@ internal class SettingsSyncTestAuthService : SettingsSyncAuthService {
val loginName = "testLogin"
val email = "testEmail@example.com"
val presentableName = "presentableName"
return SettingsSyncUserData(loginName, email)
return SettingsSyncUserData(id, "MOCK", loginName, email, presentableName)
}
override fun getAvailableUserAccounts(): List<SettingsSyncUserData> {