FE: Add tests reflecting the current state for some old issues

^KT-53113 Obsolete
^KT-55548 Related
^KT-29164 Related
diff --git a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLDiagnosticsFe10TestGenerated.java b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLDiagnosticsFe10TestGenerated.java
index d38ad66..3acf7c0 100644
--- a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLDiagnosticsFe10TestGenerated.java
+++ b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLDiagnosticsFe10TestGenerated.java
@@ -18556,6 +18556,12 @@
         }
 
         @Test
+        @TestMetadata("approximationForCollectionAsserter.kt")
+        public void testApproximationForCollectionAsserter() {
+          runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt");
+        }
+
+        @Test
         @TestMetadata("approximationLeavesNonTrivialLowerBound.kt")
         public void testApproximationLeavesNonTrivialLowerBound() {
           runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationLeavesNonTrivialLowerBound.kt");
@@ -38475,6 +38481,12 @@
       }
 
       @Test
+      @TestMetadata("starProjectedTypesAndExplicitLambdaParameters.kt")
+      public void testStarProjectedTypesAndExplicitLambdaParameters() {
+        runTest("compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt");
+      }
+
+      @Test
       @TestMetadata("typeMismatchOnGenericSam.kt")
       public void testTypeMismatchOnGenericSam() {
         runTest("compiler/testData/diagnostics/tests/samConversions/typeMismatchOnGenericSam.kt");
diff --git a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLPartialDiagnosticsFe10TestGenerated.java b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLPartialDiagnosticsFe10TestGenerated.java
index d6b50b3..401c585 100644
--- a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLPartialDiagnosticsFe10TestGenerated.java
+++ b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLPartialDiagnosticsFe10TestGenerated.java
@@ -18556,6 +18556,12 @@
         }
 
         @Test
+        @TestMetadata("approximationForCollectionAsserter.kt")
+        public void testApproximationForCollectionAsserter() {
+          runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt");
+        }
+
+        @Test
         @TestMetadata("approximationLeavesNonTrivialLowerBound.kt")
         public void testApproximationLeavesNonTrivialLowerBound() {
           runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationLeavesNonTrivialLowerBound.kt");
@@ -38475,6 +38481,12 @@
       }
 
       @Test
+      @TestMetadata("starProjectedTypesAndExplicitLambdaParameters.kt")
+      public void testStarProjectedTypesAndExplicitLambdaParameters() {
+        runTest("compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt");
+      }
+
+      @Test
       @TestMetadata("typeMismatchOnGenericSam.kt")
       public void testTypeMismatchOnGenericSam() {
         runTest("compiler/testData/diagnostics/tests/samConversions/typeMismatchOnGenericSam.kt");
diff --git a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedDiagnosticsFe10TestGenerated.java b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedDiagnosticsFe10TestGenerated.java
index f4b8e72..7343911 100644
--- a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedDiagnosticsFe10TestGenerated.java
+++ b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedDiagnosticsFe10TestGenerated.java
@@ -18556,6 +18556,12 @@
         }
 
         @Test
+        @TestMetadata("approximationForCollectionAsserter.kt")
+        public void testApproximationForCollectionAsserter() {
+          runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt");
+        }
+
+        @Test
         @TestMetadata("approximationLeavesNonTrivialLowerBound.kt")
         public void testApproximationLeavesNonTrivialLowerBound() {
           runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationLeavesNonTrivialLowerBound.kt");
@@ -38475,6 +38481,12 @@
       }
 
       @Test
+      @TestMetadata("starProjectedTypesAndExplicitLambdaParameters.kt")
+      public void testStarProjectedTypesAndExplicitLambdaParameters() {
+        runTest("compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt");
+      }
+
+      @Test
       @TestMetadata("typeMismatchOnGenericSam.kt")
       public void testTypeMismatchOnGenericSam() {
         runTest("compiler/testData/diagnostics/tests/samConversions/typeMismatchOnGenericSam.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsWithLatestLanguageVersionTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsWithLatestLanguageVersionTestGenerated.java
index 1c51f7e..d1622c6 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsWithLatestLanguageVersionTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsWithLatestLanguageVersionTestGenerated.java
@@ -18538,6 +18538,12 @@
         }
 
         @Test
+        @TestMetadata("approximationForCollectionAsserter.kt")
+        public void testApproximationForCollectionAsserter() {
+          runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt");
+        }
+
+        @Test
         @TestMetadata("approximationLeavesNonTrivialLowerBound.kt")
         public void testApproximationLeavesNonTrivialLowerBound() {
           runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationLeavesNonTrivialLowerBound.kt");
@@ -35469,6 +35475,12 @@
       }
 
       @Test
+      @TestMetadata("starProjectedTypesAndExplicitLambdaParameters.kt")
+      public void testStarProjectedTypesAndExplicitLambdaParameters() {
+        runTest("compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt");
+      }
+
+      @Test
       @TestMetadata("typeMismatchOnGenericSam.kt")
       public void testTypeMismatchOnGenericSam() {
         runTest("compiler/testData/diagnostics/tests/samConversions/typeMismatchOnGenericSam.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java
index bee818c..b7482cd 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java
@@ -1544,6 +1544,12 @@
       }
 
       @Test
+      @TestMetadata("springNotNullApiGenericOverride.kt")
+      public void testSpringNotNullApiGenericOverride() {
+        runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt");
+      }
+
+      @Test
       @TestMetadata("springNullableWithTypeUse.kt")
       public void testSpringNullableWithTypeUse() {
         runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNullableWithTypeUse.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
index cb627cd..918c314 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
@@ -1602,6 +1602,12 @@
       }
 
       @Test
+      @TestMetadata("springNotNullApiGenericOverride.kt")
+      public void testSpringNotNullApiGenericOverride() {
+        runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt");
+      }
+
+      @Test
       @TestMetadata("springNullableWithTypeUse.kt")
       public void testSpringNullableWithTypeUse() {
         runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNullableWithTypeUse.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java
index 8f92561..257304b 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java
@@ -1602,6 +1602,12 @@
       }
 
       @Test
+      @TestMetadata("springNotNullApiGenericOverride.kt")
+      public void testSpringNotNullApiGenericOverride() {
+        runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt");
+      }
+
+      @Test
       @TestMetadata("springNullableWithTypeUse.kt")
       public void testSpringNullableWithTypeUse() {
         runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNullableWithTypeUse.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticLightTreeTestGenerated.java
index 81d2f53..a8253d9 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticLightTreeTestGenerated.java
@@ -17954,6 +17954,12 @@
         }
 
         @Test
+        @TestMetadata("approximationForCollectionAsserter.kt")
+        public void testApproximationForCollectionAsserter() {
+          runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt");
+        }
+
+        @Test
         @TestMetadata("approximationLeavesNonTrivialLowerBound.kt")
         public void testApproximationLeavesNonTrivialLowerBound() {
           runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationLeavesNonTrivialLowerBound.kt");
@@ -37022,6 +37028,12 @@
       }
 
       @Test
+      @TestMetadata("starProjectedTypesAndExplicitLambdaParameters.kt")
+      public void testStarProjectedTypesAndExplicitLambdaParameters() {
+        runTest("compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt");
+      }
+
+      @Test
       @TestMetadata("typeMismatchOnGenericSam.kt")
       public void testTypeMismatchOnGenericSam() {
         runTest("compiler/testData/diagnostics/tests/samConversions/typeMismatchOnGenericSam.kt");
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticPsiTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticPsiTestGenerated.java
index 2ec9801..6350854 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticPsiTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticPsiTestGenerated.java
@@ -17972,6 +17972,12 @@
         }
 
         @Test
+        @TestMetadata("approximationForCollectionAsserter.kt")
+        public void testApproximationForCollectionAsserter() {
+          runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt");
+        }
+
+        @Test
         @TestMetadata("approximationLeavesNonTrivialLowerBound.kt")
         public void testApproximationLeavesNonTrivialLowerBound() {
           runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationLeavesNonTrivialLowerBound.kt");
@@ -37046,6 +37052,12 @@
       }
 
       @Test
+      @TestMetadata("starProjectedTypesAndExplicitLambdaParameters.kt")
+      public void testStarProjectedTypesAndExplicitLambdaParameters() {
+        runTest("compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt");
+      }
+
+      @Test
       @TestMetadata("typeMismatchOnGenericSam.kt")
       public void testTypeMismatchOnGenericSam() {
         runTest("compiler/testData/diagnostics/tests/samConversions/typeMismatchOnGenericSam.kt");
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt
new file mode 100644
index 0000000..b7c84eb
--- /dev/null
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt
@@ -0,0 +1,50 @@
+// FIR_IDENTICAL
+// DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT: strict
+// ISSUE: KT-55548
+// FULL_JDK
+
+// FILE: spr/NonNullApi.java
+package spr;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierDefault;
+
+@Target({ElementType.PACKAGE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Nonnull
+@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER})
+public @interface NonNullApi {
+}
+
+// FILE: test/package-info.java
+@spr.NonNullApi()
+package test;
+
+// FILE: test/CrudRepository.java
+package test;
+import spr.*;
+
+public interface CrudRepository<T, ID> {
+    java.util.Optional<T> findById(ID id);
+}
+
+// FILE: main.kt
+import test.CrudRepository
+import java.util.*
+
+fun test(repository: SpringTemplateRepository, int: Int) {
+    repository.<!OVERLOAD_RESOLUTION_AMBIGUITY!>findById<!>(int)
+}
+
+interface SpringTemplateRepository : TemplateRepository, CrudRepository<String, Int>
+
+interface TemplateRepository {
+    fun findById(id: Int): Optional<String>
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.fir.kt
new file mode 100644
index 0000000..14abf84
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.fir.kt
@@ -0,0 +1,17 @@
+// RUN_PIPELINE_TILL: BACKEND
+// ISSUE: KT-53113
+abstract class AbstractCollectionAssert<SELF : AbstractCollectionAssert<SELF, ELEMENT>, ELEMENT> {
+    fun describedAs(s: String): SELF = TODO()
+    fun anyMatch(x: (ELEMENT) -> Boolean) {}
+}
+
+fun <E> assertThat(actual: Collection<E>): AbstractCollectionAssert<*, E> = TODO()
+
+fun main(strings: Collection<String>) {
+    assertThat(strings)
+        .describedAs("2-length strings")
+        .anyMatch { it.length == 2 }
+}
+
+/* GENERATED_FIR_TAGS: capturedType, classDeclaration, equalityExpression, functionDeclaration, functionalType,
+integerLiteral, lambdaLiteral, nullableType, starProjection, stringLiteral, typeConstraint, typeParameter */
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt
new file mode 100644
index 0000000..1ec26b1
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt
@@ -0,0 +1,17 @@
+// RUN_PIPELINE_TILL: BACKEND
+// ISSUE: KT-53113
+abstract class AbstractCollectionAssert<SELF : AbstractCollectionAssert<SELF, ELEMENT>, ELEMENT> {
+    fun describedAs(s: String): SELF = TODO()
+    fun anyMatch(x: (ELEMENT) -> Boolean) {}
+}
+
+fun <E> assertThat(actual: Collection<E>): AbstractCollectionAssert<*, E> = TODO()
+
+fun main(strings: Collection<String>) {
+    assertThat(strings)
+        .describedAs("2-length strings")
+        .anyMatch { it.<!UNRESOLVED_REFERENCE!>length<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>==<!> 2 }
+}
+
+/* GENERATED_FIR_TAGS: capturedType, classDeclaration, equalityExpression, functionDeclaration, functionalType,
+integerLiteral, lambdaLiteral, nullableType, starProjection, stringLiteral, typeConstraint, typeParameter */
diff --git a/compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.fir.kt b/compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.fir.kt
new file mode 100644
index 0000000..6d9a618
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.fir.kt
@@ -0,0 +1,34 @@
+// FULL_JDK
+// RUN_PIPELINE_TILL: FRONTEND
+// ISSUE: KT-29164
+// FILE: OneParamLambda.java
+
+public interface OneParamLambda<R, P> {
+    R execute(P param);
+}
+
+// FILE: TwoParamLambda.java
+
+public interface TwoParamLambda<R, P1, P2> {
+    R execute(P1 param1, P2 param2);
+}
+
+// FILE: A.java
+
+public class A {
+    public static void foo(OneParamLambda<?, ?> handler) { }
+    public static void foo(TwoParamLambda<?, ?, ?> handler) { }
+}
+
+// FILE: Test.kt
+
+fun bar1(x: java.util.function.Function<*, *>) {} // SAM
+fun bar2(x: Function1<*, *>) {} // Regular function type with star projections
+
+fun test() {
+    A.<!NONE_APPLICABLE!>foo<!> { i: Int -> i } // A.foo((Integer i) -> ""); // works in Java
+    bar1 <!ARGUMENT_TYPE_MISMATCH!>{ i: Int -> i }<!>
+    bar2 { i: Int -> i }
+}
+
+/* GENERATED_FIR_TAGS: flexibleType, functionDeclaration, lambdaLiteral, nullableType, samConversion, starProjection */
diff --git a/compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt b/compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt
new file mode 100644
index 0000000..c6f2f0c
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt
@@ -0,0 +1,34 @@
+// FULL_JDK
+// RUN_PIPELINE_TILL: FRONTEND
+// ISSUE: KT-29164
+// FILE: OneParamLambda.java
+
+public interface OneParamLambda<R, P> {
+    R execute(P param);
+}
+
+// FILE: TwoParamLambda.java
+
+public interface TwoParamLambda<R, P1, P2> {
+    R execute(P1 param1, P2 param2);
+}
+
+// FILE: A.java
+
+public class A {
+    public static void foo(OneParamLambda<?, ?> handler) { }
+    public static void foo(TwoParamLambda<?, ?, ?> handler) { }
+}
+
+// FILE: Test.kt
+
+fun bar1(x: java.util.function.Function<*, *>) {} // SAM
+fun bar2(x: Function1<*, *>) {} // Regular function type with star projections
+
+fun test() {
+    A.<!NONE_APPLICABLE!>foo<!> { i: Int -> i } // A.foo((Integer i) -> ""); // works in Java
+    bar1 <!TYPE_MISMATCH!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>i: Int<!> -> i }<!>
+    bar2 { <!EXPECTED_PARAMETER_TYPE_MISMATCH!>i: Int<!> -> i }
+}
+
+/* GENERATED_FIR_TAGS: flexibleType, functionDeclaration, lambdaLiteral, nullableType, samConversion, starProjection */
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 2191926..176fe52 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -18556,6 +18556,12 @@
         }
 
         @Test
+        @TestMetadata("approximationForCollectionAsserter.kt")
+        public void testApproximationForCollectionAsserter() {
+          runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationForCollectionAsserter.kt");
+        }
+
+        @Test
         @TestMetadata("approximationLeavesNonTrivialLowerBound.kt")
         public void testApproximationLeavesNonTrivialLowerBound() {
           runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/approximationLeavesNonTrivialLowerBound.kt");
@@ -38475,6 +38481,12 @@
       }
 
       @Test
+      @TestMetadata("starProjectedTypesAndExplicitLambdaParameters.kt")
+      public void testStarProjectedTypesAndExplicitLambdaParameters() {
+        runTest("compiler/testData/diagnostics/tests/samConversions/starProjectedTypesAndExplicitLambdaParameters.kt");
+      }
+
+      @Test
       @TestMetadata("typeMismatchOnGenericSam.kt")
       public void testTypeMismatchOnGenericSam() {
         runTest("compiler/testData/diagnostics/tests/samConversions/typeMismatchOnGenericSam.kt");
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java
index 04d0095..dda66df 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java
@@ -1544,6 +1544,12 @@
       }
 
       @Test
+      @TestMetadata("springNotNullApiGenericOverride.kt")
+      public void testSpringNotNullApiGenericOverride() {
+        runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt");
+      }
+
+      @Test
       @TestMetadata("springNullableWithTypeUse.kt")
       public void testSpringNullableWithTypeUse() {
         runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNullableWithTypeUse.kt");
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
index a675ee5..9190b1d 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
@@ -1602,6 +1602,12 @@
       }
 
       @Test
+      @TestMetadata("springNotNullApiGenericOverride.kt")
+      public void testSpringNotNullApiGenericOverride() {
+        runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt");
+      }
+
+      @Test
       @TestMetadata("springNullableWithTypeUse.kt")
       public void testSpringNullableWithTypeUse() {
         runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNullableWithTypeUse.kt");
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java
index d10ef20..db3dc2c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java
@@ -1602,6 +1602,12 @@
       }
 
       @Test
+      @TestMetadata("springNotNullApiGenericOverride.kt")
+      public void testSpringNotNullApiGenericOverride() {
+        runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNotNullApiGenericOverride.kt");
+      }
+
+      @Test
       @TestMetadata("springNullableWithTypeUse.kt")
       public void testSpringNullableWithTypeUse() {
         runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/springNullableWithTypeUse.kt");