fix test (icsManager)

This commit is contained in:
Vladimir Krivosheev
2016-12-30 12:38:04 +01:00
parent 7084f40683
commit 2383379c31
2 changed files with 7 additions and 1 deletions
@@ -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<IcsConfigurableUi, IcsSettings>("ics", icsMessage("ics.settings"), "reference.settings.ics") {
@@ -28,6 +31,8 @@ internal class IcsConfigurable : ConfigurableBase<IcsConfigurableUi, IcsSettings
}
internal class IcsConfigurableUi : ConfigurableUi<IcsSettings>, 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")
@@ -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<IcsSettings> {
}
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<IcsSettings> {
override fun isModified(settings: IcsSettings) = editor.isModified