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

Minor. Remove redundant getters

Browse Source
This commit is contained in:
Mikhael Bogdanov
2020-03-05 13:36:42 +01:00
committed by Mikhail Bogdanov
parent 507b00ee77
commit 34547b4e27
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+2 -2
View File
@@ -198,7 +198,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
val isCommonModule = modules[module]!!.platform.isCommon() val isCommonModule = modules[module]!!.platform.isCommon()
val implementingModules = val implementingModules =
if (!isCommonModule) emptyList() if (!isCommonModule) emptyList()
else modules.entries.filter { (testModule) -> module in testModule?.getDependencies().orEmpty() } else modules.entries.filter { (testModule) -> module in testModule?.dependencies.orEmpty() }
val implementingModulesBindings = implementingModules.mapNotNull { (testModule, moduleDescriptor) -> val implementingModulesBindings = implementingModules.mapNotNull { (testModule, moduleDescriptor) ->
val platform = moduleDescriptor.platform val platform = moduleDescriptor.platform
if (platform != null && !platform.isCommon()) platform to moduleBindings[testModule]!! if (platform != null && !platform.isCommon()) platform to moduleBindings[testModule]!!
@@ -655,7 +655,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
val module = modules[testModule]!! val module = modules[testModule]!!
val dependencies = ArrayList<ModuleDescriptorImpl>() val dependencies = ArrayList<ModuleDescriptorImpl>()
dependencies.add(module) dependencies.add(module)
for (dependency in testModule.getDependencies()) { for (dependency in testModule.dependencies) {
dependencies.add(modules[dependency]!!) dependencies.add(modules[dependency]!!)
} }
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
+1 -1
View File
@@ -140,7 +140,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
val module = modules[testModule]!! val module = modules[testModule]!!
val dependencies = ArrayList<ModuleInfo>() val dependencies = ArrayList<ModuleInfo>()
dependencies.add(module) dependencies.add(module)
for (dependency in testModule.getDependencies()) { for (dependency in testModule.dependencies) {
dependencies.add(modules[dependency]!!) dependencies.add(modules[dependency]!!)
} }
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt
+2 -6
View File
@@ -94,12 +94,8 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
@JvmField val friendsSymbols: List<String> @JvmField val friendsSymbols: List<String>
) : Comparable<TestModule> { ) : Comparable<TestModule> {
private val dependencies = ArrayList<TestModule>() val dependencies: MutableList<TestModule> = arrayListOf()
private val friends = ArrayList<TestModule>() val friends: MutableList<TestModule> = arrayListOf()
fun getDependencies(): MutableList<TestModule> = dependencies
fun getFriends(): MutableList<TestModule> = friends
override fun compareTo(other: TestModule): Int = name.compareTo(other.name) override fun compareTo(other: TestModule): Int = name.compareTo(other.name)