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

Skip directories with lowercase "testdata" in FIR total Kotlin tests.

Browse Source 
"idea/idea-frontend-fir/idea-fir-low-level-api/testdata" is the
affected directory.
This commit is contained in:
Mark Punzalan
2021-02-17 06:52:49 +00:00
committed by Ilya Kirillov
parent 1c94372b6c
commit aad86c3892
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt
+1 -1
View File
@@ -80,7 +80,7 @@ class TotalKotlinTest : AbstractRawFirBuilderTestCase() {
println("BASE PATH: $path") println("BASE PATH: $path")
for (file in root.walkTopDown()) { for (file in root.walkTopDown()) {
if (file.isDirectory) continue if (file.isDirectory) continue
if (file.path.contains("testData") || file.path.contains("resources")) continue if (file.path.toLowerCase().contains("testdata") || file.path.contains("resources")) continue
if (file.extension != "kt") continue if (file.extension != "kt") continue
val text = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim() val text = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim()
compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt
+10 -10
View File
@@ -52,8 +52,8 @@ class RawFirBuilderTotalKotlinTestCase : AbstractRawFirBuilderTestCase() {
println("BASE PATH: $testDataPath") println("BASE PATH: $testDataPath")
for (file in root.walkTopDown()) { for (file in root.walkTopDown()) {
if (file.isDirectory) continue if (file.isDirectory) continue
val path = file.path val path = file.path.toLowerCase()
if ("testData" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue if ("testdata" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue
if (file.extension != "kt") continue if (file.extension != "kt") continue
try { try {
val ktFile = createKtFile(file.toRelativeString(root)) val ktFile = createKtFile(file.toRelativeString(root))
@@ -157,11 +157,11 @@ class RawFirBuilderTotalKotlinTestCase : AbstractRawFirBuilderTestCase() {
println("KT DECLARATIONS: $ktDeclarations") println("KT DECLARATIONS: $ktDeclarations")
println("KT REFERENCES: $ktReferences") println("KT REFERENCES: $ktReferences")
if (!stubMode) { if (!stubMode) {
assertEquals(0, expressionStubs) assertEquals("# of expression stubs", 0, expressionStubs)
} }
assertEquals(0, errorExpressions) assertEquals("# of error expressions", 0, errorExpressions)
assertEquals(0, errorDeclarations) assertEquals("# of error declarations", 0, errorDeclarations)
assertEquals(0, errorReferences) assertEquals("# of error references", 0, errorReferences)
} }
fun testTotalKotlinWithExpressionTrees() { fun testTotalKotlinWithExpressionTrees() {
@@ -176,8 +176,8 @@ class RawFirBuilderTotalKotlinTestCase : AbstractRawFirBuilderTestCase() {
val root = File(testDataPath) val root = File(testDataPath)
for (file in root.walkTopDown()) { for (file in root.walkTopDown()) {
if (file.isDirectory) continue if (file.isDirectory) continue
val path = file.path val path = file.path.toLowerCase()
if ("testData" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue if ("testdata" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue
if (file.extension != "kt") continue if (file.extension != "kt") continue
val ktFile = createKtFile(file.toRelativeString(root)) val ktFile = createKtFile(file.toRelativeString(root))
val firFile = ktFile.toFirFile() val firFile = ktFile.toFirFile()
@@ -203,8 +203,8 @@ class RawFirBuilderTotalKotlinTestCase : AbstractRawFirBuilderTestCase() {
var counter = 0 var counter = 0
for (file in root.walkTopDown()) { for (file in root.walkTopDown()) {
if (file.isDirectory) continue if (file.isDirectory) continue
val path = file.path val path = file.path.toLowerCase()
if ("testData" in path || "testdata" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue if ("testdata" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue
if (file.extension != "kt") continue if (file.extension != "kt") continue
val ktFile = createKtFile(file.toRelativeString(root)) val ktFile = createKtFile(file.toRelativeString(root))
val firFile: FirFile = ktFile.toFirFile() val firFile: FirFile = ktFile.toFirFile()