MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

app store test: avoid VFS and EDT usage

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-08-21 12:37:17 +02:00
parent 3af07d01a2
commit 9b2ed97c09
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt
+10 -10
View File
@@ -16,12 +16,9 @@
package com.intellij.configurationStore
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.components.*
import com.intellij.openapi.components.impl.stores.StreamProvider
import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.testFramework.*
import com.intellij.util.SmartList
import com.intellij.util.xmlb.XmlSerializerUtil
@@ -34,6 +31,7 @@ import org.junit.Rule
import org.junit.Test
import java.io.ByteArrayInputStream
import java.io.InputStream
import java.nio.file.Path
import java.nio.file.Paths
import kotlin.properties.Delegates
@@ -48,12 +46,12 @@ class ApplicationStoreTest {
private val edtRule = EdtRule()
public Rule fun _edtRule(): EdtRule = edtRule
private var testAppConfig: VirtualFile by Delegates.notNull()
private var testAppConfig: Path by Delegates.notNull()
private var componentStore: MyComponentStore by Delegates.notNull()
public Before fun setUp() {
testAppConfig = tempDirManager.newVirtualDirectory()
componentStore = MyComponentStore(FileUtilRt.toSystemIndependentName(testAppConfig.getPath()))
testAppConfig = tempDirManager.newPath(refreshVfs = false)
componentStore = MyComponentStore(testAppConfig.systemIndependentPath)
}
@Test fun `stream provider save if several storages configured`() {
@@ -85,11 +83,11 @@ class ApplicationStoreTest {
assertThat(Paths.get(componentStore.storageManager.expandMacros(fileSpec))).exists()
}
@Test @RunsInEdt fun `remove deprecated storage on write`() {
@Test fun `remove deprecated storage on write`() {
doRemoveDeprecatedStorageOnWrite(SeveralStoragesConfigured())
}
@Test @RunsInEdt fun `remove deprecated storage on write 2`() {
@Test fun `remove deprecated storage on write 2`() {
doRemoveDeprecatedStorageOnWrite(ActualStorageLast())
}
@@ -97,16 +95,18 @@ class ApplicationStoreTest {
val oldFile = writeConfig("other.xml", "<application><component name=\"HttpConfigurable\"><option name=\"foo\" value=\"old\" /></component></application>")
writeConfig("proxy.settings.xml", "<application><component name=\"HttpConfigurable\"><option name=\"foo\" value=\"new\" /></component></application>")
testAppConfig.refreshVfs()
componentStore.initComponent(component, false)
assertThat(component.foo).isEqualTo("new")
component.foo = "new2"
componentStore.save(SmartList())
runInEdtAndWait { componentStore.save(SmartList()) }
assertThat(oldFile.exists()).isFalse()
}
private fun writeConfig(fileName: String, Language("XML") data: String) = runWriteAction { testAppConfig.writeChild(fileName, data) }
private fun writeConfig(fileName: String, Language("XML") data: String) = testAppConfig.writeChild(fileName, data)
private class MyStreamProvider : StreamProvider {
public val data: MutableMap<RoamingType, MutableMap<String, String>> = THashMap()
platform/testFramework/src/com/intellij/testFramework/TemporaryDirectory.kt
+21 -9
View File
@@ -51,19 +51,15 @@ public class TemporaryDirectory : ExternalResource() {
*/
public fun newDirectory(directoryName: String? = null): File = generatePath(directoryName).toFile()
public fun newPath(directoryName: String? = null): Path {
public fun newPath(directoryName: String? = null, refreshVfs: Boolean = true): Path {
val path = generatePath(directoryName)
LocalFileSystem.getInstance()?.let { fs ->
// If a temp directory is reused from some previous test run, there might be cached children in its VFS. Ensure they're removed.
val virtualFile = fs.findFileByPath(path.systemIndependentPath)
if (virtualFile != null) {
VfsUtil.markDirtyAndRefresh(false, true, true, virtualFile)
}
if (refreshVfs) {
path.refreshVfs()
}
return path
}
public fun generatePath(suffix: String?): Path {
private fun generatePath(suffix: String?): Path {
var fileName = sanitizedName!!
if (suffix != null) {
fileName += "_$suffix"
@@ -122,7 +118,23 @@ public val Path.parentSystemIndependentPath: String
public fun Path.readText(): String = Files.readAllBytes(this).toString(Charsets.UTF_8)
fun VirtualFile.writeChild(relativePath: String, data: String) = VfsTestUtil.createFile(this, relativePath, data)
public fun VirtualFile.writeChild(relativePath: String, data: String): VirtualFile = VfsTestUtil.createFile(this, relativePath, data)
public fun Path.writeChild(relativePath: String, data: String): Path {
val path = resolve(relativePath)
path.getParent().createDirectories()
return Files.write(path, data.toByteArray())
}
public fun Path.refreshVfs() {
LocalFileSystem.getInstance()?.let { fs ->
// If a temp directory is reused from some previous test run, there might be cached children in its VFS. Ensure they're removed.
val virtualFile = fs.findFileByPath(systemIndependentPath)
if (virtualFile != null) {
VfsUtil.markDirtyAndRefresh(false, true, true, virtualFile)
}
}
}
val VirtualFile.path: String
get() = getPath()