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

Added multi-module test on inline functions

Browse Source
This commit is contained in:
Igor Chevdar
2019-12-17 17:14:46 +03:00
parent bd805d71b1
commit cca3f13e48
10 changed files with 183 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxInline/multiModule/tryCatchWithRecursiveInline.kt
Vendored
+26
View File
@@ -0,0 +1,26 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE
// MODULE: lib
// FILE: lib.kt
inline fun <T> T.andAlso(block: (T) -> Unit): T {
block(this)
return this
}
inline fun <T> tryCatch(block: () -> T, onSuccess: (T) -> Unit) {
try {
block()
} catch (e: Throwable) {
return
}.andAlso { onSuccess(it) }
}
// MODULE: main(lib)
// FILE: main.kt
fun box(): String {
var result = false
tryCatch(block = { true }) {
result = it
}
return if (result) "OK" else "Fail"
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java
Generated
+18
View File
@@ -1972,6 +1972,24 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multiModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class MultiModule extends AbstractBlackBoxInlineCodegenTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
public void testAllFilesPresentInMultiModule() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("tryCatchWithRecursiveInline.kt")
public void testTryCatchWithRecursiveInline() throws Exception {
runTest("compiler/testData/codegen/boxInline/multiModule/tryCatchWithRecursiveInline.kt");
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multifileClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+18
View File
@@ -1972,6 +1972,24 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multiModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class MultiModule extends AbstractCompileKotlinAgainstInlineKotlinTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: ");
}
public void testAllFilesPresentInMultiModule() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("tryCatchWithRecursiveInline.kt")
public void testTryCatchWithRecursiveInline() throws Exception {
runTest("compiler/testData/codegen/boxInline/multiModule/tryCatchWithRecursiveInline.kt");
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multifileClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java
Generated
+18
View File
@@ -1972,6 +1972,24 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multiModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class MultiModule extends AbstractIrBlackBoxInlineCodegenTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInMultiModule() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("tryCatchWithRecursiveInline.kt")
public void testTryCatchWithRecursiveInline() throws Exception {
runTest("compiler/testData/codegen/boxInline/multiModule/tryCatchWithRecursiveInline.kt");
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multifileClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+18
View File
@@ -1972,6 +1972,24 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multiModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class MultiModule extends AbstractIrCompileKotlinAgainstInlineKotlinTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: ");
}
public void testAllFilesPresentInMultiModule() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("tryCatchWithRecursiveInline.kt")
public void testTryCatchWithRecursiveInline() throws Exception {
runTest("compiler/testData/codegen/boxInline/multiModule/tryCatchWithRecursiveInline.kt");
}
}
@TestMetadata("compiler/testData/codegen/boxInline/multifileClasses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+8
View File
@@ -134,5 +134,13 @@ fun main(args: Array<String>) {
testClass<AbstractJsLegacyPrimitiveArraysBoxTest> {
model("codegen/box/arrays", targetBackend = TargetBackend.JS)
}
testClass<AbstractJsInlineMultiModuleTests> {
model("codegen/boxInline/multiModule/", targetBackend = TargetBackend.JS)
}
testClass<AbstractIrJsInlineMultiModuleTests> {
model("codegen/boxInline/multiModule/", targetBackend = TargetBackend.JS_IR)
}
}
}
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsInlineMultiModuleTestsGenerated.java
Generated
+36
View File
@@ -0,0 +1,36 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.js.test.ir.semantics;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxInline/multiModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class IrJsInlineMultiModuleTestsGenerated extends AbstractIrJsInlineMultiModuleTests {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
}
public void testAllFilesPresentInMultiModule() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@TestMetadata("tryCatchWithRecursiveInline.kt")
public void testTryCatchWithRecursiveInline() throws Exception {
runTest("compiler/testData/codegen/boxInline/multiModule/tryCatchWithRecursiveInline.kt");
}
}
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt
+3 -1
View File
@@ -43,4 +43,6 @@ abstract class AbstractIrInlineDefaultValuesTests : BorrowedIrInlineTest("defaul
abstract class AbstractIrInlineSuspendTests : BorrowedIrInlineTest("suspend/")
abstract class AbstractIrJsInlineContractsTests : BorrowedIrInlineTest("contracts/")
abstract class AbstractIrJsInlineContractsTests : BorrowedIrInlineTest("contracts/")
abstract class AbstractIrJsInlineMultiModuleTests : BorrowedIrInlineTest("multiModule/")
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsInlineMultiModuleTestsGenerated.java
Generated
+36
View File
@@ -0,0 +1,36 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.js.test.semantics;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxInline/multiModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class JsInlineMultiModuleTestsGenerated extends AbstractJsInlineMultiModuleTests {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
}
public void testAllFilesPresentInMultiModule() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
}
@TestMetadata("tryCatchWithRecursiveInline.kt")
public void testTryCatchWithRecursiveInline() throws Exception {
runTest("compiler/testData/codegen/boxInline/multiModule/tryCatchWithRecursiveInline.kt");
}
}
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt
+2
View File
@@ -33,6 +33,8 @@ abstract class AbstractInlineSuspendTests : BorrowedInlineTest("suspend/")
abstract class AbstractJsInlineContractsTests : BorrowedInlineTest("contracts/")
abstract class AbstractJsInlineMultiModuleTests : BorrowedInlineTest("multiModule/")
abstract class AbstractBoxJsTest : BasicBoxTest(
BasicBoxTest.TEST_DATA_DIR_PATH + "box/",
"box/"