From 3e51cbc9dcb74afccec1bd6ffd323dcc6eb3a9b3 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 30 Apr 2019 17:12:56 +0300
Subject: [PATCH] FIR: move test to stdlib group thus fixing it

---
 .../{expresssions => stdlib}/factoryFunctionOverloads.kt     | 0
 .../{expresssions => stdlib}/factoryFunctionOverloads.txt    | 2 +-
 .../jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java    | 5 -----
 .../kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java    | 5 +++++
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename compiler/fir/resolve/testData/resolve/{expresssions => stdlib}/factoryFunctionOverloads.kt (100%)
 rename compiler/fir/resolve/testData/resolve/{expresssions => stdlib}/factoryFunctionOverloads.txt (93%)

diff --git a/compiler/fir/resolve/testData/resolve/expresssions/factoryFunctionOverloads.kt b/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/expresssions/factoryFunctionOverloads.kt
rename to compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.kt
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/factoryFunctionOverloads.txt b/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt
similarity index 93%
rename from compiler/fir/resolve/testData/resolve/expresssions/factoryFunctionOverloads.txt
rename to compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt
index 38aa92c8779..ed727668b6b 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/factoryFunctionOverloads.txt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt
@@ -9,7 +9,7 @@ FILE: factoryFunctionOverloads.kt
     public final fun A(b: R|B|?, flag: R|kotlin/Boolean| = Boolean(true)): R|A| {
         ^A R|/A.A|(when (lval <bangbang>: R|B|? = R|<local>/b|) {
             ==($subj$, Null(null)) ->  {
-                throw <Unresolved name: KotlinNullPointerException>#()
+                throw R|kotlin/KotlinNullPointerException.KotlinNullPointerException|()
             }
             else ->  {
                 R|<local>/<bangbang>|
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java
index 2051329cfb7..873ee86ae4a 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseGenerated.java
@@ -222,11 +222,6 @@ public class FirResolveTestCaseGenerated extends AbstractFirResolveTestCase {
             runTest("compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.kt");
         }
 
-        @TestMetadata("factoryFunctionOverloads.kt")
-        public void testFactoryFunctionOverloads() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/expresssions/factoryFunctionOverloads.kt");
-        }
-
         @TestMetadata("lambda.kt")
         public void testLambda() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/expresssions/lambda.kt");
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java
index 741c06e4d4d..8462c4bfd3a 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveTestCaseWithStdlibGenerated.java
@@ -49,6 +49,11 @@ public class FirResolveTestCaseWithStdlibGenerated extends AbstractFirResolveTes
         runTest("compiler/fir/resolve/testData/resolve/stdlib/concurrent.kt");
     }
 
+    @TestMetadata("factoryFunctionOverloads.kt")
+    public void testFactoryFunctionOverloads() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.kt");
+    }
+
     @TestMetadata("functionX.kt")
     public void testFunctionX() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/stdlib/functionX.kt");