test helpers for code completion, TestCompletionRequestor moved to dl…

…tk.core
panchenko · Dec 25, 2012 · 259a0bf · 259a0bf
1 parent a24d8b6
commit 259a0bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 36 deletions.
diff --git a/...ests/src/org/eclipse/dltk/javascript/core/tests/contentassist/AbstractCompletionTest.java b/...ests/src/org/eclipse/dltk/javascript/core/tests/contentassist/AbstractCompletionTest.java
@@ -28,6 +28,7 @@
 import org.eclipse.dltk.compiler.env.IModuleSource;
 import org.eclipse.dltk.core.CompletionProposal;
 import org.eclipse.dltk.core.DLTKLanguageManager;
+import org.eclipse.dltk.core.tests.TestCompletionRequestor;
 import org.eclipse.dltk.core.tests.util.StringList;
 import org.eclipse.dltk.javascript.core.JavaScriptNature;
 import org.eclipse.dltk.javascript.internal.core.codeassist.JSCompletionEngine;
@@ -89,6 +90,11 @@ protected ICompletionEngine createEngine(List<CompletionProposal> results,
 		return engine;
 	}
 
+	protected ICompletionEngine createEngine() {
+		return createEngine(Collections.<CompletionProposal> emptyList(),
+				JSCompletionEngine.OPTION_NONE);
+	}
+
 	private boolean isAllowed(ICompletionEngine engine,
 			Collection<Class<? extends ICompletionEngine>> allowedEngines) {
 		if (allowedEngines.isEmpty()) {
@@ -123,6 +129,7 @@ protected static boolean compareProposalNames(
 		}
 		Collections.sort(proposals, new Comparator<CompletionProposal>() {
 
+			@Override
 			public int compare(CompletionProposal pr, CompletionProposal pr1) {
 				return pr.getName().compareTo(pr1.getName());
 			}

diff --git a/...s/src/org/eclipse/dltk/javascript/core/tests/contentassist/AbstractContentAssistTest.java b/...s/src/org/eclipse/dltk/javascript/core/tests/contentassist/AbstractContentAssistTest.java
@@ -15,6 +15,7 @@
 import junit.framework.TestCase;
 
 import org.eclipse.dltk.compiler.env.IModuleSource;
+import org.eclipse.dltk.core.tests.CodeAssistUtil;
 import org.eclipse.osgi.util.NLS;
 
 public abstract class AbstractContentAssistTest extends TestCase {
@@ -23,6 +24,10 @@ protected IModuleSource createModule(String moduleName) {
 		return new TestModule(getClass().getResource(moduleName));
 	}
 
+	protected CodeAssistUtil getModule(String moduleName) {
+		return CodeAssistUtil.on(createModule(moduleName));
+	}
+
 	public static int lastPositionInFile(String string, IModuleSource source) {
 		return lastPositionInFile(string, source, true);
 	}

diff --git a/...sts/src/org/eclipse/dltk/javascript/core/tests/contentassist/TestCompletionRequestor.java b/...sts/src/org/eclipse/dltk/javascript/core/tests/contentassist/TestCompletionRequestor.java