Drop poms that are no longer required. Drop separate unit test modules for stdlib js.

This commit is contained in:
Ilya Gorbunov
2017-04-07 01:30:46 +03:00
parent 93f11a6da3
commit 337fd4e180
33 changed files with 5 additions and 5564 deletions
-129
View File
@@ -1,129 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kotlin-test-parent</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>kotlin-test-common</artifactId>
<dependencies>
<!--<dependency>-->
<!--<groupId>org.jetbrains.kotlin</groupId>-->
<!--<artifactId>kotlin-stdlib-common</artifactId>-->
<!--<version>${project.version}</version>-->
<!--</dependency>-->
</dependencies>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<args>
<arg>-Xallow-kotlin-package</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<goals>
<goal>metadata</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
<exclude>kotlin/internal/OnlyInputTypes*</exclude>
<exclude>kotlin/internal/InlineOnly*</exclude>
<exclude>kotlin/internal</exclude>
</excludes>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<!--<profile>-->
<!--<id>kotlin-jvm</id>-->
<!--<activation>-->
<!--<activeByDefault>false</activeByDefault>-->
<!--</activation>-->
<!--<dependencies>-->
<!--<dependency>-->
<!--<groupId>org.jetbrains.kotlin</groupId>-->
<!--<artifactId>kotlin-runtime</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>junit</groupId>-->
<!--<artifactId>junit</artifactId>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--<build>-->
<!--<plugins>-->
<!--<plugin>-->
<!--<groupId>org.jetbrains.kotlin</groupId>-->
<!--<artifactId>kotlin-maven-plugin</artifactId>-->
<!--<configuration>-->
<!--<args>-->
<!--<arg>-Xallow-kotlin-package</arg>-->
<!--</args>-->
<!--</configuration>-->
<!--<executions>-->
<!--<execution>-->
<!--<id>compile</id>-->
<!--<phase>compile</phase>-->
<!--<goals>-->
<!--<goal>compile</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<sourceDirs>-->
<!--<dir>${project.basedir}/src/main/kotlin</dir>-->
<!--<dir>${project.basedir}/src/main/kotlin.jvm</dir>-->
<!--</sourceDirs>-->
<!--</configuration>-->
<!--</execution>-->
<!--<execution>-->
<!--<id>test-compile</id>-->
<!--<phase>test-compile</phase>-->
<!--<goals>-->
<!--<goal>test-compile</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<sourceDirs>-->
<!--<dir>${project.basedir}/src/test/kotlin</dir>-->
<!--<dir>${project.basedir}/src/test/kotlin.jvm</dir>-->
<!--</sourceDirs>-->
<!--</configuration>-->
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->
<!--</plugins>-->
<!--</build>-->
<!--</profile>-->
</profiles>
</project>
-93
View File
@@ -1,93 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kotlin-test-parent</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>kotlin-test-js</artifactId>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-js</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-common</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<configuration>
<args>
<arg>-Xallow-kotlin-package</arg>
<arg>-Xmulti-platform</arg>
</args>
<moduleKind>umd</moduleKind>
<metaInfo>true</metaInfo>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>js</goal>
</goals>
</execution>
<!--<execution>-->
<!--<id>test-compile</id>-->
<!--<phase>test-compile</phase>-->
<!--<goals>-->
<!--<goal>test-compile</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<sourceDirs>-->
<!--<dir>${project.basedir}/src/test/kotlin</dir>-->
<!--<dir>${project.basedir}/src/test/kotlin.jvm</dir>-->
<!--</sourceDirs>-->
<!--</configuration>-->
<!--</execution>-->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<forceCreation>true</forceCreation>
<classesDirectory>${project.build.directory}/js</classesDirectory>
<includes>
<include>**/*.js</include>
<include>**/*.js.map</include>
<include>**/*.kjsm</include>
</includes>
<archive>
<forced />
<manifestEntries>
<Built-By>${user.name}</Built-By>
<Implementation-Vendor>JetBrains s.r.o.</Implementation-Vendor>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
-80
View File
@@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kotlin-test-parent</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>kotlin-test-junit</artifactId>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>(4,5)</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<!--suppress KotlinTestJUnit -->
<artifactId>kotlin-test</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<forceCreation>true</forceCreation>
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
<archive>
<forced />
<manifestEntries>
<Built-By>${user.name}</Built-By>
<Implementation-Vendor>JetBrains s.r.o.</Implementation-Vendor>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<configuration>
<args>
<arg>-Xallow-kotlin-package</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
-68
View File
@@ -1,68 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kotlin-test-parent</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>kotlin-test</artifactId>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-common</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<configuration>
<args>
<arg>-Xallow-kotlin-package</arg>
<arg>-Xmulti-platform</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<!--<execution>-->
<!--<id>test-compile</id>-->
<!--<phase>test-compile</phase>-->
<!--<goals>-->
<!--<goal>test-compile</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<sourceDirs>-->
<!--<dir>${project.basedir}/src/test/kotlin</dir>-->
<!--<dir>${project.basedir}/src/test/kotlin.jvm</dir>-->
<!--</sourceDirs>-->
<!--</configuration>-->
<!--</execution>-->
</executions>
</plugin>
</plugins>
</build>
</project>
-95
View File
@@ -1,95 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
<artifactId>kotlin-test-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>common</module>
<module>jvm</module>
<module>js</module>
<module>junit</module>
</modules>
<properties>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<forkCount>2C</forkCount>
<reuseForks>true</reuseForks>
</configuration>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>0.0.26</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>kotlin-jvm</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>kotlin-js</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
</profile>
</profiles>
</project>
-16
View File
@@ -85,28 +85,12 @@
<module>tools/kotlin-build-common-test</module>
<module>tools/kotlin-maven-plugin</module>
<!--<module>tools/runtime</module>-->
<!--<module>tools/script-runtime</module>-->
<!--<module>kotlin.test</module>-->
<!--<module>stdlib/common</module>-->
<!--<module>stdlib</module>-->
<!--<module>stdlib/jre7</module>-->
<!--<module>stdlib/jre8</module>-->
<!--<module>stdlib/samples</module>-->
<!--<module>tools/kotlin-reflect</module>-->
<module>tools/kotlin-osgi-bundle</module>
<module>tools/maven-archetypes</module>
<!--<module>tools/binary-compatibility-validator</module>-->
<!--NB! kotlin-js-library should be built before kotlin-gradle-plugin-integration-tests-->
<!--because it is used in tests but cannot be added as test-dependency-->
<!--(kotlin-gradle-plugin module will be recognized as kotlin-js module)-->
<module>tools/idl2k</module>
<!--<module>tools/kotlin-js-library</module>-->
<!--<module>tools/kotlin-js-tests</module>-->
<!--<module>tools/kotlin-js-tests-junit</module>-->
<module>tools/kotlin-annotation-processing</module>
<module>tools/kotlin-annotation-processing-maven</module>
<module>tools/kotlin-allopen</module>
-7
View File
@@ -28,10 +28,7 @@ include ':kotlin-reflect'
//include ':kotlin-archetypes-parent:kotlin-archetype-jvm'
//include ':kotlin-archetypes-parent:kotlin-archetype-js'
//include ':kotlin-archetypes-parent'
//include ':binary-compatibility-validator'
//include ':idl2k'
//include ':kotlin-js-tests'
//include ':kotlin-js-tests-junit'
//include ':kotlin-annotation-processing'
//include ':kotlin-allopen'
//include ':kotlin-maven-allopen'
@@ -42,7 +39,6 @@ include ':kotlin-reflect'
//include ':kotlin-android-extensions'
//include ':kotlin-maven-plugin-test'
//include ':kotlin-script-util'
//include ':kotlin-stdlib-samples'
//include ':annotation-processor-example'
//include ':kotlin-java-example'
//include ':js-example'
@@ -80,10 +76,7 @@ project(':kotlin-reflect').projectDir = "$rootDir/tools/kotlin-reflect" as File
//project(':kotlin-archetypes-parent:kotlin-archetype-jvm').projectDir = "$rootDir/tools/maven-archetypes/kotlin-archetype-jvm" as File
//project(':kotlin-archetypes-parent:kotlin-archetype-js').projectDir = "$rootDir/tools/maven-archetypes/kotlin-archetype-js" as File
//project(':kotlin-archetypes-parent').projectDir = "$rootDir/tools/maven-archetypes" as File
//project(':binary-compatibility-validator').projectDir = "$rootDir/tools/binary-compatibility-validator" as File
//project(':idl2k').projectDir = "$rootDir/tools/idl2k" as File
//project(':kotlin-js-tests').projectDir = "$rootDir/tools/kotlin-js-tests" as File
//project(':kotlin-js-tests-junit').projectDir = "$rootDir/tools/kotlin-js-tests-junit" as File
//project(':kotlin-annotation-processing').projectDir = "$rootDir/tools/kotlin-annotation-processing" as File
//project(':kotlin-allopen').projectDir = "$rootDir/tools/kotlin-allopen" as File
//project(':kotlin-maven-allopen').projectDir = "$rootDir/tools/kotlin-maven-allopen" as File
-125
View File
@@ -1,125 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-stdlib-common</artifactId>
<properties>
<kotlin-home>${kotlin-dist}/kotlinc</kotlin-home>
<pp-profile>JS</pp-profile>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>common-sources</id>
<phase>process-sources</phase>
<configuration>
<target>
<delete dir="${basedir}/target/common-sources" failonerror="false"/>
<mkdir dir="${basedir}/target/common-sources"/>
<java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true">
<classpath>
<pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
</classpath>
<assertions>
<enable/>
</assertions>
<arg value="-cp"/>
<arg value="${kotlin-home}/lib/kotlin-compiler.jar"/>
<arg value="org.jetbrains.kotlin.preprocessor.PreprocessorCLI"/>
<arg value="${basedir}/../src/kotlin"/>
<arg value="${basedir}/target/common-sources"/>
<arg value="${pp-profile}"/>
</java>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>serialize-declarations</id>
<phase>compile</phase>
<configuration>
<target>
<delete dir="${basedir}/target/classes" failonerror="false"/>
<mkdir dir="${basedir}/target/classes"/>
<local name="src.line"/>
<path id="src.path">
<union>
<fileset dir="${basedir}/target/common-sources">
<include name="**/*.kt" />
</fileset>
<fileset dir="${basedir}/src">
<include name="**/*.kt" />
</fileset>
</union>
</path>
<pathconvert property="src.line" refid="src.path" pathsep=" "/>
<java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true">
<classpath>
<pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
</classpath>
<assertions>
<enable/>
</assertions>
<!--
<jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"/>
-->
<arg value="-cp"/>
<arg value="${kotlin-home}/lib/kotlin-compiler.jar"/>
<arg value="org.jetbrains.kotlin.cli.metadata.K2MetadataCompiler"/>
<arg value="-Xallow-kotlin-package" />
<arg value="-d"/>
<arg value="${basedir}/target/classes"/>
<arg line="${src.line}"/>
</java>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
-114
View File
@@ -1,114 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-stdlib-jre7</artifactId>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<jdkHome>${env.JDK_17}</jdkHome>
<args>
<arg>-Xallow-kotlin-package</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<args combine.children="append">
<arg>-Xmultifile-parts-inherit</arg>
<arg>-Xdump-declarations-to</arg>
<arg>${basedir}/target/stdlib-jre7-declarations.json</arg>
</args>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${basedir}/test</sourceDir>
<sourceDir>${basedir}/../test</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<jvm>${env.JDK_17}/bin/java</jvm>
</configuration>
<executions>
<execution>
<id>binary-compatibility-test</id>
<goals> <goal>test</goal> </goals>
<phase>test</phase>
<configuration>
<testSourceDirectory>${basedir}/../test</testSourceDirectory>
<testClassesDirectory>${basedir}/../target/test-classes</testClassesDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
-115
View File
@@ -1,115 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-stdlib-jre8</artifactId>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre7</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<jdkHome>${env.JDK_18}</jdkHome>
<jvmTarget>1.8</jvmTarget>
<args>
<arg>-Xallow-kotlin-package</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<args combine.children="append">
<arg>-Xmultifile-parts-inherit</arg>
<arg>-Xdump-declarations-to</arg>
<arg>${basedir}/target/stdlib-jre8-declarations.json</arg>
</args>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${basedir}/test</sourceDir>
<sourceDir>${basedir}/../jre7/test</sourceDir>
<sourceDir>${basedir}/../test</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<jvm>${env.JDK_18}/bin/java</jvm>
</configuration>
<executions>
<execution>
<id>binary-compatibility-test</id>
<goals> <goal>test</goal> </goals>
<phase>test</phase>
<configuration>
<testSourceDirectory>${basedir}/../test</testSourceDirectory>
<testClassesDirectory>${basedir}/../target/test-classes</testClassesDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
+5
View File
@@ -0,0 +1,5 @@
## Kotlin Standard Library for JS
The tests of this module can be run and debugged inside any browser by opening the **web/index.html** file in this directory to run the test cases using [Qunit](http://qunitjs.com/).
You should execute `:karmaDependencies` gradle task before running these tests to fetch the required Qunit dependency.
-141
View File
@@ -1,141 +0,0 @@
<?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>1.1-SNAPSHOT</version>
</parent>
<artifactId>kotlin-stdlib</artifactId>
<properties>
<kotlin.compiler.jdkHome>${env.JDK_16}</kotlin.compiler.jdkHome>
</properties>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<args>
<arg>-Xallow-kotlin-package</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<args combine.children="append">
<arg>-Xmultifile-parts-inherit</arg>
<arg>-Xdump-declarations-to</arg>
<arg>${basedir}/target/stdlib-declarations.json</arg>
</args>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<args combine.children="append">
<arg>-Xmulti-platform</arg>
</args>
<sourceDirs>
<dir>${project.basedir}/test</dir>
<dir>${project.basedir}/../kotlin.test/common/src/main/kotlin</dir>
<dir>${project.basedir}/../kotlin.test/jvm/src/main/kotlin</dir>
<dir>${project.basedir}/../kotlin.test/junit/src/main/kotlin</dir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<artifactSet>
<includes>
<include>org.jetbrains.kotlin:kotlin-runtime</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>org.jetbrains.kotlin:kotlin-runtime</artifact>
<excludes>
<exclude>META-INF/maven/**</exclude>
</excludes>
</filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<dependencyReducedPomLocation>${basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<createSourcesJar>true</createSourcesJar>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<jvm>${env.JDK_16}/bin/java</jvm>
</configuration>
</plugin>
</plugins>
</build>
</project>
-86
View File
@@ -1,86 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-stdlib-samples</artifactId>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre8</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<jdkHome>${env.JDK_18}</jdkHome>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*.class</include>
</includes>
<forkMode>once</forkMode>
<jvm>${env.JDK_18}/bin/java</jvm>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -1,83 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>binary-compatibility-validator</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-debug-all</artifactId>
<version>5.0.4</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.6.2</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<args combine.children="append">
<arg>-Xdump-declarations-to</arg>
<arg>${basedir}/target/cases-declarations.json</arg>
</args>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
-45
View File
@@ -1,45 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-stdlib-js</artifactId>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-jar</id>
<phase>package</phase>
<configuration>
<tasks>
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-stdlib-js.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
overwrite="true" verbose="true"/>
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-stdlib-js-sources.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar"
overwrite="true" verbose="true"/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
@@ -1 +0,0 @@
# This file is here in order to force creating sources archive.
@@ -1,7 +0,0 @@
## Kotlin Standard Library JS Tests JUnit Runner
This module runs the QUnit JavaScript tests for the Kotlin Standard library inside JUnit using [Selenium WebDriver](http://seleniumhq.org/projects/webdriver/) to run the QUnit code inside any of the drivers available.
This means we can run the tests automatically in any CI server like TeamCity, Jenkins, Hudson and use any WebDriver provider; such as for FireFox / Chrome / IE etc.
By default we use the HtmlUnitDriver so it runs using an in memory HTML / JavaScript engine.
@@ -1,94 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-js-tests-junit</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-tests</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-js</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<version>${htmlunit.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<jvm>${env.JDK_18}/bin/java</jvm>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -1,89 +0,0 @@
package org.jetbrains.kotlin.js.qunit
import org.openqa.selenium.By
import org.openqa.selenium.TimeoutException
import org.openqa.selenium.WebDriver
import org.openqa.selenium.WebElement
import org.openqa.selenium.support.ui.WebDriverWait
import kotlin.test.assertNotNull
import kotlin.test.fail
private val TIMEOUT_PER_INIT: Long = 10
private val TIMEOUT_PER_TEST: Long = 10
/**
* Helper class to find QUnit tests using Selenium
*/
public class SeleniumQUnit(val driver: WebDriver) {
/**
* Returns all the test cases found in the current driver's page
*/
public fun findTests(): List<WebElement> {
val qunitContainer = driver.findElement(By.id("qunit"))!!
waitWhileInit(qunitContainer)
waitWhileTestsRunning(qunitContainer)
var resultsElement = driver.findElement(By.id("qunit-tests"))
assertNotNull(resultsElement, "No qunit test elements could be found in ${driver.currentUrl}")
return resultsElement!!.findElements(By.xpath("li"))?.filterNotNull() ?: arrayListOf<WebElement>()
}
private fun waitWhileInit(qunitContainer: WebElement) {
try {
WebDriverWait(driver, TIMEOUT_PER_INIT).until { qunitContainer.classAttribute !in listOf(null, "running") }
} catch (e: TimeoutException) {
fail("Tests initialization timeout ($TIMEOUT_PER_INIT s)")
}
}
private fun waitWhileTestsRunning(qunitContainer: WebElement) {
val wait = WebDriverWait(driver, TIMEOUT_PER_TEST)
var currentTest = qunitContainer.classAttribute
try {
while (currentTest != "done") {
wait.until { qunitContainer.classAttribute != currentTest }
currentTest = qunitContainer.classAttribute
}
} catch (e: TimeoutException) {
fail("Test $currentTest timeout ($TIMEOUT_PER_TEST s)")
}
}
public fun findTestName(element: WebElement): String {
fun defaultName(name: String?) = name ?: "unknown test name for $element"
try {
val testNameElement = element.findElement(By.xpath("descendant::*[@class = 'test-name']"))
return defaultName(testNameElement!!.text)
} catch (e: Exception) {
return defaultName(element["id"])
}
}
public fun runTest(element: WebElement): Unit {
var result: String
result = element.classAttribute ?: "no result"
if ("pass" != result) {
val testName = "${findTestName(element)} result: $result"
val failMessages =
try {
element.findElements(By.xpath("descendant::li[@class!='pass']/*[@class = 'test-message']"))
.map { "$testName. ${it.text}" }
} catch (e: Exception) {
listOf("test result for test case $testName")
}
for (message in failMessages)
println("FAILED: $message")
fail(failMessages.joinToString("\n"))
}
}
private operator fun WebElement.get(id: String): String? = getAttribute(id)
private val WebElement.classAttribute: String?
get() = this["class"]
}
@@ -1,54 +0,0 @@
/**
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package tests;
import org.jetbrains.kotlin.js.qunit.SeleniumQUnit;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.firefox.FirefoxProfile;
/**
*/
@RunWith(Parameterized.class)
public class SeleniumFireFox extends SeleniumTest {
static {
driver = createFirefoxDriver();
tester = new SeleniumQUnit(driver);
}
public static FirefoxDriver createFirefoxDriver() {
FirefoxProfile profile = new FirefoxProfile();
FirefoxDriver answer = new FirefoxDriver(profile);
return answer;
}
public SeleniumFireFox(WebElement element, String name) {
super(element, name);
}
/*
@Parameterized.Parameters
public static List<Object[]> findTestElements() throws IOException, InterruptedException {
return SeleniumTest.findTestElements();
}
*/
}
@@ -1,86 +0,0 @@
/**
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package tests;
import com.gargoylesoftware.htmlunit.BrowserVersion;
import org.jetbrains.kotlin.js.qunit.SeleniumQUnit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
import java.io.File;
import java.io.IOException;
import java.lang.InterruptedException;
import java.util.ArrayList;
import java.util.List;
/**
*/
@RunWith(Parameterized.class)
public class SeleniumTest {
protected static String testQueryString = "";
//protected static String testQueryString = "?testNumber=6";
protected static class HtmlUnitDriverWithExceptionOnFailingStatusCode extends HtmlUnitDriver {
HtmlUnitDriverWithExceptionOnFailingStatusCode() {
super(BrowserVersion.CHROME);
getWebClient().getOptions().setThrowExceptionOnFailingStatusCode(true);
}
}
protected static WebDriver driver = createDriver();
public static WebDriver createDriver() {
HtmlUnitDriver answer = new HtmlUnitDriverWithExceptionOnFailingStatusCode();
answer.setJavascriptEnabled(true);
return answer;
}
protected static SeleniumQUnit tester = new SeleniumQUnit(driver);
private final WebElement element;
public SeleniumTest(WebElement element, String name) {
this.element = element;
}
@Test
public void run() {
tester.runTest(element);
}
@Parameterized.Parameters(name = "{1}")
public static List<Object[]> findTestElements() throws IOException, InterruptedException {
String uri = "../kotlin-js-tests/src/test/web/index.html" + testQueryString;
File file = new File(uri);
driver.get("file://" + file.getCanonicalPath());
Thread.sleep(500);
List<WebElement> tests = tester.findTests();
List<Object[]> list = new ArrayList<Object[]>();
for (WebElement test : tests) {
Object[] args = new Object[] { test, tester.findTestName(test) };
list.add(args);
}
return list;
}
}
@@ -1,23 +0,0 @@
package tests
import org.junit.*
import org.junit.runners.AllTests
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
import org.junit.runners.Parameterized.Parameters
/*
[RunWith(javaClass<Parameterized>())]
public class SeleniumTest(val id: String) {
Test public fun checkQUnitTest(): Unit {
println("Testing $id")
}
companion object {
Parameters public fun findSeleniumUris(): List<String> {
return arrayList("a", "b")
}
}
}
*/
@@ -1,7 +0,0 @@
## Kotlin Standard Library JS Tests
This module generates the JavaScript code for a number of JUnit test cases from the stdlib module.
The tests can then be ran inside any browser by opening the **src/test/web/index.html** file in this directory to run the test cases using [Qunit](http://qunitjs.com/)
To run the tests in JUnit as part of the maven build, see the **../kotlin-js-tests-runner** module
-146
View File
@@ -1,146 +0,0 @@
<?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>1.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-stdlib-js</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-js</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<properties>
<kotlin-home>${kotlin-dist}/kotlinc</kotlin-home>
<pp-profile>JS</pp-profile>
</properties>
<build>
<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>
<delete dir="${basedir}/target/tests" failonerror="false"/>
<mkdir dir="${basedir}/target/tests"/>
<java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true">
<classpath>
<pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
</classpath>
<assertions>
<enable/>
</assertions>
<arg value="-cp"/>
<arg value="${kotlin-home}/lib/kotlin-compiler.jar"/>
<arg value="org.jetbrains.kotlin.preprocessor.PreprocessorCLI"/>
<arg value="${basedir}/../../stdlib/test"/>
<arg value="${basedir}/target/tests"/>
<arg value="${pp-profile}"/>
</java>
<copy todir="${basedir}/target/tests">
<fileset dir="${basedir}/../../../js/js.libraries/test">
<include name="**/*.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>
<configuration>
<args>
<arg>-Xallow-kotlin-package</arg>
</args>
</configuration>
<executions>
<execution>
<id>js</id>
<phase>compile</phase>
<goals>
<goal>js</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${basedir}/target/tests</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-js</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes>
</artifactItem>
<artifactItem>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-js</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
File diff suppressed because it is too large Load Diff
@@ -1,24 +0,0 @@
<!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>
@@ -1,32 +0,0 @@
<!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/lib/kotlin.js"></script>
<script src="../../../target/js/lib/kotlin-test-js.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>
<script>
var qunitDiv = document.getElementById("qunit");
qunitDiv.className = "running";
QUnit.testStart(function (details) {
qunitDiv.className = "" + details.name;
});
QUnit.done(function () {
qunitDiv.className = "done";
});
</script>
</body>
</html>
@@ -1,236 +0,0 @@
/**
* 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;
}
File diff suppressed because it is too large Load Diff
@@ -1,9 +0,0 @@
// 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>");
})();
-100
View File
@@ -1,100 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-reflect</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-jar</id>
<phase>package</phase>
<configuration>
<tasks>
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-reflect.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
overwrite="true" verbose="true"/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>empty-javadoc-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>javadoc</classifier>
<classesDirectory>${basedir}/javadoc</classesDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${kotlin-dist}/kotlin-reflect-sources-for-maven.jar</file>
<type>jar</type>
<classifier>sources</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
-154
View File
@@ -1,154 +0,0 @@
<?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>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-runtime</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>13.0</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>target/copied-sources</sourceDirectory>
<resources>
<resource>
<directory>${basedir}/../../../dist/builtins</directory>
<includes>
<include>**/*.kotlin_builtins</include>
</includes>
</resource>
</resources>
<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>
<delete dir="${basedir}/target/copied-sources" failonerror="false"/>
<copy todir="${basedir}/target/copied-sources">
<fileset dir="${basedir}/../../../core/builtins/src"/>
<fileset dir="${basedir}/../../../core/runtime.jvm/src">
<exclude name="org/jetbrains/annotations/**"/>
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>attach-empty-javadoc</id>
<phase>prepare-package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<skipAttach>true</skipAttach>
</configuration>
</execution>
<execution>
<id>add-native-sources</id>
<phase>prepare-package</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${basedir}/../../../core/builtins/native</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<args>
<arg>-Xallow-kotlin-package</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<args combine.children="append">
<arg>-Xdump-declarations-to</arg>
<arg>${basedir}/target/runtime-declarations.json</arg>
<arg>-cp</arg>
<arg>${basedir}/../../../dist/builtins</arg>
</args>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
-70
View File
@@ -1,70 +0,0 @@
<?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>
<properties>
<maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
<maven.version>3.0.4</maven.version>
</properties>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-script-runtime</artifactId>
<packaging>jar</packaging>
<description>the Kotlin script runtime</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>empty-sources-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<skipIfEmpty>false</skipIfEmpty>
<classifier>sources</classifier>
<classesDirectory>${basedir}/sources</classesDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-jar</id>
<phase>package</phase>
<configuration>
<tasks>
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-script-runtime.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
overwrite="true" verbose="true"/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>