From abaf31fba155f2f75767b35ce035806225d42b93 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 5 Dec 2011 16:15:52 +0400
Subject: [PATCH] added test for "KT-671 Support for Integer.valueOf()"

---
 .../jetbrains/jet/j2k/visitors/ExpressionVisitor.java |  2 +-
 src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java   | 11 -----------
 testData/ast/boxedType/file/kt-671.jav                |  8 ++++++++
 testData/ast/boxedType/file/kt-671.kt                 |  7 +++++++
 4 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 testData/ast/boxedType/file/kt-671.jav
 create mode 100644 testData/ast/boxedType/file/kt-671.kt

diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
index 5e0fc77987b..4020ba6480a 100644
--- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
@@ -183,7 +183,7 @@ public class ExpressionVisitor extends StatementVisitor {
   }
 
   @Override
-  public void visitMethodCallExpression(PsiMethodCallExpression expression) {
+  public void visitMethodCallExpression(@NotNull PsiMethodCallExpression expression) {
     super.visitMethodCallExpression(expression);
     if (!SuperVisitor.isSuper(expression.getMethodExpression()) || !isInsidePrimaryConstructor(expression))
       myResult = // TODO: not resolved
diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java
index e04eda63173..7be5bc4b804 100644
--- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java
@@ -155,14 +155,3 @@ public class TypeVisitor extends PsiTypeVisitor<Type> {
   }
 }
 
-class Test implements Iterable<String> {
-  @Override
-  public Iterator<String> iterator() {
-    return null;
-  }
-
-  public Iterator<String> push(Iterator<String> i) {
-    Iterator<String> j = i;
-    return j;
-  }
-}
\ No newline at end of file
diff --git a/testData/ast/boxedType/file/kt-671.jav b/testData/ast/boxedType/file/kt-671.jav
new file mode 100644
index 00000000000..520765b7b08
--- /dev/null
+++ b/testData/ast/boxedType/file/kt-671.jav
@@ -0,0 +1,8 @@
+package demo;
+
+class Test {
+  void test() {
+    Integer i = Integer.valueOf(100);
+    Short s = Short.valueOf(100);
+  }
+}
\ No newline at end of file
diff --git a/testData/ast/boxedType/file/kt-671.kt b/testData/ast/boxedType/file/kt-671.kt
new file mode 100644
index 00000000000..a8da231e104
--- /dev/null
+++ b/testData/ast/boxedType/file/kt-671.kt
@@ -0,0 +1,7 @@
+namespace demo
+open class Test() {
+open fun test() : Unit {
+var i : Int? = Integer.valueOf(100)
+var s : Short? = Short.valueOf(100)
+}
+}
\ No newline at end of file