From 64d7a971459912db32cbf9792af5ea663e9a63ed Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <Dmitry.Petrov@jetbrains.com>
Date: Wed, 17 Aug 2016 11:59:36 +0300
Subject: [PATCH] IR, testing framework: if no tree labels were provided in
 source file, use default golden file.

---
 .../tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt   | 4 ++++
 compiler/testData/ir/irText/arrayAssignment.kt                | 1 -
 compiler/testData/ir/irText/assignments.kt                    | 1 -
 compiler/testData/ir/irText/augmentedAssignment1.kt           | 1 -
 compiler/testData/ir/irText/augmentedAssignment2.kt           | 2 --
 compiler/testData/ir/irText/augmentedAssignmentArray.kt       | 1 -
 compiler/testData/ir/irText/boxOk.kt                          | 1 -
 compiler/testData/ir/irText/callWithReorderedArguments.kt     | 1 -
 compiler/testData/ir/irText/calls.kt                          | 1 -
 compiler/testData/ir/irText/dotQualified.kt                   | 1 -
 compiler/testData/ir/irText/extensionPropertyGetterCall.kt    | 1 -
 compiler/testData/ir/irText/references.kt                     | 1 -
 compiler/testData/ir/irText/smartCasts.kt                     | 1 -
 compiler/testData/ir/irText/smartCastsWithDestructuring.kt    | 1 -
 compiler/testData/ir/irText/smoke.kt                          | 1 -
 15 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt b/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
index 3267361bf10..a9588299ba8 100644
--- a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
+++ b/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
@@ -90,6 +90,10 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
                 }
             }
 
+            if (treeFiles.isEmpty()) {
+                treeFiles.add(IrTreeFileLabel(File(dir, testFile.name.replace(".kt", ".txt")), 0))
+            }
+
             return Expectations(regexps, treeFiles)
         }
 
diff --git a/compiler/testData/ir/irText/arrayAssignment.kt b/compiler/testData/ir/irText/arrayAssignment.kt
index b454e892f2c..21f406ef952 100644
--- a/compiler/testData/ir/irText/arrayAssignment.kt
+++ b/compiler/testData/ir/irText/arrayAssignment.kt
@@ -1,4 +1,3 @@
-// <<< arrayAssignment.txt
 fun test() {
     val x = intArrayOf(1, 2, 3)
     x[1] = 0
diff --git a/compiler/testData/ir/irText/assignments.kt b/compiler/testData/ir/irText/assignments.kt
index fe1103385e4..37c6d7f81ae 100644
--- a/compiler/testData/ir/irText/assignments.kt
+++ b/compiler/testData/ir/irText/assignments.kt
@@ -1,4 +1,3 @@
-// <<< assignments.txt
 class Ref(var x: Int)
 
 fun test1() {
diff --git a/compiler/testData/ir/irText/augmentedAssignment1.kt b/compiler/testData/ir/irText/augmentedAssignment1.kt
index 808546a6ad3..3456297b053 100644
--- a/compiler/testData/ir/irText/augmentedAssignment1.kt
+++ b/compiler/testData/ir/irText/augmentedAssignment1.kt
@@ -1,4 +1,3 @@
-// <<< augmentedAssignment1.txt
 var p = 0
 
 fun testVariable() {
diff --git a/compiler/testData/ir/irText/augmentedAssignment2.kt b/compiler/testData/ir/irText/augmentedAssignment2.kt
index b9c20b8ed57..61ebed0cbd0 100644
--- a/compiler/testData/ir/irText/augmentedAssignment2.kt
+++ b/compiler/testData/ir/irText/augmentedAssignment2.kt
@@ -1,5 +1,3 @@
-// <<< augmentedAssignment2.txt
-
 class A
 
 operator fun A.plusAssign(s: String) {}
diff --git a/compiler/testData/ir/irText/augmentedAssignmentArray.kt b/compiler/testData/ir/irText/augmentedAssignmentArray.kt
index a779f4ee26c..dc7d54f6b74 100644
--- a/compiler/testData/ir/irText/augmentedAssignmentArray.kt
+++ b/compiler/testData/ir/irText/augmentedAssignmentArray.kt
@@ -1,4 +1,3 @@
-// <<< augmentedAssignmentArray.txt
 fun foo(): IntArray = intArrayOf(1, 2, 3)
 
 fun testVariable() {
diff --git a/compiler/testData/ir/irText/boxOk.kt b/compiler/testData/ir/irText/boxOk.kt
index 5ad927f7853..06a959d3cb6 100644
--- a/compiler/testData/ir/irText/boxOk.kt
+++ b/compiler/testData/ir/irText/boxOk.kt
@@ -1,2 +1 @@
-// <<< boxOk.txt
 fun box(): String = "OK"
diff --git a/compiler/testData/ir/irText/callWithReorderedArguments.kt b/compiler/testData/ir/irText/callWithReorderedArguments.kt
index 4eccf740b81..d4563c0da4f 100644
--- a/compiler/testData/ir/irText/callWithReorderedArguments.kt
+++ b/compiler/testData/ir/irText/callWithReorderedArguments.kt
@@ -1,4 +1,3 @@
-// <<< callWithReorderedArguments.txt
 fun foo(a: Int, b: Int) {}
 
 fun noReorder1() = 1
diff --git a/compiler/testData/ir/irText/calls.kt b/compiler/testData/ir/irText/calls.kt
index 50169e63f0d..f702390ae5a 100644
--- a/compiler/testData/ir/irText/calls.kt
+++ b/compiler/testData/ir/irText/calls.kt
@@ -1,4 +1,3 @@
-// <<< calls.txt
 fun foo(x: Int, y: Int) = x
 fun bar(x: Int) = foo(x, 1)
 fun qux(x: Int) = foo(foo(x, x), x)
diff --git a/compiler/testData/ir/irText/dotQualified.kt b/compiler/testData/ir/irText/dotQualified.kt
index 47f5683f04d..e74f60e0bae 100644
--- a/compiler/testData/ir/irText/dotQualified.kt
+++ b/compiler/testData/ir/irText/dotQualified.kt
@@ -1,3 +1,2 @@
-// <<< dotQualified.txt
 fun length(s: String) = s.length
 fun lengthN(s: String?) = s?.length
diff --git a/compiler/testData/ir/irText/extensionPropertyGetterCall.kt b/compiler/testData/ir/irText/extensionPropertyGetterCall.kt
index 5b0ba320dbb..1da7f1df274 100644
--- a/compiler/testData/ir/irText/extensionPropertyGetterCall.kt
+++ b/compiler/testData/ir/irText/extensionPropertyGetterCall.kt
@@ -1,3 +1,2 @@
-// <<< extensionPropertyGetterCall.txt
 val String.okext: String get() = "OK"
 fun String.test5() = okext
diff --git a/compiler/testData/ir/irText/references.kt b/compiler/testData/ir/irText/references.kt
index 98591c22576..b3d3d16893d 100644
--- a/compiler/testData/ir/irText/references.kt
+++ b/compiler/testData/ir/irText/references.kt
@@ -1,4 +1,3 @@
-// <<< references.txt
 val ok = "OK"
 val ok2 = ok
 val ok3: String get() = "OK"
diff --git a/compiler/testData/ir/irText/smartCasts.kt b/compiler/testData/ir/irText/smartCasts.kt
index cc8f80ea2f4..8f6c1e21deb 100644
--- a/compiler/testData/ir/irText/smartCasts.kt
+++ b/compiler/testData/ir/irText/smartCasts.kt
@@ -1,4 +1,3 @@
-// <<< smartCasts.txt
 fun expectsString(s: String) {}
 fun expectsInt(i: Int) {}
 
diff --git a/compiler/testData/ir/irText/smartCastsWithDestructuring.kt b/compiler/testData/ir/irText/smartCastsWithDestructuring.kt
index cf1d06fb9d7..98b0443314c 100644
--- a/compiler/testData/ir/irText/smartCastsWithDestructuring.kt
+++ b/compiler/testData/ir/irText/smartCastsWithDestructuring.kt
@@ -1,4 +1,3 @@
-// <<< smartCastsWithDestructuring.txt
 interface I1
 interface I2
 
diff --git a/compiler/testData/ir/irText/smoke.kt b/compiler/testData/ir/irText/smoke.kt
index 5d57c9aeea2..6dee242ca5e 100644
--- a/compiler/testData/ir/irText/smoke.kt
+++ b/compiler/testData/ir/irText/smoke.kt
@@ -1,4 +1,3 @@
-// <<< smoke.txt
 fun testFun(): String { return "OK" }
 val testSimpleVal = 1
 val testValWithGetter: Int get() = 42