azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: drop redundant abstractions in IdeaModuleInfoTest

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-09-10 16:42:45 +04:00
parent 424c086ba3
commit 3e25e16599
1 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfoTest.kt
+15 -24
View File
@@ -21,9 +21,7 @@ import com.intellij.openapi.module.StdModuleTypes
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.openapi.roots.ModuleRootModificationUtil
import com.intellij.openapi.roots.DependencyScope import com.intellij.openapi.roots.DependencyScope
import com.intellij.testFramework.UsefulTestCase
import junit.framework.Assert import junit.framework.Assert
import com.intellij.openapi.roots.libraries.LibraryTable
import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable
import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.roots.libraries.Library
import com.intellij.openapi.command.WriteCommandAction import com.intellij.openapi.command.WriteCommandAction
@@ -156,31 +154,25 @@ class IdeaModuleInfoTest : ModuleTestCase() {
b.source.assertDependenciesEqual(b.source, a.source, lib.classes) b.source.assertDependenciesEqual(b.source, a.source, lib.classes)
} }
private fun Module.addDependency(
//NOTE: wrapper classes to reduce boilerplate in test cases other: Module,
private class ModuleDef(val ideaModule: Module) {
val source = ideaModule.toSourceInfo()
}
private inner class LibraryDef(val ideaLibrary: Library) {
val classes = LibraryInfo(getProject()!!, ideaLibrary)
}
private fun ModuleDef.addDependency(
other: ModuleDef,
dependencyScope: DependencyScope = DependencyScope.COMPILE, dependencyScope: DependencyScope = DependencyScope.COMPILE,
exported: Boolean = false exported: Boolean = false
) = ModuleRootModificationUtil.addDependency(this.ideaModule, other.ideaModule, dependencyScope, exported) ) = ModuleRootModificationUtil.addDependency(this, other, dependencyScope, exported)
private fun ModuleDef.addDependency( private val Module.source: ModuleProductionSourceInfo
lib: LibraryDef, get() = productionSourceInfo()
private val Library.classes: LibraryInfo
get() = LibraryInfo(getProject()!!, this)
private fun Module.addDependency(
lib: Library,
dependencyScope: DependencyScope = DependencyScope.COMPILE, dependencyScope: DependencyScope = DependencyScope.COMPILE,
exported: Boolean = false exported: Boolean = false
) = ModuleRootModificationUtil.addDependency(this.ideaModule, lib.ideaLibrary, dependencyScope, exported) ) = ModuleRootModificationUtil.addDependency(this, lib, dependencyScope, exported)
private fun module(name: String): ModuleDef { private fun module(name: String): Module {
val ideaModule = createModuleFromTestData(createTempDirectory()!!.getAbsolutePath(), name, StdModuleTypes.JAVA, false)!! return createModuleFromTestData(createTempDirectory()!!.getAbsolutePath(), name, StdModuleTypes.JAVA, false)!!
return ModuleDef(ideaModule)
} }
private fun modules(name1: String = "a", name2: String = "b", name3: String = "c") = Triple(module(name1), module(name2), module(name3)) private fun modules(name1: String = "a", name2: String = "b", name3: String = "c") = Triple(module(name1), module(name2), module(name3))
@@ -189,11 +181,10 @@ class IdeaModuleInfoTest : ModuleTestCase() {
Assert.assertEquals(dependencies.toList(), this.dependencies()) Assert.assertEquals(dependencies.toList(), this.dependencies())
} }
private fun projectLibrary(name: String = "lib"): LibraryDef { private fun projectLibrary(name: String = "lib"): Library {
val libraryTable = ProjectLibraryTable.getInstance(myProject)!! val libraryTable = ProjectLibraryTable.getInstance(myProject)!!
val library = WriteCommandAction.runWriteCommandAction<Library>(myProject) { return WriteCommandAction.runWriteCommandAction<Library>(myProject) {
libraryTable.createLibrary(name) libraryTable.createLibrary(name)
}!! }!!
return LibraryDef(library)
} }
} }