KotlinCompiler and tests aware on standard library

compiler/tests/compiler-tests.iml

@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="cli" />
   </component>
 </module>
 

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

@@ -1,6 +1,10 @@
 package org.jetbrains.jet.codegen;
 
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetLiteFixture;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -9,6 +13,8 @@ import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.parsing.JetParsingTest;
 import org.junit.Assert;
 
+import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

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

@@ -6,6 +6,7 @@ import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
+import org.jetbrains.jet.compiler.CompileEnvironment;
 import org.jetbrains.jet.compiler.CompileSession;
 import org.jetbrains.jet.lang.psi.JetNamespace;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
@@ -30,8 +31,8 @@ public class StdlibTest extends CodegenTestCase {
 
         session.addSources(myFile.getVirtualFile());
         try {
-            session.addSources(addStdLib());
-        } catch (IOException e) {
+            session.addStdLibSources();
+        } catch (Throwable e) {
             throw new RuntimeException(e);
         }
 
@@ -45,9 +46,9 @@ public class StdlibTest extends CodegenTestCase {
     protected ClassFileFactory generateClassesInFile() {
         try {
             CompileSession session = new CompileSession(myEnvironment);
-
+            CompileEnvironment.initializeKotlinRuntime(myEnvironment);
             session.addSources(myFile.getVirtualFile());
-            session.addSources(addStdLib());
+            session.addStdLibSources();
 
             if (!session.analyze(System.out)) {
                 return null;
@@ -57,18 +58,11 @@ public class StdlibTest extends CodegenTestCase {
         } catch (RuntimeException e) {
             System.out.println(generateToText());
             throw e;
-        } catch (IOException e) {
+        } catch (Throwable e) {
             throw new RuntimeException(e);
         }
     }
 
-    private VirtualFile addStdLib() throws IOException {
-        String text = FileUtil.loadFile(new File(JetParsingTest.getTestDataDir() + "/../../stdlib/ktSrc/StandardLibrary.kt"), CharsetToolkit.UTF8).trim();
-        text = StringUtil.convertLineSeparators(text);
-        PsiFile stdLibFile = createFile("StandardLibrary.kt", text);
-        return stdLibFile.getVirtualFile();
-    }
-
     public void testInputStreamIterator () {
         blackBoxFile("inputStreamIterator.jet");
 //        System.out.println(generateToText());
@@ -85,4 +79,16 @@ public class StdlibTest extends CodegenTestCase {
     public void testKt528 () {
         blackBoxFile("regressions/kt528.kt");
     }
+
+    public void testCollectionSize () throws Exception {
+        loadText("import std.util.*; fun box() = if(java.util.Arrays.asList(0, 1, 2)?.size == 3) \"OK\" else \"fail\"");
+//        System.out.println(generateToText());
+        blackBox();
+    }
+
+    public void testCollectionEmpty () throws Exception {
+        loadText("import std.util.*; fun box() = if(java.util.Arrays.asList(0, 1, 2)?.empty ?: false) \"OK\" else \"fail\"");
+//        System.out.println(generateToText());
+        blackBox();
+    }
 }

compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java

@@ -3,20 +3,20 @@ package org.jetbrains.jet.compiler;
 import jet.modules.IModuleBuilder;
 import jet.modules.IModuleSetBuilder;
 import junit.framework.TestCase;
+import org.jetbrains.jet.cli.KotlinCompiler;
 import org.jetbrains.jet.codegen.ClassFileFactory;
 import org.jetbrains.jet.parsing.JetParsingTest;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
 /**
  * @author yole
+ * @author alex.tkachman
  */
 public class CompileEnvironmentTest extends TestCase {
     private CompileEnvironment environment;
@@ -51,6 +51,31 @@ public class CompileEnvironmentTest extends TestCase {
         assertTrue(entries.contains("Smoke/namespace.class"));
     }
 
+    public void testSmokeWithCompiler() throws IOException {
+        File tempFile = File.createTempFile("compilerTest", "compilerTest");
+        try {
+            KotlinCompiler.main(Arrays.asList("-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts", "-jar", tempFile.getAbsolutePath()).toArray(new String[0]));
+            FileInputStream fileInputStream = new FileInputStream(tempFile);
+            try {
+                JarInputStream is = new JarInputStream(fileInputStream);
+                try {
+                    final List<String> entries = listEntries(is);
+                    assertTrue(entries.contains("Smoke/namespace.class"));
+                    assertEquals(1, entries.size());
+                }
+                finally {
+                    is.close();
+                }
+            }
+            finally {
+                fileInputStream.close();
+            }
+        }
+        finally {
+            tempFile.delete();
+        }
+    }
+    
     private List<String> listEntries(JarInputStream is) throws IOException {
         List<String> entries = new ArrayList<String>();
         while (true) {