MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-08-14 16:41:40 +03:00
parent aa7e241e54
commit a3f755c9c5
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/testFramework/LightVirtualFileBase.java
+3 -4
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.vfs.NonPhysicalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileSystem;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.LocalTimeCounter;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -33,8 +32,8 @@ import java.io.IOException;
*/
public abstract class LightVirtualFileBase extends VirtualFile {
private FileType myFileType;
private String myName = "";
private long myModStamp = LocalTimeCounter.currentTime();
private String myName;
private long myModStamp;
private boolean myIsWritable = true;
private boolean myValid = true;
private VirtualFile myOriginalFile;
@@ -45,7 +44,7 @@ public abstract class LightVirtualFileBase extends VirtualFile {
myModStamp = modificationStamp;
}
public void setFileType(final FileType fileType) {
public void setFileType(@NotNull FileType fileType) {
myFileType = fileType;
}
platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
+2 -7
View File
@@ -61,13 +61,8 @@ public class ProgressIndicatorUtils {
return progress;
}
@NotNull
public static CompletableFuture<?> submitWithWriteActionPriority(@NotNull ReadTask task) {
return scheduleWithWriteActionPriority(new ProgressIndicatorBase(), task);
}
public static void scheduleWithWriteActionPriority(@NotNull ReadTask task) {
submitWithWriteActionPriority(task);
scheduleWithWriteActionPriority(new ProgressIndicatorBase(), task);
}
@NotNull
@@ -229,7 +224,7 @@ public class ProgressIndicatorUtils {
}
});
}
catch (RuntimeException | Error e) {
catch (Throwable e) {
future.completeExceptionally(e);
throw e;
}
platform/platform-tests/testSrc/com/intellij/openapi/progress/impl/ProgressIndicatorTest.java
+23 -11
View File
@@ -50,9 +50,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -91,7 +89,7 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
private volatile long prevTime;
private volatile long now;
public void testCheckCanceledGranularity() throws InterruptedException {
public void testCheckCanceledGranularity() {
prevTime = now = 0;
final long warmupEnd = System.currentTimeMillis() + 1000;
final TLongArrayList times = new TLongArrayList();
@@ -123,10 +121,10 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
assertTrue(averageDelay < CoreProgressManager.CHECK_CANCELED_DELAY_MILLIS *3);
}
public void testProgressIndicatorUtilsScheduleWithWriteActionPriority() throws Throwable {
public void testProgressIndicatorUtilsScheduleWithWriteActionPriority() throws Exception {
final AtomicBoolean insideReadAction = new AtomicBoolean();
final ProgressIndicatorBase indicator = new ProgressIndicatorBase();
ProgressIndicatorUtils.scheduleWithWriteActionPriority(indicator, new ReadTask() {
CompletableFuture<?> future = ProgressIndicatorUtils.scheduleWithWriteActionPriority(indicator, new ReadTask() {
@Override
public void computeInReadAction(@NotNull ProgressIndicator indicator) {
insideReadAction.set(true);
@@ -145,13 +143,14 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
}
ApplicationManager.getApplication().runWriteAction(() -> assertTrue(indicator.isCanceled()));
assertTrue(indicator.isCanceled());
waitForComplete(future);
}
public void testReadTaskCanceledShouldNotHappenAfterEdtContinuation() {
public void testReadTaskCanceledShouldNotHappenAfterEdtContinuation() throws Exception {
for (int i = 0; i < 1000; i++) {
final AtomicBoolean afterContinuation = new AtomicBoolean();
final ProgressIndicatorBase indicator = new ProgressIndicatorBase();
ProgressIndicatorUtils.scheduleWithWriteActionPriority(indicator, new ReadTask() {
CompletableFuture<?> future = ProgressIndicatorUtils.scheduleWithWriteActionPriority(indicator, new ReadTask() {
@Override
public Continuation performInReadAction(@NotNull ProgressIndicator indicator) throws ProcessCanceledException {
return new Continuation(() -> afterContinuation.set(true));
@@ -169,6 +168,19 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
}
});
UIUtil.dispatchAllInvocationEvents();
waitForComplete(future);
}
}
private static void waitForComplete(CompletableFuture<?> future) throws InterruptedException, ExecutionException {
while (true) {
try {
future.get(1, TimeUnit.MILLISECONDS);
break;
}
catch (TimeoutException e) {
UIUtil.dispatchAllInvocationEvents();
}
}
}
@@ -199,7 +211,7 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
private volatile boolean taskCanceled;
private volatile boolean taskSucceeded;
private volatile Throwable exception;
public void testProgressManagerCheckCanceledDoesNotDelegateToProgressIndicatorIfThereAreNoCanceledIndicators() throws Throwable {
public void testProgressManagerCheckCanceledDoesNotDelegateToProgressIndicatorIfThereAreNoCanceledIndicators() {
final long warmupEnd = System.currentTimeMillis() + 1000;
final long end = warmupEnd + 10000;
checkCanceledCalled = false;
@@ -354,7 +366,7 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
for (int i=0;i<100000;i++) {
ProgressManager.getInstance().executeProcessUnderProgress(EmptyRunnable.getInstance(), indicator);
}
}).useLegacyScaling().assertTiming();
}).assertTiming();
}
public void testWrapperIndicatorGotCanceledTooWhenInnerIndicatorHas() {
@@ -659,7 +671,7 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
assertFalse(progressManager.isInNonCancelableSection());
}
public void testProgressIndicatorUtilsScheduleWithWriteActionPriorityMustRemoveListenerBeforeContinuationStartsExecutingInEDT() throws Throwable {
public void testProgressIndicatorUtilsScheduleWithWriteActionPriorityMustRemoveListenerBeforeContinuationStartsExecutingInEDT() {
final AtomicBoolean canceled = new AtomicBoolean();
final ProgressIndicatorBase indicator = new ProgressIndicatorBase();
AtomicReference<CompletableFuture<?>> future = new AtomicReference<>();