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

restore compilation after rebase of dropping external annotations; fix affected tests

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-08 13:55:39 +02:00
parent c41aefe2cb
commit 7e2c2ef678
13 changed files with 12 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
+1 -22
View File
@@ -18,13 +18,7 @@ package org.jetbrains.kotlin.idea.test;
import com.intellij.openapi.projectRoots.JavaSdk;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkModificator;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.AnnotationOrderRootType;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.JetTestUtils;
@@ -43,13 +37,7 @@ public class PluginTestCaseBase {
@NotNull
private static Sdk getSdk(String sdkHome) {
Sdk sdk = JavaSdk.getInstance().createJdk("JDK", sdkHome, true);
SdkModificator modificator = sdk.getSdkModificator();
VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(getJdkAnnotationsJar());
assert file != null;
modificator.addRoot(JarFileSystem.getInstance().getJarRootForLocalFile(file), AnnotationOrderRootType.getInstance());
modificator.commitChanges();
return sdk;
return JavaSdk.getInstance().createJdk("JDK", sdkHome, true);
}
@NotNull
@@ -64,15 +52,6 @@ public class PluginTestCaseBase {
return getSdk(javaHome);
}
@NotNull
public static File getJdkAnnotationsJar() {
File jdkAnnotations = new File(JetTestUtils.getHomeDirectory(), "dist/kotlinc/lib/kotlin-jdk-annotations.jar");
if (!jdkAnnotations.exists()) {
throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it");
}
return jdkAnnotations;
}
public static boolean isAllFilesPresentTest(@NotNull String testName) {
return StringUtil.startsWithIgnoreCase(testName, "allFilesPresentIn");
}
idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ import java.net.URI
// WITH_RUNTIME
fun foo(): URI {
fun foo(): URI? {
return java.io.File("x").toURI()
}
idea/testData/quickfix/supertypeInitialization/addImport.kt.after
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@
import java.io.DataInputStream
import java.io.InputStream
class C(p0: InputStream) : DataInputStream<caret>(p0)
class C(p0: InputStream?) : DataInputStream<caret>(p0)
idea/testData/quickfix/supertypeInitialization/multipleConstructors.kt.after
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@
// ACTION: Add constructor parameters from ArrayList(Int)
import java.util.ArrayList
class C(p0: MutableCollection<out String>) : ArrayList<String><caret>(p0)
class C(p0: MutableCollection<out String>?) : ArrayList<String><caret>(p0)