Merge branch 'master' of ssh://git.labs.intellij.net/jet

compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java

@@ -56,42 +56,42 @@ public class ArrayGenTest extends CodegenTestCase {
     }
 
     public void testIterator () throws Exception {
-        loadText("fun box() { val x = Array<Int>(5, { it } ).iterator(); while(x.hasNext()) { java.lang.System.out?.println(x.next()) } }");
+        loadText("fun box() { val x = Array<Int>(5, { it } ).iterator(); while(x.hasNext) { java.lang.System.out?.println(x.next()) } }");
         System.out.println(generateToText());
         Method foo = generateFunction();
         foo.invoke(null);
     }
 
     public void testPrimitiveIterator () throws Exception {
-        loadText("fun box() { val x = ByteArray(5).iterator(); while(x.hasNext()) { java.lang.System.out?.println(x.next()) } }");
+        loadText("fun box() { val x = ByteArray(5).iterator(); while(x.hasNext) { java.lang.System.out?.println(x.next()) } }");
         System.out.println(generateToText());
         Method foo = generateFunction();
         foo.invoke(null);
     }
 
     public void testLongIterator () throws Exception {
-        loadText("fun box() { val x = LongArray(5).iterator(); while(x.hasNext()) { java.lang.System.out?.println(x.next()) } }");
+        loadText("fun box() { val x = LongArray(5).iterator(); while(x.hasNext) { java.lang.System.out?.println(x.next()) } }");
         System.out.println(generateToText());
         Method foo = generateFunction();
         foo.invoke(null);
     }
 
     public void testCharIterator () throws Exception {
-        loadText("fun box() { val x = CharArray(5).iterator(); while(x.hasNext()) { java.lang.System.out?.println(x.next()) } }");
+        loadText("fun box() { val x = CharArray(5).iterator(); while(x.hasNext) { java.lang.System.out?.println(x.next()) } }");
         System.out.println(generateToText());
         Method foo = generateFunction();
         foo.invoke(null);
     }
 
     public void testArrayIndices () throws Exception {
-        loadText("fun box() { val x = Array<Int>(5, {it}).indices.iterator(); while(x.hasNext()) { java.lang.System.out?.println(x.next()) } }");
+        loadText("fun box() { val x = Array<Int>(5, {it}).indices.iterator(); while(x.hasNext) { java.lang.System.out?.println(x.next()) } }");
         System.out.println(generateToText());
         Method foo = generateFunction();
         foo.invoke(null);
     }
 
     public void testCharIndices () throws Exception {
-        loadText("fun box() { val x = CharArray(5).indices.iterator(); while(x.hasNext()) { java.lang.System.out?.println(x.next()) } }");
+        loadText("fun box() { val x = CharArray(5).indices.iterator(); while(x.hasNext) { java.lang.System.out?.println(x.next()) } }");
         System.out.println(generateToText());
         Method foo = generateFunction();
         foo.invoke(null);

compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java

@@ -1,5 +1,8 @@
 package org.jetbrains.jet.codegen;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 /**
  * @author alex.tkachman
  */
@@ -13,4 +16,29 @@ public class FunctionGenTest extends CodegenTestCase {
         blackBoxFile("functions/nothisnoclosure.jet");
         System.out.println(generateToText());
     }
+
+    public void testAnyToString () throws InvocationTargetException, IllegalAccessException {
+        loadText("fun foo(x: Any) = x.toString()");
+        System.out.println(generateToText());
+        Method foo = generateFunction();
+        assertEquals("something", foo.invoke(null, "something"));
+        assertEquals("null", foo.invoke(null, new Object[]{null}));
+
+    }
+
+    public void testAnyEqualsNullable () throws InvocationTargetException, IllegalAccessException {
+        loadText("fun foo(x: Any?) = x.equals(\"lala\")");
+        System.out.println(generateToText());
+        Method foo = generateFunction();
+        assertTrue((Boolean) foo.invoke(null, "lala"));
+        assertFalse((Boolean) foo.invoke(null, "mama"));
+    }
+
+    public void testAnyEquals () throws InvocationTargetException, IllegalAccessException {
+        loadText("fun foo(x: Any) = x.equals(\"lala\")");
+        System.out.println(generateToText());
+        Method foo = generateFunction();
+        assertTrue((Boolean) foo.invoke(null, "lala"));
+        assertFalse((Boolean) foo.invoke(null, "mama"));
+    }
 }

compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java

@@ -0,0 +1,29 @@
+package org.jetbrains.jet.codegen;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * @author alex.tkachman
+ */
+public class VarArgTest extends CodegenTestCase {
+    public void testStringArray () throws InvocationTargetException, IllegalAccessException {
+        /*
+        loadText("fun test(vararg ts: String) = ts");
+        System.out.println(generateToText());
+        final Method main = generateFunction();
+        Object[] args = {"mama", "papa"};
+        assertTrue(args == main.invoke(null, args));
+        */
+    }
+
+    public void testIntArray () throws InvocationTargetException, IllegalAccessException {
+        /*
+        loadText("fun test(vararg ts: Int) = ts");
+        System.out.println(generateToText());
+        final Method main = generateFunction();
+        int[] args = {3, 4};
+        assertTrue(args == main.invoke(null, args));
+        */
+    }
+}