diff --git a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.kt b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.kt new file mode 100644 index 00000000000..d4302a476a5 --- /dev/null +++ b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.kt @@ -0,0 +1,15 @@ +// FILE: fileDependencyRecursion.kt +package test + +import testOther.some + +val normal: Int = 1 +val fromImported: Int = some + +// FILE: fileDependencyRecursionOther.kt +package testOther + +import test.normal + +val some: Int = 1 +val fromImported: Int = normal \ No newline at end of file diff --git a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt new file mode 100644 index 00000000000..2d6be9bf0af --- /dev/null +++ b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt @@ -0,0 +1,4 @@ +namespace test + +internal final val fromImported: jet.Int +internal final val normal: jet.Int diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 62173b69130..873daa0212d 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -15,16 +15,13 @@ */ package org.jetbrains.jet.lang.resolve.lazy; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; - -import java.io.File; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; +import java.io.File; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @InnerTestClasses({LazyResolveNamespaceComparingTestGenerated.LoadKotlin.class, LazyResolveNamespaceComparingTestGenerated.LoadJava.class, LazyResolveNamespaceComparingTestGenerated.NamespaceComparator.class}) @@ -1741,6 +1738,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/enum.kt"); } + @TestMetadata("fileDependencyRecursion.kt") + public void testFileDependencyRecursion() throws Exception { + doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.kt"); + } + @TestMetadata("genericFunction.kt") public void testGenericFunction() throws Exception { doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt");