diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java index 1d8b13bcf2d..3ec88555800 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -57,6 +57,7 @@ import org.jetbrains.jet.plugin.refactoring.inline.AbstractInlineTest; import org.jetbrains.jet.psi.AbstractJetPsiMatcherTest; import org.jetbrains.jet.resolve.AbstractResolveBaseTest; import org.jetbrains.jet.resolve.AbstractResolveTest; +import org.jetbrains.jet.resolve.AbstractResolveWithLibTest; import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest; import org.jetbrains.jet.generators.tests.generator.SimpleTestClassModel; import org.jetbrains.jet.generators.tests.generator.TestClassModel; @@ -465,6 +466,13 @@ public class GenerateTests { testModel("idea/testData/resolve/references", true, "doTest") ); + generateTest( + "idea/tests/", + "ReferenceResolveWithLibTestGenerated", + AbstractResolveWithLibTest.class, + testModel("idea/testData/resolve/referenceWithLib", false, "doTest") + ); + generateTest( "idea/tests/", "JetFindUsagesTest", diff --git a/idea/testData/resolve/referenceWithLib/fakeOverride.kt b/idea/testData/resolve/referenceWithLib/fakeOverride.kt new file mode 100644 index 00000000000..c4a4a291206 --- /dev/null +++ b/idea/testData/resolve/referenceWithLib/fakeOverride.kt @@ -0,0 +1,9 @@ +package test + +import dependency.B + +fun test(b: B) { + b.f() +} + +// REF: (in dependency.A).f() \ No newline at end of file diff --git a/idea/testData/resolve/referenceWithLib/fakeOverride2.kt b/idea/testData/resolve/referenceWithLib/fakeOverride2.kt new file mode 100644 index 00000000000..b1f97bb58dc --- /dev/null +++ b/idea/testData/resolve/referenceWithLib/fakeOverride2.kt @@ -0,0 +1,12 @@ +package test + +import dependency.A + +public open class B(): A() { +} + +fun test(b: B) { + b.f() +} + +// REF: (in dependency.A).f() \ No newline at end of file diff --git a/idea/testData/resolve/referenceWithLib/fakeOverride2Src/fakeOverride2Dependency.kt b/idea/testData/resolve/referenceWithLib/fakeOverride2Src/fakeOverride2Dependency.kt new file mode 100644 index 00000000000..6dbebec574d --- /dev/null +++ b/idea/testData/resolve/referenceWithLib/fakeOverride2Src/fakeOverride2Dependency.kt @@ -0,0 +1,5 @@ +package dependency + +public open class A() { + public open fun f() {} +} \ No newline at end of file diff --git a/idea/testData/resolve/referenceWithLib/fakeOverrideSrc/fakeOverrideDependency.kt b/idea/testData/resolve/referenceWithLib/fakeOverrideSrc/fakeOverrideDependency.kt new file mode 100644 index 00000000000..605eb13e52e --- /dev/null +++ b/idea/testData/resolve/referenceWithLib/fakeOverrideSrc/fakeOverrideDependency.kt @@ -0,0 +1,8 @@ +package dependency + +public open class A() { + public open fun f() {} +} + +public open class B(): A() { +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractResolveWithLibTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractResolveWithLibTest.java new file mode 100644 index 00000000000..96514f6f26e --- /dev/null +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractResolveWithLibTest.java @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.resolve; + +import com.intellij.testFramework.LightProjectDescriptor; +import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; + +import static com.intellij.openapi.util.text.StringUtil.startsWithIgnoreCase; + +public abstract class AbstractResolveWithLibTest extends AbstractResolveBaseTest { + + private static final String TEST_DATA_PATH = "idea/testData/resolve/referenceWithLib"; + private static final String ALL_FILES_PRESENT_PREFIX = "allFilesPresentIn"; + + @Override + protected LightProjectDescriptor getProjectDescriptor() { + String testName = getTestName(true); + if (startsWithIgnoreCase(testName, ALL_FILES_PRESENT_PREFIX)) { + return null; + } + return new JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + testName + "Src", false); + } +} diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java new file mode 100644 index 00000000000..0102bca3c40 --- /dev/null +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java @@ -0,0 +1,49 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.resolve; + +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestSuite; + +import java.io.File; +import java.util.regex.Pattern; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import org.jetbrains.jet.resolve.AbstractResolveWithLibTest; + +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("idea/testData/resolve/referenceWithLib") +public class ReferenceResolveWithLibTestGenerated extends AbstractResolveWithLibTest { + public void testAllFilesPresentInReferenceWithLib() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/resolve/referenceWithLib"), Pattern.compile("^(.+)\\.kt$"), false); + } + + @TestMetadata("fakeOverride.kt") + public void testFakeOverride() throws Exception { + doTest("idea/testData/resolve/referenceWithLib/fakeOverride.kt"); + } + + @TestMetadata("fakeOverride2.kt") + public void testFakeOverride2() throws Exception { + doTest("idea/testData/resolve/referenceWithLib/fakeOverride2.kt"); + } + +}