diff --git a/compiler/testData/loadJava/compiledKotlin/fun/Assert.kt b/compiler/testData/loadJava/compiledKotlin/fun/Assert.kt new file mode 100644 index 00000000000..5f0a3efec75 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/fun/Assert.kt @@ -0,0 +1,4 @@ +package test + +fun assert() { +} \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledKotlin/fun/Assert.txt b/compiler/testData/loadJava/compiledKotlin/fun/Assert.txt new file mode 100644 index 00000000000..2207c1905dc --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/fun/Assert.txt @@ -0,0 +1,3 @@ +package test + +internal fun assert(): kotlin.Unit \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index d6820a60bc2..34f75d05932 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -2330,6 +2330,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("Assert.kt") + public void testAssert() throws Exception { + doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); + } + @TestMetadata("DeclaredMemberOverridesDelegated.kt") public void testDeclaredMemberOverridesDelegated() throws Exception { doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java index 09a13999233..af231e00e57 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java @@ -798,6 +798,11 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("Assert.kt") + public void testAssert() throws Exception { + doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); + } + @TestMetadata("DeclaredMemberOverridesDelegated.kt") public void testDeclaredMemberOverridesDelegated() throws Exception { doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java index df33404a2d2..b514a75e169 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java @@ -798,6 +798,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("Assert.kt") + public void testAssert() throws Exception { + doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); + } + @TestMetadata("DeclaredMemberOverridesDelegated.kt") public void testDeclaredMemberOverridesDelegated() throws Exception { doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt");