From d18c1ca32e54768693b534962c2925e8d6444de7 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Wed, 17 Jun 2015 14:38:30 +0300
Subject: [PATCH] Update J2K behavior with empty jdk annotations

---
 .../fileOrElement/toKotlinClasses/iterableAndIterator.kt  | 8 ++++----
 .../fileOrElement/toKotlinClasses/iterableAndIterator2.kt | 8 ++++----
 .../fileOrElement/toKotlinClasses/iterableAndIterator3.kt | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
index b4a2d812bb8..3244d70106c 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
@@ -1,9 +1,9 @@
-// ERROR: Null can not be a value of a non-null type kotlin.Iterator<kotlin.String>
-// ERROR: Null can not be a value of a non-null type kotlin.Iterator<kotlin.String>
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
 package demo
 
 class Test : Iterable<String> {
-    override fun iterator(): Iterator<String> {
+    override fun iterator(): Iterator<String>? {
         return null
     }
 
@@ -14,7 +14,7 @@ class Test : Iterable<String> {
 }
 
 class FullTest : Iterable<String> {
-    override fun iterator(): Iterator<String> {
+    override fun iterator(): Iterator<String>? {
         return null
     }
 
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
index 1660b8e4201..33de5debc56 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
@@ -1,11 +1,11 @@
-// ERROR: Null can not be a value of a non-null type kotlin.Iterator<kotlin.String>
-// ERROR: Null can not be a value of a non-null type kotlin.Iterator<kotlin.String>
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
 package demo
 
 import java.util.*
 
 class Test : Iterable<String> {
-    override fun iterator(): Iterator<String> {
+    override fun iterator(): Iterator<String>? {
         return null
     }
 
@@ -16,7 +16,7 @@ class Test : Iterable<String> {
 }
 
 class FullTest : Iterable<String> {
-    override fun iterator(): Iterator<String> {
+    override fun iterator(): Iterator<String>? {
         return null
     }
 
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
index 5240bdcda2f..91948803e27 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
@@ -1,8 +1,8 @@
-// ERROR: Null can not be a value of a non-null type kotlin.Iterator<kotlin.String>
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
 package demo
 
 class Test : Iterable<String> {
-    override fun iterator(): Iterator<String> {
+    override fun iterator(): Iterator<String>? {
         return null
     }
 
@@ -10,4 +10,4 @@ class Test : Iterable<String> {
         val j = i
         return j
     }
-}
\ No newline at end of file
+}