From 109c47645bf6e1ff8afa5ecef06d8a3b6771a0f3 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 11 Feb 2013 16:20:32 +0400 Subject: [PATCH] Make sure that the class object class is not accessible from Kotlin --- .../diagnostics/tests/j+k/accessClassObjectFromJava.kt | 10 ++++++++++ .../jet/checkers/JetDiagnosticsTestGenerated.java | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt diff --git a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt new file mode 100644 index 00000000000..18f716a58f3 --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt @@ -0,0 +1,10 @@ +class Foo { + class object { + val bar = 1 + + fun test(a: Foo.`object`) { + + } + + } +} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index 695e61aff51..73d44ddbdba 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -2604,6 +2604,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/j+k") public static class J_k extends AbstractDiagnosticsTestWithEagerResolve { + @TestMetadata("accessClassObjectFromJava.kt") + public void testAccessClassObjectFromJava() throws Exception { + doTest("compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt"); + } + public void testAllFilesPresentInJ_k() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/j+k"), Pattern.compile("^(.+)\\.kt$"), true); }