From 88a20669494924260243da577dae634ee97c323e Mon Sep 17 00:00:00 2001 From: Bruno Medeiros Date: Fri, 12 Dec 2014 16:40:37 +0000 Subject: [PATCH] fix 2 minor tests issues. --- .../core/engine_client/CompletionEngineSourceTests.java | 5 ++++- plugin_tooling/src-test/dtool/tests/CommonDToolTest.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugin_ide.core.tests/src/mmrnmhrm/core/engine_client/CompletionEngineSourceTests.java b/plugin_ide.core.tests/src/mmrnmhrm/core/engine_client/CompletionEngineSourceTests.java index e5cff12ab..97bb6ffd2 100644 --- a/plugin_ide.core.tests/src/mmrnmhrm/core/engine_client/CompletionEngineSourceTests.java +++ b/plugin_ide.core.tests/src/mmrnmhrm/core/engine_client/CompletionEngineSourceTests.java @@ -20,8 +20,10 @@ import org.eclipse.dltk.compiler.env.IModuleSource; import dtool.ast.definitions.EArcheType; +import dtool.engine.CommonSemanticsTest; import dtool.engine.util.NamedElementUtil; import dtool.sourcegen.AnnotatedSource.MetadataEntry; +import dtool.tests.MockCompilerInstalls; public class CompletionEngineSourceTests extends CoreResolverSourceTests { @@ -49,7 +51,8 @@ public void runRefSearchTest_________(RefSearchOptions options) { public void runCompletionEngineTest(IModuleSource moduleSource, int offset, String[] expectedResults, int rplLen) { DeeCompletionEngine completionEngine; - completionEngine = CompletionEngine_Test.testCompletionEngine(moduleSource, offset, rplLen, null); + completionEngine = CompletionEngine_Test.testCompletionEngine(moduleSource, offset, rplLen, + CommonSemanticsTest.DEFAULT_TestsCompilerInstall.getCompilerPath()); CompletionEngineTestsRequestor requestor = (CompletionEngineTestsRequestor) completionEngine.getRequestor(); checkResults(requestor.results, expectedResults); diff --git a/plugin_tooling/src-test/dtool/tests/CommonDToolTest.java b/plugin_tooling/src-test/dtool/tests/CommonDToolTest.java index 84f66dd77..b34c9270a 100644 --- a/plugin_tooling/src-test/dtool/tests/CommonDToolTest.java +++ b/plugin_tooling/src-test/dtool/tests/CommonDToolTest.java @@ -37,7 +37,7 @@ public static BundlePath bundlePath(Location basePath, String other) { } public static String testsDubPath() { - return DubHelper.DUB_PATH_OVERRIDE; + return DubHelper.DUB_PATH_OVERRIDE == null ? "dub" : DubHelper.DUB_PATH_OVERRIDE; } public static Path testsDubPath2() {