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

Fix AS33 compilation

Browse Source 
Commented unnecessary code that uses unavailable API
This commit is contained in:
Mikhael Bogdanov
2019-04-11 13:16:49 +02:00
parent ceec35bf38
commit c53682f397
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java
+16 -37
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.test.testFramework; package org.jetbrains.kotlin.test.testFramework;
import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.concurrency.IdeaForkJoinWorkerThreadFactory; import com.intellij.concurrency.IdeaForkJoinWorkerThreadFactory;
import com.intellij.diagnostic.PerformanceWatcher; import com.intellij.diagnostic.PerformanceWatcher;
@@ -36,12 +35,9 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.testFramework.*; import com.intellij.testFramework.*;
import com.intellij.testFramework.exceptionCases.AbstractExceptionCase; import com.intellij.testFramework.exceptionCases.AbstractExceptionCase;
import com.intellij.testFramework.fixtures.IdeaTestExecutionPolicy;
import com.intellij.util.Consumer; import com.intellij.util.Consumer;
import com.intellij.util.ReflectionUtil; import com.intellij.util.ReflectionUtil;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.PeekableIterator;
import com.intellij.util.containers.PeekableIteratorWrapper;
import com.intellij.util.containers.hash.HashMap; import com.intellij.util.containers.hash.HashMap;
import com.intellij.util.lang.CompoundRuntimeException; import com.intellij.util.lang.CompoundRuntimeException;
import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.UIUtil;
@@ -121,14 +117,8 @@ public abstract class KtUsefulTestCase extends TestCase {
super.setUp(); super.setUp();
if (shouldContainTempFiles()) { if (shouldContainTempFiles()) {
IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current(); String testName = FileUtil.sanitizeFileName(getTestName(true));
String testName = null; if (StringUtil.isEmptyOrSpaces(testName)) testName = "";
if (policy != null) {
testName = policy.getPerTestTempDirName();
}
if (testName == null) {
testName = FileUtil.sanitizeFileName(getTestName(true));
}
testName = new File(testName).getName(); // in case the test name contains file separators testName = new File(testName).getName(); // in case the test name contains file separators
myTempDir = FileUtil.createTempDirectory(TEMP_DIR_MARKER, testName, false); myTempDir = FileUtil.createTempDirectory(TEMP_DIR_MARKER, testName, false);
FileUtil.resetCanonicalTempPathCache(myTempDir.getPath()); FileUtil.resetCanonicalTempPathCache(myTempDir.getPath());
@@ -273,7 +263,7 @@ public abstract class KtUsefulTestCase extends TestCase {
AtomicBoolean completed = new AtomicBoolean(false); AtomicBoolean completed = new AtomicBoolean(false);
Runnable runnable = () -> { Runnable runnable = () -> {
try { try {
TestLoggerFactory.onTestStarted(); //TestLoggerFactory.onTestStarted();
super.runTest(); super.runTest();
TestLoggerFactory.onTestFinished(true); TestLoggerFactory.onTestFinished(true);
completed.set(true); completed.set(true);
@@ -309,16 +299,16 @@ public abstract class KtUsefulTestCase extends TestCase {
} }
protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception { protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current(); //IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current();
if (policy != null && !policy.runInDispatchThread()) { //if (policy != null && !policy.runInDispatchThread()) {
runnable.run(); // runnable.run();
} //}
else { //else {
EdtTestUtilKt.runInEdtAndWait(() -> { EdtTestUtilKt.runInEdtAndWait(() -> {
runnable.run(); runnable.run();
return null; return null;
}); });
} //}
} }
private void defaultRunBare() throws Throwable { private void defaultRunBare() throws Throwable {
@@ -394,10 +384,10 @@ public abstract class KtUsefulTestCase extends TestCase {
} }
protected boolean runInDispatchThread() { protected boolean runInDispatchThread() {
IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current(); //IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current();
if (policy != null) { //if (policy != null) {
return policy.runInDispatchThread(); // return policy.runInDispatchThread();
} //}
return true; return true;
} }
@@ -533,20 +523,9 @@ public abstract class KtUsefulTestCase extends TestCase {
} }
public static <T> void assertContainsOrdered(@NotNull Collection<? extends T> collection, @NotNull Collection<? extends T> expected) { public static <T> void assertContainsOrdered(@NotNull Collection<? extends T> collection, @NotNull Collection<? extends T> expected) {
PeekableIterator<T> expectedIt = new PeekableIteratorWrapper<>(expected.iterator()); ArrayList<T> copy = new ArrayList<>(collection);
PeekableIterator<T> actualIt = new PeekableIteratorWrapper<>(collection.iterator()); copy.retainAll(expected);
assertOrderedEquals(toString(collection), copy, expected);
while (actualIt.hasNext() && expectedIt.hasNext()) {
T expectedElem = expectedIt.peek();
T actualElem = actualIt.peek();
if (expectedElem.equals(actualElem)) {
expectedIt.next();
}
actualIt.next();
}
if (expectedIt.hasNext()) {
throw new ComparisonFailure("", toString(expected), toString(collection));
}
} }
@SafeVarargs @SafeVarargs