azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added an integration test that compiles the JS unit tests and generates the QUnit test case

Browse Source
This commit is contained in:
James Strachan
2012-06-14 15:32:57 +01:00
parent 1652d1c009
commit 3546a9ff54
10 changed files with 3781 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/pom.xml
+119 -118
View File
@@ -1,118 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project <project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId> <artifactId>kotlin-project</artifactId>
<version>0.1-SNAPSHOT</version> <version>0.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project-root>../../..</project-root> <project-root>../../..</project-root>
<asm.version>3.3.1</asm.version> <asm.version>3.3.1</asm.version>
<dart.name>dart-r3300</dart.name> <dart.name>dart-r3300</dart.name>
<guava.version>11.0.2</guava.version> <guava.version>11.0.2</guava.version>
<junit-version>4.10</junit-version> <junit-version>4.10</junit-version>
<kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version> <kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version>
<kotlin-dist>${project-root}/dist</kotlin-dist> <kotlin-dist>${project-root}/dist</kotlin-dist>
<kotlin-js-lib-srcdir>${project-root}/js/js.libraries/src</kotlin-js-lib-srcdir> <kotlin-js-lib-srcdir>${project-root}/js/js.libraries/src</kotlin-js-lib-srcdir>
<kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk> <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
<maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target> <maven.compiler.target>1.6</maven.compiler.target>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version> <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
<pegdown.version>1.1.0</pegdown.version> <pegdown.version>1.1.0</pegdown.version>
<surefire-version>2.5</surefire-version> <surefire-version>2.5</surefire-version>
<exec-maven-plugin.version>1.2.1</exec-maven-plugin.version> <exec-maven-plugin.version>1.2.1</exec-maven-plugin.version>
</properties> </properties>
<distributionManagement> <distributionManagement>
<repository> <repository>
<uniqueVersion>false</uniqueVersion> <uniqueVersion>false</uniqueVersion>
<id>jetbrains-kotlin</id> <id>jetbrains-kotlin</id>
<name>jetbrains-kotlin</name> <name>jetbrains-kotlin</name>
<url>http://repository.jetbrains.com/kotlin</url> <url>http://repository.jetbrains.com/kotlin</url>
<layout>default</layout> <layout>default</layout>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<uniqueVersion>false</uniqueVersion> <uniqueVersion>false</uniqueVersion>
<id>jetbrains-kotlin</id> <id>jetbrains-kotlin</id>
<name>jetbrains-kotlin</name> <name>jetbrains-kotlin</name>
<url>http://repository.jetbrains.com/kotlin</url> <url>http://repository.jetbrains.com/kotlin</url>
<layout>default</layout> <layout>default</layout>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<modules> <modules>
<module>tools/kotlin-compiler</module> <module>tools/kotlin-compiler</module>
<module>tools/runtime</module> <module>tools/runtime</module>
<module>tools/kotlin-maven-plugin</module> <module>tools/kotlin-maven-plugin</module>
<module>tools/kotlin-js-library</module> <module>tools/kotlin-js-library</module>
<module>tools/kdoc</module> <module>tools/kotlin-js-tests</module>
<module>tools/kdoc-maven-plugin</module> <module>tools/kdoc</module>
<module>tools/kdoc-maven-plugin</module>
<module>stdlib</module>
<module>kunit</module> <module>stdlib</module>
<module>kotlin-jdbc</module> <module>kunit</module>
<module>kotlin-swing</module> <module>kotlin-jdbc</module>
<module>kotlin-swing</module>
<module>docs/apidoc</module>
<module>docs/website</module> <module>docs/apidoc</module>
<module>docs/website</module>
<module>examples/kotlin-java-example</module>
<module>examples/kotlin-java-example</module>
<module>examples/js-example</module>
<module>examples/browser-example</module> <module>examples/js-example</module>
</modules> <module>examples/browser-example</module>
</modules>
<dependencies>
<dependency> <dependencies>
<groupId>junit</groupId> <dependency>
<artifactId>junit</artifactId> <groupId>junit</groupId>
<version>${junit-version}</version> <artifactId>junit</artifactId>
<scope>test</scope> <version>${junit-version}</version>
</dependency> <scope>test</scope>
</dependencies> </dependency>
</dependencies>
<build>
<pluginManagement> <build>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.3.2</version> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <version>2.3.2</version>
<source>${maven.compiler.source}</source> <configuration>
<target>${maven.compiler.target}</target> <source>${maven.compiler.source}</source>
</configuration> <target>${maven.compiler.target}</target>
</plugin> </configuration>
</plugins> </plugin>
</pluginManagement> </plugins>
</pluginManagement>
<plugins>
<plugin> <plugins>
<artifactId>maven-surefire-plugin</artifactId> <plugin>
<version>${surefire-version}</version> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <version>${surefire-version}</version>
<forkMode>once</forkMode> <configuration>
<useSystemClassLoader>false</useSystemClassLoader> <forkMode>once</forkMode>
<useManifestOnlyJar>false</useManifestOnlyJar> <useSystemClassLoader>false</useSystemClassLoader>
<failIfNoTests>false</failIfNoTests> <useManifestOnlyJar>false</useManifestOnlyJar>
<includes> <failIfNoTests>false</failIfNoTests>
<include>**/*Test.*</include> <includes>
</includes> <include>**/*Test.*</include>
<excludes> </includes>
</excludes> <excludes>
<systemProperties> </excludes>
<project.version>${project.version}</project.version> <systemProperties>
</systemProperties> <project.version>${project.version}</project.version>
</configuration> </systemProperties>
</plugin> </configuration>
</plugins> </plugin>
</build> </plugins>
</project> </build>
</project>
libraries/tools/kotlin-js-library/pom.xml
+4
View File
@@ -65,6 +65,10 @@
</copy> </copy>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js" <copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib.js"/> file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma3.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib_ecma3.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma5.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib_ecma5.js"/>
</target> </target>
</configuration> </configuration>
<goals> <goals>
libraries/tools/kotlin-js-tests/pom.xml
+78
View File
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-js-tests</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/target/tests</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>copy-sources</id>
<phase>process-sources</phase>
<configuration>
<target>
<mkdir dir="${basedir}/target/tests"/>
<copy todir="${basedir}/target/tests">
<fileset dir="${basedir}/../../stdlib/test/js">
<include name="**/*.kt"/>
<exclude name="**/*JVM.kt"/>
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>js</id>
<goals>
<goal>js</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
libraries/tools/kotlin-js-tests/src/test/web/deepEqual.js
+1432
View File
File diff suppressed because it is too large Load Diff
libraries/tools/kotlin-js-tests/src/test/web/headless.html
+24
View File
@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<title>QUnit Test Suite</title>
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen">
<script type="text/javascript" src="qunit.js"></script>
<script type="text/javascript" src="test.js"></script>
<script type="text/javascript" src="deepEqual.js"></script>
<script>
var logs = ["begin", "testStart", "testDone", "log", "moduleStart", "moduleDone", "done"];
for (var i = 0; i < logs.length; i++) {
(function() {
var log = logs[i];
QUnit[log] = function() {
console.log(log, arguments);
};
})();
}
</script>
</head>
<body>
<div id="qunit-fixture">test markup</div>
</body>
</html>
libraries/tools/kotlin-js-tests/src/test/web/index.html
+20
View File
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Kotlin Standard Library Test Suite</title>
<link rel="stylesheet" href="qunit.css">
<script src="qunit.js"></script>
<script src="../../../target/js/kotlin-lib-ecma3.js"></script>
<script src="../../../target/js/kotlin-lib.js"></script>
<script src="../../../target/js/kotlin-js-tests.js"></script>
<script src="deepEqual.js"></script>
<script src="swarminject.js"></script>
</head>
<body>
<div id="qunit"></div>
<div id="qunit-fixture">test markup</div>
</body>
</html>
libraries/tools/kotlin-js-tests/src/test/web/qunit.css
+236
View File
@@ -0,0 +1,236 @@
/**
* QUnit v1.7.0pre - A JavaScript Unit Testing Framework
*
* http://docs.jquery.com/QUnit
*
* Copyright (c) 2012 John Resig, Jörn Zaefferer
* Dual licensed under the MIT (MIT-LICENSE.txt)
* or GPL (GPL-LICENSE.txt) licenses.
*/
/** Font Family and Sizes */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
}
#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
#qunit-tests { font-size: smaller; }
/** Resets */
#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
margin: 0;
padding: 0;
}
/** Header */
#qunit-header {
padding: 0.5em 0 0.5em 1em;
color: #8699a4;
background-color: #0d3349;
font-size: 1.5em;
line-height: 1em;
font-weight: normal;
border-radius: 15px 15px 0 0;
-moz-border-radius: 15px 15px 0 0;
-webkit-border-top-right-radius: 15px;
-webkit-border-top-left-radius: 15px;
}
#qunit-header a {
text-decoration: none;
color: #c2ccd1;
}
#qunit-header a:hover,
#qunit-header a:focus {
color: #fff;
}
#qunit-header label {
display: inline-block;
padding-left: 0.5em;
}
#qunit-banner {
height: 5px;
}
#qunit-testrunner-toolbar {
padding: 0.5em 0 0.5em 2em;
color: #5E740B;
background-color: #eee;
}
#qunit-userAgent {
padding: 0.5em 0 0.5em 2.5em;
background-color: #2b81af;
color: #fff;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
}
/** Tests: Pass/Fail */
#qunit-tests {
list-style-position: inside;
}
#qunit-tests li {
padding: 0.4em 0.5em 0.4em 2.5em;
border-bottom: 1px solid #fff;
list-style-position: inside;
}
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
display: none;
}
#qunit-tests li strong {
cursor: pointer;
}
#qunit-tests li a {
padding: 0.5em;
color: #c2ccd1;
text-decoration: none;
}
#qunit-tests li a:hover,
#qunit-tests li a:focus {
color: #000;
}
#qunit-tests ol {
margin-top: 0.5em;
padding: 0.5em;
background-color: #fff;
border-radius: 15px;
-moz-border-radius: 15px;
-webkit-border-radius: 15px;
box-shadow: inset 0px 2px 13px #999;
-moz-box-shadow: inset 0px 2px 13px #999;
-webkit-box-shadow: inset 0px 2px 13px #999;
}
#qunit-tests table {
border-collapse: collapse;
margin-top: .2em;
}
#qunit-tests th {
text-align: right;
vertical-align: top;
padding: 0 .5em 0 0;
}
#qunit-tests td {
vertical-align: top;
}
#qunit-tests pre {
margin: 0;
white-space: pre-wrap;
word-wrap: break-word;
}
#qunit-tests del {
background-color: #e0f2be;
color: #374e0c;
text-decoration: none;
}
#qunit-tests ins {
background-color: #ffcaca;
color: #500;
text-decoration: none;
}
/*** Test Counts */
#qunit-tests b.counts { color: black; }
#qunit-tests b.passed { color: #5E740B; }
#qunit-tests b.failed { color: #710909; }
#qunit-tests li li {
margin: 0.5em;
padding: 0.4em 0.5em 0.4em 0.5em;
background-color: #fff;
border-bottom: none;
list-style-position: inside;
}
/*** Passing Styles */
#qunit-tests li li.pass {
color: #5E740B;
background-color: #fff;
border-left: 26px solid #C6E746;
}
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
#qunit-tests .pass .test-name { color: #366097; }
#qunit-tests .pass .test-actual,
#qunit-tests .pass .test-expected { color: #999999; }
#qunit-banner.qunit-pass { background-color: #C6E746; }
/*** Failing Styles */
#qunit-tests li li.fail {
color: #710909;
background-color: #fff;
border-left: 26px solid #EE5757;
white-space: pre;
}
#qunit-tests > li:last-child {
border-radius: 0 0 15px 15px;
-moz-border-radius: 0 0 15px 15px;
-webkit-border-bottom-right-radius: 15px;
-webkit-border-bottom-left-radius: 15px;
}
#qunit-tests .fail { color: #000000; background-color: #EE5757; }
#qunit-tests .fail .test-name,
#qunit-tests .fail .module-name { color: #000000; }
#qunit-tests .fail .test-actual { color: #EE5757; }
#qunit-tests .fail .test-expected { color: green; }
#qunit-banner.qunit-fail { background-color: #EE5757; }
/** Result */
#qunit-testresult {
padding: 0.5em 0.5em 0.5em 2.5em;
color: #2b81af;
background-color: #D2E0E6;
border-bottom: 1px solid white;
}
#qunit-testresult .module-name {
font-weight: bold;
}
/** Fixture */
#qunit-fixture {
position: absolute;
top: -10000px;
left: -10000px;
width: 1000px;
height: 1000px;
}
libraries/tools/kotlin-js-tests/src/test/web/qunit.js
+1803
View File
File diff suppressed because it is too large Load Diff
libraries/tools/kotlin-js-tests/src/test/web/swarminject.js
+9
View File
@@ -0,0 +1,9 @@
// load testswarm agent
(function() {
var url = window.location.search;
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
if ( !url || url.indexOf("http") !== 0 ) {
return;
}
document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>");
})();
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+56 -44
View File
@@ -39,6 +39,8 @@ import java.nio.charset.Charset;
*/ */
public class K2JSCompilerMojo extends KotlinCompileMojo { public class K2JSCompilerMojo extends KotlinCompileMojo {
public static final String KOTLIN_JS_LIB = "kotlin-lib.js"; public static final String KOTLIN_JS_LIB = "kotlin-lib.js";
public static final String KOTLIN_JS_LIB_ECMA3 = "kotlin-lib-ecma3.js";
public static final String KOTLIN_JS_LIB_ECMA5 = "kotlin-lib-ecma5.js";
/** /**
* The output JS file name * The output JS file name
@@ -52,10 +54,10 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
* The output Kotlin JS file * The output Kotlin JS file
* *
* @required * @required
* @parameter default-value="${project.build.directory}/js/kotlin-lib.js" * @parameter default-value="${project.build.directory}/js"
* @parameter expression="${outputKotlinJSFile}" * @parameter expression="${outputKotlinJSFile}"
*/ */
private File outputKotlinJSFile; private File outputKotlinJSDir;
/** /**
* Whether to copy the kotlin-lib.js file to the output directory * Whether to copy the kotlin-lib.js file to the output directory
@@ -83,52 +85,62 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
@Override @Override
public void execute() throws MojoExecutionException, MojoFailureException { public void execute() throws MojoExecutionException, MojoFailureException {
super.execute();
if (copyLibraryJS != null && copyLibraryJS.booleanValue()) {
getLog().info("Copying kotlin JS library to " + outputKotlinJSFile);
// lets copy the kotlin library into the output directory
try {
File parentFile = outputKotlinJSFile.getParentFile();
parentFile.mkdirs();
final InputStream inputStream = MetaInfServices.loadClasspathResource(KOTLIN_JS_LIB);
if (inputStream == null) {
System.out.println("WARNING: Could not find " + KOTLIN_JS_LIB + " on the classpath!");
} else {
InputSupplier<InputStream> inputSupplier = new InputSupplier<InputStream>() {
@Override
public InputStream getInput() throws IOException {
return inputStream;
}
};
Files.copy(inputSupplier, outputKotlinJSFile);
}
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage(), e);
}
}
if (appendLibraryJS != null && appendLibraryJS.booleanValue()) { if (appendLibraryJS != null && appendLibraryJS.booleanValue()) {
getLog().info("Appending Kotlin Library JS to the generated file " + outputFile); getLog().info("Appending Kotlin Library JS to the generated file " + outputFile);
// lets copy the kotlin library into the output directory appendFile(KOTLIN_JS_LIB_ECMA3);
try { appendFile(KOTLIN_JS_LIB);
final InputStream inputStream = MetaInfServices.loadClasspathResource(KOTLIN_JS_LIB); }
if (inputStream == null) { super.execute();
System.out.println("WARNING: Could not find " + KOTLIN_JS_LIB + " on the classpath!"); if (copyLibraryJS != null && copyLibraryJS.booleanValue()) {
} else { getLog().info("Copying kotlin JS library to " + outputKotlinJSDir);
InputSupplier<InputStream> inputSupplier = new InputSupplier<InputStream>() {
@Override copyJsLibraryFile(KOTLIN_JS_LIB);
public InputStream getInput() throws IOException { copyJsLibraryFile(KOTLIN_JS_LIB_ECMA3);
return inputStream; copyJsLibraryFile(KOTLIN_JS_LIB_ECMA5);
} }
}; }
String text = "\n" + FileUtil.loadTextAndClose(inputStream);
Charset charset = Charset.defaultCharset(); protected void appendFile(String jsLib) throws MojoExecutionException {
Files.append(text, new File(outputFile), charset); // lets copy the kotlin library into the output directory
} try {
} catch (IOException e) { final InputStream inputStream = MetaInfServices.loadClasspathResource(jsLib);
throw new MojoExecutionException(e.getMessage(), e); if (inputStream == null) {
System.out.println("WARNING: Could not find " + jsLib + " on the classpath!");
} else {
InputSupplier<InputStream> inputSupplier = new InputSupplier<InputStream>() {
@Override
public InputStream getInput() throws IOException {
return inputStream;
}
};
String text = "\n" + FileUtil.loadTextAndClose(inputStream);
Charset charset = Charset.defaultCharset();
Files.append(text, new File(outputFile), charset);
} }
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage(), e);
}
}
protected void copyJsLibraryFile(String jsLib) throws MojoExecutionException {
// lets copy the kotlin library into the output directory
try {
outputKotlinJSDir.mkdirs();
final InputStream inputStream = MetaInfServices.loadClasspathResource(jsLib);
if (inputStream == null) {
System.out.println("WARNING: Could not find " + jsLib + " on the classpath!");
} else {
InputSupplier<InputStream> inputSupplier = new InputSupplier<InputStream>() {
@Override
public InputStream getInput() throws IOException {
return inputStream;
}
};
Files.copy(inputSupplier, new File(outputKotlinJSDir, jsLib));
}
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage(), e);
} }
} }