Refactoring: Use generators for highlighting tests

- Store options for test in file - Change default for namesHighlightingTest - Combine highlighting and deprecated tests
2013-09-30 19:54:50 +04:00
parent 62be09df87
commit f09ba64234
23 changed files with 270 additions and 240 deletions
@@ -24,4 +24,6 @@ class <info textAttributesKey="KOTLIN_CLASS">Foo</info>(val <info textAttributes
  <info textAttributesKey="KOTLIN_KEYWORD">set</info>(<info textAttributesKey="KOTLIN_PARAMETER">value</info>) {
    <info textAttributesKey="KOTLIN_PARAMETER">value</info>
  }
-}
+}
+
+// NO_CHECK_WARNINGS
@@ -15,3 +15,6 @@ fun test() {
 class Test(): <warning descr="'test.MyClass' is deprecated. Use A instead">MyClass</warning>() {}

 class Test2(param: <warning descr="'test.MyClass' is deprecated. Use A instead">MyClass</warning>) {}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -18,4 +18,7 @@ trait MyTrait {
    deprecated("Use A instead") class object {
        val test: String = ""
    }
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -15,4 +15,7 @@ class MyClass() {
    class object {
        deprecated("Use A instead") fun test3() {}
    }
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -7,4 +7,7 @@ fun test() {
  val x2 = MyClass()

  <warning descr="'fun get(i: MyClass)' is deprecated. Use A instead">x1[x2]</warning>
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -16,4 +16,7 @@ class MyClass() {

    deprecated("Use A instead") public val test3: String = ""
      [deprecated("Use A instead")] get
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -8,4 +8,7 @@ fun test() {
    var x3 = MyClass()
    x3<warning descr="'fun inc()' is deprecated. Use A instead">++</warning>
    x3.i
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -6,4 +6,7 @@ deprecated("Use A instead") fun MyRunnable.invoke() {
 fun test() {
  val m = MyRunnable()
  <warning descr="'fun invoke()' is deprecated. Use A instead">m()</warning>
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -35,4 +35,7 @@ fun test() {
    x1 <warning descr="'fun equals(i: jet.Any?)' is deprecated. Use A instead">==</warning> x2
    x1 <warning descr="'fun equals(i: jet.Any?)' is deprecated. Use A instead">!=</warning> x2
    x1 <warning descr="'fun compareTo(i: MyClass)' is deprecated. Use A instead">></warning> x2
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -19,4 +19,7 @@ class MyClass() {
         deprecated("Use A instead") val test3: String = ""
         deprecated("Use A instead") var test6: String = ""
    }
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -16,3 +16,6 @@ fun test() {
    }
 }

+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
+
@@ -23,4 +23,7 @@ class MyClass() {
 }

 public var test2: Int = 0
-      [deprecated("Use A instead")] set
+      [deprecated("Use A instead")] set
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -6,4 +6,7 @@ class MyClass(): Base() {

 open class Base() {
    fun test1() {}
-}
+}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
@@ -8,4 +8,7 @@ fun test() {

 class Test(): <warning descr="'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }

-class Test2(param: <warning descr="'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
+class Test2(param: <warning descr="'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS