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

KT-6178 False "Overriden methods are not annotated" when using delegation

Browse Source 
#KT-6178 Fixed
This commit is contained in:
Andrey Breslav
2014-11-04 20:26:53 +02:00
parent 586b7e3dee
commit 8dcd81e0b3
9 changed files with 101 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/asJava/AbstractKotlinLightClassTest.java
+21 -20
View File
@@ -22,30 +22,23 @@ import com.intellij.psi.impl.compiled.ClsElementImpl;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.KotlinTestWithEnvironmentManagement;
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
import org.jetbrains.jet.checkers.KotlinMultiFileTestWithWithJava;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.config.CommonConfigurationKeys;
import org.jetbrains.jet.config.CompilerConfiguration;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public abstract class AbstractKotlinLightClassTest extends KotlinTestWithEnvironmentManagement {
public abstract class AbstractKotlinLightClassTest extends KotlinMultiFileTestWithWithJava<Void, Void> {
private static final Pattern SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE);
@NotNull
private JetCoreEnvironment createEnvironment(File kotlinFile) {
CompilerConfiguration configuration = new CompilerConfiguration();
configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, kotlinFile.getPath());
configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, JetTestUtils.getAnnotationsJar());
configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, JetTestUtils.findMockJdkRtJar());
return JetCoreEnvironment.createForTests(getTestRootDisposable(), configuration);
@Override
protected File getKotlinSourceRoot() {
return createTmpDir("kotlin-src");
}
@NotNull
@@ -56,18 +49,16 @@ public abstract class AbstractKotlinLightClassTest extends KotlinTestWithEnviron
return JavaElementFinder.getInstance(environment.getProject());
}
protected void doTest(@NotNull String fileName) throws IOException {
File file = new File(fileName);
@Override
protected void doMultiFileTest(File file, Map<String, ModuleAndDependencies> modules, List<Void> files) throws IOException {
String text = FileUtil.loadFile(file, true);
Matcher matcher = SUBJECT_FQ_NAME_PATTERN.matcher(text);
assertTrue("No FqName specified. First line of the form '// f.q.Name' expected", matcher.find());
String fqName = matcher.group(1);
JetCoreEnvironment environment = createEnvironment(file);
JavaElementFinder finder = createFinder(environment);
JavaElementFinder finder = createFinder(getEnvironment());
PsiClass psiClass = finder.findClass(fqName, GlobalSearchScope.allScope(environment.getProject()));
PsiClass psiClass = finder.findClass(fqName, GlobalSearchScope.allScope(getEnvironment().getProject()));
if (!(psiClass instanceof KotlinLightClass)) {
throw new IllegalStateException("Not a light class: " + psiClass + " (" + fqName + ")");
}
@@ -83,4 +74,14 @@ public abstract class AbstractKotlinLightClassTest extends KotlinTestWithEnviron
JetTestUtils.assertEqualsToFile(JetTestUtils.replaceExtension(file, "java"), actual);
}
@Override
protected Void createTestModule(String name) {
return null;
}
@Override
protected Void createTestFile(Void module, String fileName, String text, Map<String, String> directives) {
return null;
}
}