Remove module integration-tests, merge into compiler-tests

2015-01-03 12:28:54 +03:00
parent cd79c4573d
commit 5c9750ae6b
147 changed files with 28 additions and 46 deletions
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,11 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar">
+            <compilerarg value="-Xno-inline"/>
+            <compilerarg line="-Xno-call-assertions -Xno-param-assertions"/>
+            <compilerarg value="-Xno-optimize"/>
+        </kotlinc>
+    </target>
+</project>
@@ -0,0 +1,7 @@
+package hello
+
+fun main(args : Array<String>) {
+    for (s in listOf("a")) {
+        println("Hello, $s!")
+    }
+}
@@ -0,0 +1,4 @@
+OUT:
+Hello, a!
+
+Return code: 0
@@ -0,0 +1,14 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+    [mkdir] Created dir: [Temp]/classes
+    [javac] Compiling 1 source file to [Temp]/classes
+    [javac] Compiling [[TestData]/root1] => [[Temp]/classes]
+    [javac] Running javac...
+      [jar] Building jar: [Temp]/hello.jar
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,23 @@
+<project name="Ant Task Test" default="build">
+
+  <path id="classpath">
+    <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
+    <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
+  </path>
+
+  <typedef name = "withKotlin" classname = "org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter"/>
+
+  <target name="build">
+      <delete dir="${temp}/classes" failonerror="false"/>
+      <mkdir dir="${temp}/classes"/>
+      <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
+        <classpath refid="classpath"/>
+        <withKotlin externalannotations="${test.data}/root1/b/">
+          <externalannotations path="${test.data}/root1/a/" />
+        </withKotlin>
+      </javac>
+      <jar destfile="${temp}/hello.jar">
+        <fileset dir="${temp}/classes"/>
+      </jar>
+  </target>
+</project>
@@ -0,0 +1,5 @@
+OUT:
+Hello, a!
+Java Hello
+
+Return code: 0
@@ -0,0 +1,5 @@
+<root>
+  <item name='j.Java java.lang.String f()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+</root>
@@ -0,0 +1,5 @@
+<root>
+  <item name='j.Java java.lang.String f2()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+</root>
@@ -0,0 +1,9 @@
+package hello
+
+fun main(args : Array<String>) {
+    for (s in arrayList("a"))
+      println("Hello, $s!")
+    val java: String = j.Java().f()
+    val hello: String = j.Java().f2()
+    println("$java $hello")
+}
@@ -0,0 +1,20 @@
+package j;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.String;
+import java.lang.System;
+
+public class Java {
+    public String f() {
+        return "Java";
+    }
+
+    public String f2() {
+        return "Hello";
+    }
+
+    public static void main(String[] args) {
+        hello.HelloPackage.main(new String[] {});
+    }
+}
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,7 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/>
+    </target>
+</project>
@@ -0,0 +1,7 @@
+package hello
+
+fun main(args : Array<String>) {
+    for (s in arrayList("a"))
+      println("Hello, $s!")
+
+}
@@ -0,0 +1,4 @@
+OUT:
+Hello, a!
+
+Return code: 0
@@ -0,0 +1,14 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+    [mkdir] Created dir: [Temp]/classes
+    [javac] Compiling 1 source file to [Temp]/classes
+    [javac] Compiling [[TestData]/root1] => [[Temp]/classes]
+    [javac] Running javac...
+      [jar] Building jar: [Temp]/hello.jar
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,18 @@
+<project name="Ant Task Test" default="build">
+
+  <path id="classpath">
+    <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
+  </path>
+
+  <target name="build">
+        <delete dir="${temp}/classes" failonerror="false"/>
+        <mkdir dir="${temp}/classes"/>
+        <javac destdir="${temp}/classes" includeantruntime="false" compiler="org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter">
+          <src path="${test.data}/root1"/>
+          <classpath refid="classpath"/>
+        </javac>
+        <jar destfile="${temp}/hello.jar">
+          <fileset dir="${temp}/classes"/>
+        </jar>
+    </target>
+</project>
@@ -0,0 +1,5 @@
+OUT:
+Hello, a!
+Java
+
+Return code: 0
@@ -0,0 +1,7 @@
+package hello
+
+fun main(args : Array<String>) {
+    for (s in arrayList("a"))
+      println("Hello, $s!")
+    j.Java().f();
+}
@@ -0,0 +1,14 @@
+package j;
+
+import java.lang.String;
+import java.lang.System;
+
+public class Java {
+    public void f() {
+        System.out.println("Java");
+    }
+
+    public static void main(String[] args) {
+        hello.HelloPackage.main(new String[] {});
+    }
+}
@@ -0,0 +1,11 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
+  [kotlinc] WARNING: [TestData]/hello.kt: (15, 9) Variable 'result' is never used
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,7 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/>
+    </target>
+</project>
@@ -0,0 +1,18 @@
+package hello
+
+import sun.nio.cs.ext.Big5
+import sun.net.spi.nameservice.dns.DNSNameService
+import javax.crypto.Cipher
+import com.sun.crypto.provider.SunJCE
+import sun.nio.ByteBuffered
+
+fun main(args : Array<String>) {
+    val a = Big5() // charsets.jar
+    val c = DNSNameService() // dnsns.ajr
+    val e : Cipher? = null // jce.jar
+    val f : SunJCE? = null // sunjce_provider.jar
+    val j : ByteBuffered? = null // rt.jar
+    val result = "$a$c$e$f$j"
+    println("OK")
+}
+
@@ -0,0 +1,4 @@
+OUT:
+OK
+
+Return code: 0
@@ -0,0 +1,13 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+    [mkdir] Created dir: [Temp]/classes
+  [kotlinc] Compiling [[TestData]/root1] => [[Temp]/classes]
+    [javac] Compiling 1 source file to [Temp]/classes
+      [jar] Building jar: [Temp]/hello.jar
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,24 @@
+<project name="Ant Task Test" default="build">
+
+  <path id="classpath">
+    <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
+    <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
+  </path>
+
+  <taskdef name = "kotlinc" classname = "org.jetbrains.jet.buildtools.ant.Kotlin2JvmTask"/>
+
+  <target name="build">
+      <delete dir="${temp}/classes" failonerror="false"/>
+      <mkdir dir="${temp}/classes"/>
+      <kotlinc output="${temp}/classes" src="${test.data}/root1" externalannotations="${test.data}/root1/b/">
+        <classpath refid="classpath"/>
+        <externalannotations path="${test.data}/root1/a/" />
+      </kotlinc>
+      <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
+        <classpath refid="classpath"/>
+      </javac>
+      <jar destfile="${temp}/hello.jar">
+        <fileset dir="${temp}/classes"/>
+      </jar>
+  </target>
+</project>
@@ -0,0 +1,5 @@
+OUT:
+Hello, a!
+Java Hello
+
+Return code: 0
@@ -0,0 +1,5 @@
+<root>
+  <item name='j.Java java.lang.String f()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+</root>
@@ -0,0 +1,5 @@
+<root>
+  <item name='j.Java java.lang.String f2()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+</root>
@@ -0,0 +1,9 @@
+package hello
+
+fun main(args : Array<String>) {
+    for (s in arrayList("a"))
+      println("Hello, $s!")
+    val java: String = j.Java().f()
+    val hello: String = j.Java().f2()
+    println("$java $hello")
+}
@@ -0,0 +1,20 @@
+package j;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.String;
+import java.lang.System;
+
+public class Java {
+    public String f() {
+        return "Java";
+    }
+
+    public String f2() {
+        return "Hello";
+    }
+
+    public static void main(String[] args) {
+        hello.HelloPackage.main(new String[] {});
+    }
+}
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]/root1, [TestData]/root2] => [[Temp]/hello.jar]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,10 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc output="${temp}/hello.jar">
+          <src path="${test.data}/root1"/>
+          <src path="${test.data}/root2"/>
+        </kotlinc>
+    </target>
+</project>
@@ -0,0 +1,4 @@
+OUT:
+Hello, a!
+
+Return code: 0
@@ -0,0 +1,7 @@
+package hello
+
+fun main(args : Array<String>) {
+    for (s in arrayList("a"))
+      println("Hello, $s!")
+    foo()
+}
@@ -0,0 +1,3 @@
+package hello
+
+fun foo() {}
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,7 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" nowarn="true" />
+    </target>
+</project>
@@ -0,0 +1,13 @@
+package hello
+
+fun foo(p: Int??) {
+
+}
+
+trait T {
+    abstract fun foo()
+}
+
+fun main(args : Array<String>) {
+    println("Hi!")
+}
@@ -0,0 +1,4 @@
+OUT:
+Hi!
+
+Return code: 0
@@ -0,0 +1,12 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
+  [kotlinc] LOGGING: Using Kotlin home directory [KotlinProjectHome]/dist/kotlinc
+  [kotlinc] LOGGING: Configuring the compilation environment
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,7 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" verbose="true" />
+    </target>
+</project>
@@ -0,0 +1,5 @@
+package hello
+
+fun main(args : Array<String>) {
+    println("Hi!")
+}
@@ -0,0 +1,4 @@
+OUT:
+Hi!
+
+Return code: 0
@@ -0,0 +1,11 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
+  [kotlinc] INFO: Kotlin Compiler version [KotlinVersion]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,7 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" printVersion="true" />
+    </target>
+</project>
@@ -0,0 +1,5 @@
+package hello
+
+fun main(args : Array<String>) {
+    println("Yo!")
+}
@@ -0,0 +1,4 @@
+OUT:
+Yo!
+
+Return code: 0