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

Refactor inline properties tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-08-22 22:03:02 +03:00
parent 44e8ae3571
commit 73b63bb343
29 changed files with 138 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java
+6 -18
View File
@@ -308,18 +308,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa
doTest(fileName);
}
@TestMetadata("inlineClassValProperty")
public void testInlineClassValProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/");
doTest(fileName);
}
@TestMetadata("inlineClassVarProperty")
public void testInlineClassVarProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/");
doTest(fileName);
}
@TestMetadata("inlineFunctionRemoved")
public void testInlineFunctionRemoved() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
@@ -356,15 +344,15 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa
doTest(fileName);
}
@TestMetadata("inlineTopLevelValProperty")
public void testInlineTopLevelValProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/");
@TestMetadata("inlinePropertyInClass")
public void testInlinePropertyInClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/");
doTest(fileName);
}
@TestMetadata("inlineTopLevelVarProperty")
public void testInlineTopLevelVarProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/");
@TestMetadata("inlinePropertyOnTopLevel")
public void testInlinePropertyOnTopLevel() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/");
doTest(fileName);
}
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java
+6 -18
View File
@@ -308,18 +308,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement
doTest(fileName);
}
@TestMetadata("inlineClassValProperty")
public void testInlineClassValProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/");
doTest(fileName);
}
@TestMetadata("inlineClassVarProperty")
public void testInlineClassVarProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/");
doTest(fileName);
}
@TestMetadata("inlineFunctionRemoved")
public void testInlineFunctionRemoved() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
@@ -356,15 +344,15 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement
doTest(fileName);
}
@TestMetadata("inlineTopLevelValProperty")
public void testInlineTopLevelValProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/");
@TestMetadata("inlinePropertyInClass")
public void testInlinePropertyInClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/");
doTest(fileName);
}
@TestMetadata("inlineTopLevelVarProperty")
public void testInlineTopLevelVarProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/");
@TestMetadata("inlinePropertyOnTopLevel")
public void testInlinePropertyOnTopLevel() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/");
doTest(fileName);
}
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+6 -18
View File
@@ -479,18 +479,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
doTest(fileName);
}
@TestMetadata("inlineClassValProperty")
public void testInlineClassValProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/");
doTest(fileName);
}
@TestMetadata("inlineClassVarProperty")
public void testInlineClassVarProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/");
doTest(fileName);
}
@TestMetadata("inlineFunctionRemoved")
public void testInlineFunctionRemoved() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
@@ -527,15 +515,15 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
doTest(fileName);
}
@TestMetadata("inlineTopLevelValProperty")
public void testInlineTopLevelValProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/");
@TestMetadata("inlinePropertyInClass")
public void testInlinePropertyInClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/");
doTest(fileName);
}
@TestMetadata("inlineTopLevelVarProperty")
public void testInlineTopLevelVarProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/");
@TestMetadata("inlinePropertyOnTopLevel")
public void testInlinePropertyOnTopLevel() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/");
doTest(fileName);
}
jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package usage
class Usage {
val x = inline.A().f
}
jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log
Vendored
-20
View File
@@ -1,20 +0,0 @@
================ Step #1 =================
Cleaning output files:
out/production/module/inline/A.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/Usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/usage/Usage.class
End of files
Compiling files:
src/Usage.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
package inline
class A {
inline val f: Int
get() = 0
}
jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new
Vendored
-6
View File
@@ -1,6 +0,0 @@
package inline
class A {
inline val f: Int
get() = 1
}
jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log
Vendored
-21
View File
@@ -1,21 +0,0 @@
================ Step #1 =================
Cleaning output files:
out/production/module/inline/A.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UsageKt.class
End of files
Compiling files:
src/usage.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package usage2
fun b() {
inline.A().f
}
jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log
Vendored
+43
View File
@@ -0,0 +1,43 @@
================ Step #1 =================
Cleaning output files:
out/production/module/inline/A.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/useSetter.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UseSetterKt.class
End of files
Compiling files:
src/useSetter.kt
End of files
Exit code: OK
------------------------------------------
================ Step #2 =================
Cleaning output files:
out/production/module/inline/A.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/useGetter.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage2/UseGetterKt.class
End of files
Compiling files:
src/useGetter.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
fun dummy() {}
jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt → jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt
Vendored
View File
jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new → jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1
Vendored
View File
jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2
Vendored
+11
View File
@@ -0,0 +1,11 @@
package inline
class A {
var z = 0
inline var f: Int
get() = z + 1
set(p: Int) {
z = p + 1
}
}
jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package usage2
fun useGetter() = inline.A().f
jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt → jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt
Vendored
View File
jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log
Vendored
+45
View File
@@ -0,0 +1,45 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/InlineKt.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/useSetter.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UseSetterKt.class
End of files
Compiling files:
src/useSetter.kt
End of files
Exit code: OK
------------------------------------------
================ Step #2 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/InlineKt.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/useGetter.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage2/UseGetterKt.class
End of files
Compiling files:
src/useGetter.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
fun dummy() {}
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt → jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt
Vendored
View File
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new → jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1
Vendored
View File
jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2
Vendored
+9
View File
@@ -0,0 +1,9 @@
package inline
var z = 0
inline var f: Int
get() = z + 1
set(p: Int) {
z = p + 1
}
jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package usage2
fun useGetter() = inline.f
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt → jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt
Vendored
View File
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log
Vendored
-22
View File
@@ -1,22 +0,0 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/InlineKt.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UsageKt.class
End of files
Compiling files:
src/usage.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
package inline
inline val f: Int
get() = 0
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new
Vendored
-4
View File
@@ -1,4 +0,0 @@
package inline
inline val f: Int
get() = 1
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package usage
val x = inline.f
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log
Vendored
-22
View File
@@ -1,22 +0,0 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/InlineKt.class
End of files
Compiling files:
src/inline.kt
End of files
Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UsageKt.class
End of files
Compiling files:
src/usage.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package usage2
fun b() {
inline.f
}