diff options
Diffstat (limited to 'platform/testFramework/src/com/intellij/testFramework/fixtures/impl')
4 files changed, 9 insertions, 8 deletions
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index 8aafb17da1de..f4264f760cd9 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -185,7 +185,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig } VirtualFile result; - final String path = fromFile.getPath(); + final String path = fromFile.getAbsolutePath(); if (myTempDirFixture instanceof LightTempDirTestFixtureImpl) { VfsRootAccess.allowRootAccess(path); Disposer.register(myTestRootDisposable, new Disposable() { @@ -1025,13 +1025,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig final CodeCompletionHandlerBase handler = new CodeCompletionHandlerBase(type) { @Override - protected void completionFinished(int offset1, - int offset2, - CompletionProgressIndicator indicator, - LookupElement[] items, - boolean hasModifiers) { - myEmptyLookup = items.length == 0; - super.completionFinished(offset1, offset2, indicator, items, hasModifiers); + protected void completionFinished(CompletionProgressIndicator indicator, boolean hasModifiers) { + myEmptyLookup = indicator.getLookup().getItems().isEmpty(); + super.completionFinished(indicator, hasModifiers); } }; Editor editor = getCompletionEditor(); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyTestFixtureBuilderImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyTestFixtureBuilderImpl.java index c7b7779fe92a..412c87ee5bce 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyTestFixtureBuilderImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyTestFixtureBuilderImpl.java @@ -22,6 +22,7 @@ import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.TestFixtureBuilder; import com.intellij.util.pico.ConstructorInjectionComponentAdapter; import com.intellij.util.pico.IdeaPicoContainer; +import org.jetbrains.annotations.NotNull; import org.picocontainer.MutablePicoContainer; import java.lang.reflect.Field; @@ -50,6 +51,7 @@ class HeavyTestFixtureBuilderImpl implements TestFixtureBuilder<IdeaProjectTestF return (M)adapter.getComponentInstance(myContainer); } + @NotNull @Override public HeavyIdeaTestFixture getFixture() { return myFixture; diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java index ce73993b60a7..1b375d401d0e 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java @@ -62,6 +62,7 @@ public class IdeaTestFixtureFactoryImpl extends IdeaTestFixtureFactory { return new HeavyTestFixtureBuilderImpl(new HeavyIdeaTestFixtureImpl(name), myFixtureBuilderProviders); } + @NotNull @Override public TestFixtureBuilder<IdeaProjectTestFixture> createLightFixtureBuilder() { return new LightTestFixtureBuilderImpl<IdeaProjectTestFixture>(new LightIdeaTestFixtureImpl( diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightTestFixtureBuilderImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightTestFixtureBuilderImpl.java index 43a2ee7c031c..a196e4211649 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightTestFixtureBuilderImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightTestFixtureBuilderImpl.java @@ -19,6 +19,7 @@ package com.intellij.testFramework.fixtures.impl; import com.intellij.testFramework.builders.ModuleFixtureBuilder; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.TestFixtureBuilder; +import org.jetbrains.annotations.NotNull; /** * @author mike @@ -31,6 +32,7 @@ class LightTestFixtureBuilderImpl<F extends IdeaProjectTestFixture> implements T myFixture = fixture; } + @NotNull @Override public F getFixture() { return myFixture; |