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

Finally drop attaching stdlib sources everywhere

Browse Source
This commit is contained in:
Maxim Shafirov
2012-01-24 17:20:19 +04:00
parent 00667b14e7
commit 81ef081a87
17 changed files with 155 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java
+3 -9
View File
@@ -1,6 +1,5 @@
package org.jetbrains.jet.codegen;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
import com.intellij.openapi.util.Pair;
import org.jetbrains.jet.JetTestUtils;
@@ -15,12 +14,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Stack;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
@@ -31,7 +25,7 @@ import java.util.jar.JarOutputStream;
*
* @author Stepan Koltsov
*/
class ForTestCompileStdlib {
public class ForTestCompileStdlib {
public static final File stdlibJarForTests = new File(
JetTestUtils.tmpDirForTest(ForTestCompileStdlib.class), "stdlib.jar");
@@ -107,7 +101,7 @@ class ForTestCompileStdlib {
private static void compileKotlinPartOfStdlib(File destdir) throws IOException {
// lame
KotlinCompiler.main("-excludeStdlib", "-output", destdir.getPath(), "-src", "./stdlib/ktSrc");
KotlinCompiler.main("-output", destdir.getPath(), "-src", "./stdlib/ktSrc");
}
private static List<File> javaFilesInDir(File dir) {
compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
+4 -2
View File
@@ -37,9 +37,11 @@ public class StdlibTest extends CodegenTestCase {
protected ClassFileFactory generateClassesInFile() {
try {
CompileSession session = new CompileSession(myEnvironment);
CompileEnvironment.initializeKotlinRuntime(myEnvironment);
session.addSources(myFile.getVirtualFile());
session.addStdLibSources(true);
session.addSources(myFile.getVirtualFile());
CompileEnvironment.ensureRuntime(myEnvironment);
if (!session.analyze(System.out)) {
throw new RuntimeException();
compiler/tests/org/jetbrains/jet/codegen/TestlibTestBase.java → compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+8 -25
View File
@@ -5,7 +5,6 @@ import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
import gnu.trove.THashSet;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jetbrains.jet.compiler.CompileEnvironment;
import org.jetbrains.jet.compiler.CompileSession;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.psi.JetClass;
@@ -20,19 +19,15 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLDecoder;
import java.util.Set;
/**
* @author alex.tkachman
*/
public abstract class TestlibTestBase extends CodegenTestCase {
public class TestlibTest extends CodegenTestCase {
/** Binary or source */
private final boolean binary;
protected TestlibTestBase(boolean binary) {
this.binary = binary;
public static TestSuite suite() {
return new TestlibTest().buildSuite();
}
protected TestSuite buildSuite() {
@@ -58,12 +53,8 @@ public abstract class TestlibTestBase extends CodegenTestCase {
private TestSuite doBuildSuite() {
try {
CompileSession session = new CompileSession(myEnvironment);
if (binary) {
myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests());
} else {
CompileEnvironment.initializeKotlinRuntime(myEnvironment);
}
myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests());
File junitJar = new File("testlib/lib/junit-4.9.jar");
@@ -77,10 +68,6 @@ public abstract class TestlibTestBase extends CodegenTestCase {
VirtualFile path = localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../testlib/test");
session.addSources(path);
if (!binary) {
session.addStdLibSources(true);
}
if (!session.analyze(System.out)) {
throw new RuntimeException();
}
@@ -89,13 +76,9 @@ public abstract class TestlibTestBase extends CodegenTestCase {
URLClassLoader dependenciesClassLoader = new URLClassLoader(new URL[] { junitJar.toURI().toURL() });
GeneratedClassLoader loader;
if (binary) {
URLClassLoader parentClassLoader = new URLClassLoader(new URL[]{
ForTestCompileStdlib.stdlibJarForTests().toURI().toURL() }, dependenciesClassLoader);
loader = new GeneratedClassLoader(classFileFactory, parentClassLoader);
} else {
loader = new GeneratedClassLoader(classFileFactory, dependenciesClassLoader);
}
URLClassLoader parentClassLoader = new URLClassLoader(new URL[]{
ForTestCompileStdlib.stdlibJarForTests().toURI().toURL()}, dependenciesClassLoader);
loader = new GeneratedClassLoader(classFileFactory, parentClassLoader);
JetTypeMapper typeMapper = new JetTypeMapper(classFileFactory.state.getStandardLibrary(), session.getMyBindingContext());
TestSuite suite = new TestSuite("StandardLibrary");
compiler/tests/org/jetbrains/jet/codegen/TestlibWithStdlibBinaryTest.java
-18
View File
@@ -1,18 +0,0 @@
package org.jetbrains.jet.codegen;
import junit.framework.TestSuite;
/**
* @author Stepan Koltsov
*/
public class TestlibWithStdlibBinaryTest extends TestlibTestBase {
protected TestlibWithStdlibBinaryTest() {
super(true);
}
public static TestSuite suite() {
return new TestlibWithStdlibBinaryTest().buildSuite();
}
}
compiler/tests/org/jetbrains/jet/codegen/TestlibWithStdlibSrcTest.java
-18
View File
@@ -1,18 +0,0 @@
package org.jetbrains.jet.codegen;
import junit.framework.TestSuite;
/**
* @author Stepan Koltsov
*/
public class TestlibWithStdlibSrcTest extends TestlibTestBase {
protected TestlibWithStdlibSrcTest() {
super(false);
}
public static TestSuite suite() {
return new TestlibWithStdlibSrcTest().buildSuite();
}
}
compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java
+27 -48
View File
@@ -1,14 +1,15 @@
package org.jetbrains.jet.compiler;
import jet.modules.Module;
import com.intellij.openapi.util.io.FileUtil;
import junit.framework.TestCase;
import org.jetbrains.jet.cli.KotlinCompiler;
import org.jetbrains.jet.codegen.ClassFileFactory;
import org.jetbrains.jet.codegen.ForTestCompileStdlib;
import org.jetbrains.jet.parsing.JetParsingTest;
import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
@@ -31,30 +32,17 @@ public class CompileEnvironmentTest extends TestCase {
super.tearDown();
}
public void _testSmoke() throws IOException {
final File activeRtJar = CompileEnvironment.findRtJar();
environment.setJavaRuntime(activeRtJar);
environment.initializeKotlinRuntime();
final String testDataDir = JetParsingTest.getTestDataDir() + "/compiler/smoke/";
final List<Module> modules = environment.loadModuleScript(testDataDir + "Smoke.kts");
assertEquals(1, modules.size());
final Module moduleBuilder = modules.get(0);
final ClassFileFactory factory = environment.compileModule(moduleBuilder, testDataDir);
assertNotNull(factory);
assertNotNull(factory.asBytes("Smoke/namespace.class"));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
CompileEnvironment.writeToJar(factory, baos, null, false);
JarInputStream is = new JarInputStream(new ByteArrayInputStream(baos.toByteArray()));
final List<String> entries = listEntries(is);
assertTrue(entries.contains("Smoke/namespace.class"));
}
public void testSmokeWithCompilerJar() throws IOException {
File tempFile = File.createTempFile("compilerTest", "compilerTest");
File tempDir = FileUtil.createTempDirectory("compilerTest", "compilerTest");
try {
KotlinCompiler.main(Arrays.asList("-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts", "-jar", tempFile.getAbsolutePath()).toArray(new String[0]));
FileInputStream fileInputStream = new FileInputStream(tempFile);
File stdlib = new File(tempDir, "stdlib.jar");
FileUtil.copy(ForTestCompileStdlib.stdlibJarForTests(), stdlib);
File resultJar = new File(tempDir, "result.jar");
KotlinCompiler.main("-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts",
"-jar", resultJar.getAbsolutePath(),
"-stdlib", stdlib.getAbsolutePath());
FileInputStream fileInputStream = new FileInputStream(resultJar);
try {
JarInputStream is = new JarInputStream(fileInputStream);
try {
@@ -71,33 +59,24 @@ public class CompileEnvironmentTest extends TestCase {
}
}
finally {
tempFile.delete();
FileUtil.delete(tempDir);
}
}
private static boolean delete(File file) {
boolean success = true;
if(file.isDirectory()) {
for (File child : file.listFiles()) {
success = success && delete(child);
}
}
return file.delete() && success;
}
public void testSmokeWithCompilerOutput() throws IOException {
File tempFile = File.createTempFile("compilerTest", "compilerTest");
tempFile.delete();
tempFile = new File(tempFile.getAbsolutePath());
tempFile.mkdir();
File tempDir = FileUtil.createTempDirectory("compilerTest", "compilerTest");
try {
KotlinCompiler.main(Arrays.asList("-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt", "-output", tempFile.getAbsolutePath()).toArray(new String[0]));
assertEquals(1, tempFile.listFiles().length);
assertEquals(1, tempFile.listFiles()[0].listFiles().length);
}
finally {
delete(tempFile);
File out = new File(tempDir, "out");
File stdlib = new File(tempDir, "stdlib.jar");
FileUtil.copy(ForTestCompileStdlib.stdlibJarForTests(), stdlib);
KotlinCompiler.main("-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt",
"-output", out.getAbsolutePath(),
"-stdlib", stdlib.getAbsolutePath());
assertEquals(1, out.listFiles().length);
assertEquals(1, out.listFiles()[0].listFiles().length);
} finally {
FileUtil.delete(tempDir);
}
}