Android test update to support new Idea
This commit is contained in:
+25
-5
@@ -16,10 +16,14 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.compiler;
|
package org.jetbrains.jet.compiler;
|
||||||
|
|
||||||
|
import com.intellij.application.options.PathMacrosImpl;
|
||||||
|
import com.intellij.mock.MockApplication;
|
||||||
import com.intellij.openapi.Disposable;
|
import com.intellij.openapi.Disposable;
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.util.io.FileUtil;
|
import com.intellij.openapi.application.PathMacros;
|
||||||
import junit.framework.*;
|
import junit.framework.Assert;
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
import junit.framework.TestSuite;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.jet.compiler.ant.AntRunner;
|
import org.jetbrains.jet.compiler.ant.AntRunner;
|
||||||
@@ -30,6 +34,9 @@ import org.jetbrains.jet.compiler.run.PermissionManager;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
|
import java.util.concurrent.Future;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@@ -170,11 +177,24 @@ public class CodegenTestsOnAndroidRunner {
|
|||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public String runTests() {
|
public String runTests() {
|
||||||
ApplicationManager.setApplication(null, new Disposable() {
|
//TODO: TEMPORARY HACK: should be possible to remove in idea 12.1
|
||||||
|
Disposable disposable = new Disposable() {
|
||||||
@Override
|
@Override
|
||||||
public void dispose() {
|
public void dispose() {}
|
||||||
|
};
|
||||||
|
|
||||||
|
MockApplication app = new MockApplication(disposable)
|
||||||
|
{
|
||||||
|
ExecutorService executorService = Executors.newFixedThreadPool(10);
|
||||||
|
@Override
|
||||||
|
public Future<?> executeOnPooledThread(@NotNull Runnable action) {
|
||||||
|
return executorService.submit(action);
|
||||||
}
|
}
|
||||||
});
|
};
|
||||||
|
|
||||||
|
app.addComponent(PathMacros.class, new PathMacrosImpl());
|
||||||
|
ApplicationManager.setApplication(app, disposable);
|
||||||
|
//TODO: HACK END
|
||||||
|
|
||||||
File rootForAndroidDependencies = new File(pathManager.getDependenciesRoot());
|
File rootForAndroidDependencies = new File(pathManager.getDependenciesRoot());
|
||||||
if (!rootForAndroidDependencies.exists()) {
|
if (!rootForAndroidDependencies.exists()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user