Use K2JSTranslator in StdLibTestBase, add copyright to ClassAliasingMap
This commit is contained in:
@@ -17,18 +17,23 @@
|
||||
*/
|
||||
package org.jetbrains.k2js.test.semantics;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.cli.common.ExitCode;
|
||||
import org.jetbrains.jet.cli.js.K2JSCompiler;
|
||||
import org.jetbrains.jet.cli.js.K2JSCompilerArguments;
|
||||
import org.jetbrains.k2js.config.Config;
|
||||
import org.jetbrains.k2js.config.EcmaVersion;
|
||||
import org.jetbrains.k2js.facade.MainCallParameters;
|
||||
import org.jetbrains.k2js.test.SingleFileTranslationTest;
|
||||
import org.jetbrains.k2js.test.utils.TranslationUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.File;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
||||
@SuppressWarnings("UseOfSystemOutOrSystemErr")
|
||||
abstract class StdLibTestBase extends SingleFileTranslationTest {
|
||||
|
||||
protected StdLibTestBase() {
|
||||
@@ -37,6 +42,44 @@ abstract class StdLibTestBase extends SingleFileTranslationTest {
|
||||
|
||||
protected void performStdLibTest(@NotNull EnumSet<EcmaVersion> ecmaVersions,
|
||||
@NotNull String sourceDir, @NotNull String... stdLibFiles) throws Exception {
|
||||
List<String> files = constructFilesToCompileList(sourceDir, stdLibFiles);
|
||||
compileFiles(ecmaVersions, files);
|
||||
}
|
||||
|
||||
private void compileFiles(@NotNull EnumSet<EcmaVersion> ecmaVersions, @NotNull List<String> files) {
|
||||
List<String> libFiles = createLibFilesList();
|
||||
for (EcmaVersion version : ecmaVersions) {
|
||||
String outputFilePath = getOutputFilePath(getTestName(false) + ".compiler.kt", version);
|
||||
invokeCompiler(files, libFiles, version, outputFilePath);
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: reuse this in CompileMavenGeneratedJSLibrary
|
||||
private static void invokeCompiler(@NotNull List<String> files, @NotNull List<String> libFiles,
|
||||
@NotNull EcmaVersion version, @NotNull String outputFilePath) {
|
||||
K2JSCompiler compiler = new K2JSCompiler();
|
||||
K2JSCompilerArguments arguments = new K2JSCompilerArguments();
|
||||
arguments.outputFile = outputFilePath;
|
||||
arguments.sourceFiles = ArrayUtil.toStringArray(files);
|
||||
arguments.verbose = true;
|
||||
arguments.libraryFiles = ArrayUtil.toStringArray(libFiles);
|
||||
System.out.println("Compiling with version: " + version + " to: " + arguments.outputFile);
|
||||
ExitCode answer = compiler.exec(System.out, arguments);
|
||||
assertEquals("Compile failed", ExitCode.OK, answer);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private static List<String> createLibFilesList() {
|
||||
return Lists.transform(Config.LIB_FILE_NAMES, new Function<String, String>() {
|
||||
@Override
|
||||
public String apply(@Nullable String s) {
|
||||
return Config.LIBRARIES_LOCATION + s;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private static List<String> constructFilesToCompileList(@NotNull String sourceDir, @NotNull String[] stdLibFiles) {
|
||||
List<String> files = Lists.newArrayList();
|
||||
|
||||
File stdlibDir = new File(sourceDir);
|
||||
@@ -45,7 +88,6 @@ abstract class StdLibTestBase extends SingleFileTranslationTest {
|
||||
files.add(new File(stdlibDir, file).getPath());
|
||||
}
|
||||
|
||||
|
||||
// lets add the standard JS library files
|
||||
Iterable<String> names = Config.LIB_FILE_NAMES_DEPENDENT_ON_STDLIB;
|
||||
for (String libFileName : names) {
|
||||
@@ -58,9 +100,6 @@ abstract class StdLibTestBase extends SingleFileTranslationTest {
|
||||
System.out.println("Compiling " + libFileName);
|
||||
files.add(Config.STDLIB_LOCATION + libFileName);
|
||||
}
|
||||
for (EcmaVersion version : ecmaVersions) {
|
||||
String outputFilePath = getOutputFilePath(getTestName(false) + ".compiler.kt", version);
|
||||
TranslationUtils.translateFiles(getProject(), files, outputFilePath, MainCallParameters.noCall(), version);
|
||||
}
|
||||
return files;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user