Report an error when variance is specified for a function or property type parameter

This commit is contained in:
Andrey Breslav
2012-11-22 11:03:09 +04:00
parent d8c9d19bd7
commit 12fd07af08
20 changed files with 58 additions and 72 deletions
@@ -1462,6 +1462,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.kt");
}
@TestMetadata("VarianceOnFunctionAndPropertyTypeParameters.kt")
public void testVarianceOnFunctionAndPropertyTypeParameters() throws Exception {
doTest("compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.kt");
}
@TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations")
public static class MultiDeclarations extends AbstractDiagnosticsTestWithEagerResolve {
public void testAllFilesPresentInMultiDeclarations() throws Exception {
@@ -347,16 +347,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
}
@TestMetadata("FunInParam.kt")
public void testFunInParam() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunInParam.kt");
}
@TestMetadata("FunOutParam.kt")
public void testFunOutParam() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunOutParam.kt");
}
@TestMetadata("FunParamParam.kt")
public void testFunParamParam() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
@@ -372,11 +362,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
}
@TestMetadata("FunParamReferencesParam2.kt")
public void testFunParamReferencesParam2() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam2.kt");
}
@TestMetadata("FunParamTwoUpperBounds.kt")
public void testFunParamTwoUpperBounds() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
@@ -412,11 +397,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
}
@TestMetadata("FunTwoTypeParams2.kt")
public void testFunTwoTypeParams2() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams2.kt");
}
}
@TestMetadata("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables")
@@ -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})
@@ -349,16 +346,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
}
@TestMetadata("FunInParam.kt")
public void testFunInParam() throws Exception {
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunInParam.kt");
}
@TestMetadata("FunOutParam.kt")
public void testFunOutParam() throws Exception {
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunOutParam.kt");
}
@TestMetadata("FunParamParam.kt")
public void testFunParamParam() throws Exception {
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
@@ -374,11 +361,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
}
@TestMetadata("FunParamReferencesParam2.kt")
public void testFunParamReferencesParam2() throws Exception {
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam2.kt");
}
@TestMetadata("FunParamTwoUpperBounds.kt")
public void testFunParamTwoUpperBounds() throws Exception {
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
@@ -414,11 +396,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
}
@TestMetadata("FunTwoTypeParams2.kt")
public void testFunTwoTypeParams2() throws Exception {
doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams2.kt");
}
}
@TestMetadata("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables")