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

Reverted my commits to restore build.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-13 19:53:03 +04:00
parent 07ab67f289
commit 8b9403ac0f
3 changed files with 2 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java
+2 -7
View File
@@ -55,7 +55,7 @@ public class ForTestCompileStdlib {
finally { finally {
stdlibJar.close(); stdlibJar.close();
} }
FileUtil.delete(classesDir); FileUtil.delete(classesDir);
return jarFile; return jarFile;
@@ -82,12 +82,7 @@ public class ForTestCompileStdlib {
private static void compileKotlinPartOfStdlib(File destdir) throws IOException { private static void compileKotlinPartOfStdlib(File destdir) throws IOException {
// lame // lame
Process exec = Runtime.getRuntime().exec(new String[]{System.getProperty("java.home") + "/bin/java", "-cp", System.getProperty("java.class.path"), KotlinCompiler.class.getName(), "-output", destdir.getPath(), "-src", new File("./stdlib/ktSrc").getAbsolutePath()}); KotlinCompiler.exec("-output", destdir.getPath(), "-src", "./stdlib/ktSrc");
try {
assert exec.waitFor() == 0;
} catch (InterruptedException e) {
throw new AssertionError(e);
}
} }
private static List<File> javaFilesInDir(File dir) { private static List<File> javaFilesInDir(File dir) {
idea/testData/templates/Iter.kt
-16
View File
@@ -1,16 +0,0 @@
import java.io.InputStream
import java.util.ArrayList
import java.io.FileInputStream
import java.util.HashSet
class MyClass {
public var collection : HashSet<Int>? = null
private var isAlive : Boolean = false
fun main(args : Array<String>, v : Int) {
var str = ""
val myList = ArrayList<String>()
val stream = FileInputStream(".")
<caret>
}
}
idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
-84
View File
@@ -1,84 +0,0 @@
package org.jetbrains.jet.plugin.codeInsight;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupEx;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.ide.DataManager;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
import com.intellij.openapi.editor.actionSystem.EditorActionManager;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
/**
* @author Evgeny Gerashchenko
* @since 2/10/12
*/
public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
public void testIter() {
myFixture.configureByFile(getTestName(false) + ".kt");
myFixture.type("iter");
doAction("ExpandLiveTemplateByTab");
assertStringItems("args", "collection", "myList", "str", "stream");
}
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
}
@SuppressWarnings("MethodOverridesPrivateMethodOfSuperclass")
private void doAction(@NotNull String actionId) {
EditorActionManager actionManager = EditorActionManager.getInstance();
EditorActionHandler actionHandler = actionManager.getActionHandler(actionId);
actionHandler.execute(myFixture.getEditor(), DataManager.getInstance().getDataContext());
}
@Override
protected void tearDown() throws Exception {
((TemplateManagerImpl) TemplateManager.getInstance(getProject())).setTemplateTesting(false);
super.tearDown();
}
private void assertStringItems(@NonNls String... items) {
assertEquals(Arrays.asList(items), Arrays.asList(getItemStringsSorted()));
}
@Override
protected void setUp() throws Exception {
super.setUp();
myFixture.setTestDataPath(new File(PluginTestCaseBase.getTestDataPathBase(), "/templates").getPath() +
File.separator);
((TemplateManagerImpl) TemplateManager.getInstance(getProject())).setTemplateTesting(true);
}
private String[] getItemStrings() {
LookupEx lookup = LookupManager.getActiveLookup(myFixture.getEditor());
assertNotNull(lookup);
ArrayList<String> result = new ArrayList<String>();
for (LookupElement element : lookup.getItems()) {
result.add(element.getLookupString());
}
return ArrayUtil.toStringArray(result);
}
private String[] getItemStringsSorted() {
String[] items = getItemStrings();
Arrays.sort(items);
return items;
}
}