From 2383379c31f07f219a62637bb90284c99d8d1e72 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 30 Dec 2016 12:36:37 +0100 Subject: [PATCH] fix test (icsManager) --- plugins/settings-repository/src/IcsConfigurable.kt | 5 +++++ plugins/settings-repository/src/readOnlySourcesEditor.kt | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/settings-repository/src/IcsConfigurable.kt b/plugins/settings-repository/src/IcsConfigurable.kt index e0f447234eb5..3507096c055b 100644 --- a/plugins/settings-repository/src/IcsConfigurable.kt +++ b/plugins/settings-repository/src/IcsConfigurable.kt @@ -16,9 +16,12 @@ package org.jetbrains.settingsRepository import com.intellij.openapi.Disposable +import com.intellij.openapi.application.ApplicationManager +import com.intellij.openapi.application.PathManager import com.intellij.openapi.options.ConfigurableBase import com.intellij.openapi.options.ConfigurableUi import com.intellij.ui.layout.* +import java.nio.file.Paths import javax.swing.JCheckBox internal class IcsConfigurable : ConfigurableBase("ics", icsMessage("ics.settings"), "reference.settings.ics") { @@ -28,6 +31,8 @@ internal class IcsConfigurable : ConfigurableBase, Disposable { + private val icsManager = if (ApplicationManager.getApplication().isUnitTestMode) IcsManager(Paths.get(PathManager.getConfigPath()).resolve("settingsRepository")) else org.jetbrains.settingsRepository.icsManager + private val editors = listOf(createRepositoryListEditor(), createReadOnlySourcesEditor()) private val autoSync = JCheckBox("Auto Sync") diff --git a/plugins/settings-repository/src/readOnlySourcesEditor.kt b/plugins/settings-repository/src/readOnlySourcesEditor.kt index 02fe228f2072..9da87397ef84 100644 --- a/plugins/settings-repository/src/readOnlySourcesEditor.kt +++ b/plugins/settings-repository/src/readOnlySourcesEditor.kt @@ -15,6 +15,7 @@ */ package org.jetbrains.settingsRepository +import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.catchAndLog import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory import com.intellij.openapi.options.ConfigurableUi @@ -84,7 +85,7 @@ internal fun createReadOnlySourcesEditor(): ConfigurableUi { } val editor = TableModelEditor(COLUMNS, itemEditor, "No sources configured") - editor.reset(icsManager.settings.readOnlySources) + editor.reset(if (ApplicationManager.getApplication().isUnitTestMode) emptyList() else icsManager.settings.readOnlySources) return object : ConfigurableUi { override fun isModified(settings: IcsSettings) = editor.isModified