Reorganize integration test data

2014-07-30 21:10:33 -07:00
parent 8e17557f5c
commit 3ca6c8615b
101 changed files with 69 additions and 40 deletions
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix" outputPostfix="${test.data}/postfix" />
+  </target>
+</project>
@@ -0,0 +1,3 @@
+/*
+ some postfix
+*/
@@ -0,0 +1,3 @@
+/*
+ some prefix
+*/
@@ -0,0 +1,3 @@
+package foo
+
+fun box(): String = "OK"
@@ -0,0 +1,3 @@
+package bar
+
+fun bar() {}
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1, [TestData]/bar.kt, [TestData]/root2/Foo.kt] => [[Temp]/out.js]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0
@@ -0,0 +1,14 @@
+<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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" >
+       <src>
+         <pathelement path="${test.data}/bar.kt"/>
+         <fileset dir="${test.data}/root2">
+           <include name="**/*.kt"/>
+         </fileset>
+       </src>
+    </kotlin2js>
+  </target>
+</project>
@@ -0,0 +1,7 @@
+package foo
+
+fun box(): String {
+    Foo()
+    bar.bar()
+    return "OK"
+}
@@ -0,0 +1 @@
+function Bar () {}
@@ -0,0 +1,3 @@
+package foo
+
+class Foo
@@ -0,0 +1,13 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+
+ERR:
+
+BUILD FAILED
+[TestData]/build.xml:5: "output" should be specified
+
+Total time: [time]
+
+Return code: 1
@@ -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">
+    <kotlin2js src="${test.data}/root1"/>
+  </target>
+</project>
@@ -0,0 +1,13 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+
+ERR:
+
+BUILD FAILED
+[TestData]/build.xml:5: "src" should be specified
+
+Total time: [time]
+
+Return code: 1
@@ -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">
+    <kotlin2js output="${temp}/out.js"/>
+  </target>
+</project>
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js"  outputPostfix="${test.data}/postfix" />
+  </target>
+</project>
@@ -0,0 +1,3 @@
+/*
+ some postfix
+*/
@@ -0,0 +1,3 @@
+package foo
+
+fun box(): String = "OK"
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
+  </target>
+</project>
@@ -0,0 +1,3 @@
+/*
+ some prefix
+*/
@@ -0,0 +1,3 @@
+package foo
+
+fun box(): String = "OK"
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js"/>
+  </target>
+</project>
@@ -0,0 +1,3 @@
+package foo
+
+fun box(): String = "OK"
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+  </target>
+</project>
@@ -0,0 +1,9 @@
+package foo
+
+var ok = "FAIL"
+
+fun main(args: Array<String>) {
+    ok = "OK"
+}
+
+fun box(): String = ok
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+  </target>
+</project>
@@ -0,0 +1,9 @@
+package foo
+
+var ok = "FAIL"
+
+fun main(args: kotlin.Array<kotlin.String>) {
+    ok = "OK"
+}
+
+fun box(): String = ok
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+  </target>
+</project>
@@ -0,0 +1,9 @@
+package foo
+
+var ok = "FAIL"
+
+fun main(vararg args: kotlin.String) {
+    ok = "OK"
+}
+
+fun box(): String = ok
@@ -0,0 +1,10 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+[kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js]
+
+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">
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" sourcemap="true"/>
+  </target>
+</project>
@@ -0,0 +1,3 @@
+package foo
+
+fun box(): String = "OK"
@@ -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.SingleByte
+import sun.net.spi.nameservice.dns.DNSNameService
+import javax.crypto.Cipher
+import com.sun.java.browser.plugin2.DOM
+import com.sun.crypto.provider.AESCipher
+
+fun main(args : Array<String>) {
+    val a = SingleByte() // charsets.jar
+    val c = DNSNameService() // dnsns.ajr
+    val e : Cipher? = null // jce.jar
+    val f : AESCipher? = null // sunjce_provider.jar
+    val j : DOM? = null // plugin.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.BytecodeCompilerTask"/>
+
+  <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,14 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[[TestData]/hello.kt]] => [[Temp]/hello.jar]
+
+ERR:
+
+BUILD FAILED
+[TestData]/build.xml:5: Invalid argument: -option-never-to-be-supported
+
+Total time: [time]
+
+Return code: 1
@@ -0,0 +1,9 @@
+<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="-option-never-to-be-supported"/>
+        </kotlinc>
+    </target>
+</project>
@@ -0,0 +1,4 @@
+package hello
+
+fun main(args : Array<String>) {
+}