From 91754c0c4bebacee7230754d5d5e451c28eb5dac Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 29 Dec 2014 16:14:19 +0300
Subject: [PATCH] Move test files to test data root

---
 .../definiteReturn}/simpleClass.kt             |  0
 .../definiteReturn}/simpleClass.txt            |  0
 .../propertyClassFileDependencyRecursion.kt    |  2 +-
 .../propertyClassFileDependencyRecursion.txt   |  0
 .../{ => tests/scopes}/sameClassNameResolve.kt |  0
 .../scopes}/sameClassNameResolve.txt           |  0
 .../checkers/JetDiagnosticsTestGenerated.java  | 18 ++++++++++++++++++
 7 files changed, 19 insertions(+), 1 deletion(-)
 rename compiler/testData/diagnostics/{ => tests/controlFlowAnalysis/definiteReturn}/simpleClass.kt (100%)
 rename compiler/testData/diagnostics/{ => tests/controlFlowAnalysis/definiteReturn}/simpleClass.txt (100%)
 rename compiler/testData/diagnostics/{ => tests/imports}/propertyClassFileDependencyRecursion.kt (93%)
 rename compiler/testData/diagnostics/{ => tests/imports}/propertyClassFileDependencyRecursion.txt (100%)
 rename compiler/testData/diagnostics/{ => tests/scopes}/sameClassNameResolve.kt (100%)
 rename compiler/testData/diagnostics/{ => tests/scopes}/sameClassNameResolve.txt (100%)

diff --git a/compiler/testData/diagnostics/simpleClass.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/simpleClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/simpleClass.kt
rename to compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/simpleClass.kt
diff --git a/compiler/testData/diagnostics/simpleClass.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/simpleClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/simpleClass.txt
rename to compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/simpleClass.txt
diff --git a/compiler/testData/diagnostics/propertyClassFileDependencyRecursion.kt b/compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.kt
similarity index 93%
rename from compiler/testData/diagnostics/propertyClassFileDependencyRecursion.kt
rename to compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.kt
index 9833984a38d..c997c1be1cb 100644
--- a/compiler/testData/diagnostics/propertyClassFileDependencyRecursion.kt
+++ b/compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.kt
@@ -14,4 +14,4 @@ package other
 
 import test.PropType
 
-val prop: PropType? = null
\ No newline at end of file
+val prop: PropType? = null
diff --git a/compiler/testData/diagnostics/propertyClassFileDependencyRecursion.txt b/compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.txt
similarity index 100%
rename from compiler/testData/diagnostics/propertyClassFileDependencyRecursion.txt
rename to compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.txt
diff --git a/compiler/testData/diagnostics/sameClassNameResolve.kt b/compiler/testData/diagnostics/tests/scopes/sameClassNameResolve.kt
similarity index 100%
rename from compiler/testData/diagnostics/sameClassNameResolve.kt
rename to compiler/testData/diagnostics/tests/scopes/sameClassNameResolve.kt
diff --git a/compiler/testData/diagnostics/sameClassNameResolve.txt b/compiler/testData/diagnostics/tests/scopes/sameClassNameResolve.txt
similarity index 100%
rename from compiler/testData/diagnostics/sameClassNameResolve.txt
rename to compiler/testData/diagnostics/tests/scopes/sameClassNameResolve.txt
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 4945f49fe8c..6350c4816c4 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -1921,6 +1921,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.kt");
                     doTest(fileName);
                 }
+
+                @TestMetadata("simpleClass.kt")
+                public void testSimpleClass() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/simpleClass.kt");
+                    doTest(fileName);
+                }
             }
         }
 
@@ -4721,6 +4727,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("propertyClassFileDependencyRecursion.kt")
+            public void testPropertyClassFileDependencyRecursion() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("RenameOnImport.kt")
             public void testRenameOnImport() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/RenameOnImport.kt");
@@ -9612,6 +9624,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("sameClassNameResolve.kt")
+            public void testSameClassNameResolve() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/sameClassNameResolve.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("stopResolutionOnAmbiguity.kt")
             public void testStopResolutionOnAmbiguity() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt");