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

Fix quick fix, refactoring and slice tests - ignore bunch files

Browse Source
This commit is contained in:
Nikolay Krasko
2018-04-11 15:20:51 +03:00
parent a3d01443b9
commit 5559a6edd3
7 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+9
View File
@@ -1194,4 +1194,13 @@ public class KotlinTestUtils {
public static String nameToCompare(@NotNull String name) {
return (SystemInfo.isFileSystemCaseSensitive ? name : name.toLowerCase()).replace('\\', '/');
}
public static boolean isMultiExtensionName(@NotNull String name) {
int firstDotIndex = name.indexOf('.');
if (firstDotIndex == -1) {
return false;
}
// Several extension if name contains another dot
return name.indexOf('.', firstDotIndex + 1) != -1;
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.181
+9
View File
@@ -1194,4 +1194,13 @@ public class KotlinTestUtils {
public static String nameToCompare(@NotNull String name) {
return (SystemInfo.isFileSystemCaseSensitive ? name : name.toLowerCase()).replace('\\', '/');
}
public static boolean isMultiExtensionName(@NotNull String name) {
int firstDotIndex = name.indexOf('.');
if (firstDotIndex == -1) {
return false;
}
// Several extension if name contains another dot
return name.indexOf('.', firstDotIndex + 1) != -1;
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+9
View File
@@ -1194,4 +1194,13 @@ public class KotlinTestUtils {
public static String nameToCompare(@NotNull String name) {
return (SystemInfo.isFileSystemCaseSensitive ? name : name.toLowerCase()).replace('\\', '/');
}
public static boolean isMultiExtensionName(@NotNull String name) {
int firstDotIndex = name.indexOf('.');
if (firstDotIndex == -1) {
return false;
}
// Several extension if name contains another dot
return name.indexOf('.', firstDotIndex + 1) != -1;
}
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
+6 -1
View File
@@ -36,6 +36,7 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiFile
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
import com.intellij.util.ArrayUtil
import com.intellij.util.PathUtil
import com.intellij.util.containers.ContainerUtil
import junit.framework.ComparisonFailure
import junit.framework.TestCase
@@ -200,7 +201,11 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest
val mainFileDir = mainFile.parentFile!!
val mainFileName = mainFile.name
val extraFiles = mainFileDir.listFiles { _, name -> name.startsWith(extraFileNamePrefix(mainFileName)) && name != mainFileName }!!
val extraFiles = mainFileDir.listFiles { _, name ->
name.startsWith(extraFileNamePrefix(mainFileName))
&& name != mainFileName
&& PathUtil.getFileExtension(name).let { it == "kt" || it == "java" || it == "groovy" }
}!!
val testFiles = ArrayList<String>()
testFiles.add(mainFile.name)
idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt
+1 -4
View File
@@ -34,9 +34,6 @@ import com.intellij.testFramework.LightProjectDescriptor
import com.intellij.testFramework.PlatformTestUtil
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.idea.jsonUtils.getNullableString
import org.jetbrains.kotlin.idea.jsonUtils.getString
import org.jetbrains.kotlin.idea.refactoring.move.MoveAction
import org.jetbrains.kotlin.idea.refactoring.move.runMoveRefactoring
import org.jetbrains.kotlin.idea.refactoring.rename.loadTestConfiguration
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
@@ -95,7 +92,7 @@ abstract class AbstractMultifileRefactoringTest : KotlinLightCodeInsightFixtureT
PsiDocumentManager.getInstance(project).commitAllDocuments()
FileDocumentManager.getInstance().saveAllDocuments()
PlatformTestUtil.assertDirectoriesEqual(afterVFile, beforeVFile)
PlatformTestUtil.assertDirectoriesEqual(afterVFile, beforeVFile, { file -> !KotlinTestUtils.isMultiExtensionName(file.name) })
}
}
idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt
+4 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.slicer.SliceAnalysisParams
import com.intellij.slicer.SliceNode
import com.intellij.slicer.SliceRootNode
import com.intellij.usages.TextChunk
import com.intellij.util.PathUtil
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.psiUtil.startOffset
@@ -112,7 +113,9 @@ abstract class AbstractSlicerTest : KotlinLightCodeInsightFixtureTestCase() {
val rootDir = mainFile.parentFile
val namePrefix = FileUtil.getNameWithoutExtension(mainFile)
val extraFiles = rootDir.listFiles { _, name -> name.startsWith("$namePrefix.") }
val extraFiles = rootDir.listFiles { _, name ->
name.startsWith("$namePrefix.") && PathUtil.getFileExtension(name).let { it == "kt" || it == "java" }
}
myFixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${rootDir.path}"
idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt.172
+4 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.util.CommonProcessors
import com.intellij.util.Processor
import gnu.trove.THashSet
import gnu.trove.TObjectHashingStrategy
import com.intellij.util.PathUtil
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.KtFile
@@ -113,7 +114,9 @@ abstract class AbstractSlicerTest : KotlinLightCodeInsightFixtureTestCase() {
val rootDir = mainFile.parentFile
val namePrefix = FileUtil.getNameWithoutExtension(mainFile)
val extraFiles = rootDir.listFiles { _, name -> name.startsWith("$namePrefix.") }
val extraFiles = rootDir.listFiles { _, name ->
name.startsWith("$namePrefix.") && PathUtil.getFileExtension(name).let { it == "kt" || it == "java" }
}
myFixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${rootDir.path}"