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

add iteratorAndNotApplicableRegistration test

Browse Source
This commit is contained in:
Vladimir Krivosheev
2019-03-21 13:31:48 +01:00
parent 97ccd2bf24
commit 85cb44d45f
2 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java
+2 -2
View File
@@ -284,7 +284,7 @@ public abstract class ExtensionPointImpl<T> implements ExtensionPoint<T> {
List<ExtensionComponentAdapter> adapters = myAdapters;
LoadingOrder.sort(adapters);
int maxIndex = adapters.size() - 1;
int size = adapters.size();
// see method comment about listeners - to ensure that every client of this method doesn't introduce flaky tests/hard to reproduce bugs
LOG.assertTrue(myListeners.length == 0);
@@ -294,7 +294,7 @@ public abstract class ExtensionPointImpl<T> implements ExtensionPoint<T> {
@Override
public boolean hasNext() {
return currentIndex <= maxIndex;
return currentIndex < size;
}
@Override
platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionPointImplTest.java
+51 -33
View File
@@ -14,13 +14,13 @@ import org.picocontainer.PicoContainer;
import org.picocontainer.defaults.DefaultPicoContainer;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.function.BiConsumer;
import static org.assertj.core.api.Assertions.*;
/**
* @author AKireyev
*/
@SuppressWarnings("ResultOfMethodCallIgnored")
public class ExtensionPointImplTest {
private Disposable disposable = Disposer.newDisposable();
@@ -155,23 +155,59 @@ public class ExtensionPointImplTest {
}
@Test
public void testCancelledRegistration() {
public void cancelledRegistration() {
doTestInterruptedAdapterProcessing(() -> {
throw new ProcessCanceledException();
}, ProcessCanceledException.class);
}, (extensionPoint, adapter) -> {
assertThatThrownBy(() -> extensionPoint.getExtensionList()).isInstanceOf(ProcessCanceledException.class);
adapter.setFire(null);
List<String> extensions = extensionPoint.getExtensionList();
assertThat(extensionPoint.getExtensionList()).hasSize(3);
assertThat(extensions.get(0)).isEqualTo("second");
assertThat(extensions.get(1)).isIn("", "first");
assertThat(extensions.get(2)).isIn("", "first");
assertThat(extensions.get(2)).isNotEqualTo(extensions.get(1));
});
}
@Test
public void testNotApplicableRegistration() {
// ExtensionNotApplicableException doesn't interrupt adapter processing,
// so, doTestInterruptedAdapterProcessing here is not truly logical, but still eliminates code duplication
public void notApplicableRegistration() {
doTestInterruptedAdapterProcessing(() -> {
throw ExtensionNotApplicableException.INSTANCE;
}, null);
}, (extensionPoint, adapter) -> {
assertThat(extensionPoint.getExtensionList()).hasSize(2);
adapter.setFire(null);
// even if now extension is applicable, adapters is not reprocessed and result is the same
assertThat(extensionPoint.getExtensionList()).hasSize(2);
});
}
private void doTestInterruptedAdapterProcessing(@NotNull Runnable firework, @Nullable Class<? extends Throwable> expectedErrorClass) {
ExtensionPoint<String> extensionPoint = buildExtensionPoint(String.class);
@Test
public void iteratorAndNotApplicableRegistration() {
ExtensionPointImpl<String> extensionPoint = buildExtensionPoint(String.class);
extensionPoint.registerExtension("first", disposable);
MyShootingComponentAdapter adapter = stringAdapter();
extensionPoint.addExtensionAdapter(adapter);
adapter.setFire(() -> {
throw ExtensionNotApplicableException.INSTANCE;
});
extensionPoint.registerExtension("third", disposable);
Iterator<String> iterator = extensionPoint.iterator();
assertThat(iterator.hasNext()).isTrue();
assertThat(iterator.next()).isEqualTo("first");
assertThat(iterator.hasNext()).isTrue();
assertThat(iterator.next()).isEqualTo("third");
assertThat(iterator.hasNext()).isFalse();
}
private void doTestInterruptedAdapterProcessing(@NotNull Runnable firework, @NotNull BiConsumer<ExtensionPointImpl<String>, MyShootingComponentAdapter> test) {
ExtensionPointImpl<String> extensionPoint = buildExtensionPoint(String.class);
MyShootingComponentAdapter adapter = stringAdapter();
extensionPoint.registerExtension("first", disposable);
@@ -179,28 +215,10 @@ public class ExtensionPointImplTest {
// registers a wrapping adapter
extensionPoint.registerExtension("second", LoadingOrder.FIRST, disposable);
((ExtensionPointImpl)extensionPoint).addExtensionAdapter(adapter);
extensionPoint.addExtensionAdapter(adapter);
adapter.setFire(firework);
if (expectedErrorClass == null) {
assertThat(extensionPoint.getExtensionList()).hasSize(2);
adapter.setFire(null);
// even if now extension is applicable, adapters is not reprocessed and result is the same
assertThat(extensionPoint.getExtensionList()).hasSize(2);
return;
}
else {
assertThatThrownBy(() -> extensionPoint.getExtensionList()).isInstanceOf(expectedErrorClass);
}
adapter.setFire(null);
List<String> extensions = extensionPoint.getExtensionList();
assertThat(extensionPoint.getExtensionList()).hasSize(3);
assertThat(extensions.get(0)).isEqualTo("second");
assertThat(extensions.get(1)).isIn("", "first");
assertThat(extensions.get(2)).isIn("", "first");
assertThat(extensions.get(2)).isNotEqualTo(extensions.get(1));
test.accept(extensionPoint, adapter);
}
@Test
@@ -263,13 +281,13 @@ public class ExtensionPointImplTest {
super(implementationClass, new DefaultPluginDescriptor("test"), null, LoadingOrder.ANY, null);
}
public void setFire(@Nullable Runnable fire) {
public synchronized void setFire(@Nullable Runnable fire) {
myFire = fire;
}
@NotNull
@Override
public Object createInstance(@Nullable PicoContainer container) {
public synchronized Object createInstance(@Nullable PicoContainer container) {
if (myFire != null) {
myFire.run();
}