From c5f3bbb55afdc169f92d60c4ba828fbff6d77174 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Tue, 17 Jan 2017 21:35:47 -0500 Subject: [PATCH] Bug 292229 - Refactor the content assist test suite to make adding new flags easier Change-Id: I06bd3590e037e0761a62c454dec497d3043e7e08 --- .../AbstractContentAssistTest.java | 43 ++++++++------- .../CPPParameterGuessingTests.java | 5 +- .../CParameterGuessingTests.java | 5 +- .../CompletionProposalsBaseTest.java | 4 +- .../contentassist2/CompletionTestBase.java | 28 +++------- .../text/contentassist2/CompletionTests.java | 54 +++++++++---------- .../CompletionTests_PlainC.java | 4 +- .../contentassist2/ParameterHintTests.java | 2 +- .../ShowCamelCasePreferenceTest.java | 4 +- .../contentassist2/TemplateProposalTest.java | 24 +++++---- 10 files changed, 86 insertions(+), 87 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java index 451bfedb509..dc41719be4b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/AbstractContentAssistTest.java @@ -60,7 +60,14 @@ import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants; public abstract class AbstractContentAssistTest extends BaseUITestCase { public static enum CompareType { ID, DISPLAY, REPLACEMENT, CONTEXT, INFORMATION } + + protected final static int IS_COMPLETION = 0x01; + protected final static int IS_TEMPLATE = 0x02; + protected final static int FILTER_RESULTS = 0x04; + protected final static int ALLOW_EXTRA_RESULTS = 0x08; + protected final static int DEFAULT_FLAGS = FILTER_RESULTS; + protected class ContentAssistResult { long startTime; long endTime; @@ -158,8 +165,13 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase { return new ContentAssistResult(startTime, endTime, results); } - protected void assertContentAssistResults(int offset, int length, String[] expected, boolean isCompletion, - boolean isTemplate, boolean filterResults, CompareType compareType) throws Exception { + protected void assertContentAssistResults(int offset, int length, String[] expected, int flags, + CompareType compareType) throws Exception { + boolean isCompletion = (flags & IS_COMPLETION) != 0; + boolean isTemplate = (flags & IS_TEMPLATE) != 0; + boolean filterResults = (flags & FILTER_RESULTS) != 0; + boolean allowExtraResults = (flags & ALLOW_EXTRA_RESULTS) != 0; + ContentAssistResult r = invokeContentAssist(offset, length, isCompletion, isTemplate, filterResults); String[] resultStrings= toStringArray(r.results, compareType); @@ -196,14 +208,17 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase { if (!allFound) { assertEquals("Missing results!", toString(expected), toString(resultStrings)); - } else if (doCheckExtraResults()) { + } else if (!allowExtraResults) { assertEquals("Extra results!", toString(expected), toString(resultStrings)); } } protected void assertContentAssistResults(int offset, int length, Map expected, - boolean isCompletion, boolean isTemplate, boolean filterResults, CompareType compareType) + int flags, CompareType compareType) throws Exception { + boolean isCompletion = (flags & IS_COMPLETION) != 0; + boolean isTemplate = (flags & IS_TEMPLATE) != 0; + boolean filterResults = (flags & FILTER_RESULTS) != 0; ContentAssistResult r = invokeContentAssist(offset, length, isCompletion, isTemplate, filterResults); Map resultMap = toMap(r.results, compareType); @@ -272,16 +287,11 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase { return resultsMap; } - protected void assertContentAssistResults(int offset, int length, String[] expected, boolean isCompletion, - boolean isTemplate, CompareType compareType) throws Exception { - assertContentAssistResults(offset, length, expected, isCompletion, isTemplate, true, compareType); + protected void assertContentAssistResults(int offset, String[] expected, + int flags, CompareType compareType) throws Exception { + assertContentAssistResults(offset, 0, expected, flags, compareType); } - - protected void assertContentAssistResults(int offset, String[] expected, boolean isCompletion, - CompareType compareType) throws Exception { - assertContentAssistResults(offset, 0, expected, isCompletion, false, compareType); - } - + /** * Filter out template and keyword proposals. * @@ -380,13 +390,6 @@ public abstract class AbstractContentAssistTest extends BaseUITestCase { return buf.toString(); } - /** - * Override to relax checking of extra results - */ - protected boolean doCheckExtraResults() { - return true; - } - /** * Returns the content of the editor buffer */ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java index 6716cb1677d..b4a337cba3b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java @@ -56,11 +56,12 @@ public class CPPParameterGuessingTests extends AbstractContentAssistTest { assertNotNull(createFile(project, HEADER_FILE_NAME, headerContent)); return createFile(project, SOURCE_FILE_NAME, sourceContent.toString()); } + + protected static final int DEFAULT_FLAGS = IS_COMPLETION; protected void assertParametersGuesses(Map expected) throws Exception { - assertContentAssistResults(getBuffer().length() - 1, 0, expected, true, - false, false, CompareType.REPLACEMENT); + assertContentAssistResults(getBuffer().length() - 1, 0, expected, DEFAULT_FLAGS, CompareType.REPLACEMENT); } // void foo(){ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java index 1e1f058d569..9e009ef0c31 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java @@ -50,10 +50,11 @@ public class CParameterGuessingTests extends AbstractContentAssistTest { assertNotNull(createFile(project, HEADER_FILE_NAME, headerContent)); return createFile(project, SOURCE_FILE_NAME, sourceContent.toString()); } + + protected static final int DEFAULT_FLAGS = IS_COMPLETION; protected void assertParametersGuesses(Map expected) throws Exception { - assertContentAssistResults(getBuffer().length() - 1, 0, expected, true, false, false, - CompareType.REPLACEMENT); + assertContentAssistResults(getBuffer().length() - 1, 0, expected, DEFAULT_FLAGS, CompareType.REPLACEMENT); } // void foo(){ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java index ae31ae8d92d..a15bdb7f7e0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java @@ -89,8 +89,10 @@ public abstract class CompletionProposalsBaseTest extends AbstractContentAssistT return bodyFile; } + protected final static int DEFAULT_FLAGS = AbstractContentAssistTest.DEFAULT_FLAGS | IS_COMPLETION; + protected void assertCompletionResults(int offset, String[] expected, CompareType compareType) throws Exception { - assertContentAssistResults(offset, expected, true, compareType); + assertContentAssistResults(offset, expected, DEFAULT_FLAGS, compareType); } public void testCompletionProposals() throws Exception { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java index a8613f22ffd..52c7cba9085 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTestBase.java @@ -22,7 +22,6 @@ public class CompletionTestBase extends AbstractContentAssistTest { private static final String CURSOR_LOCATION_TAG = "/*cursor*/"; protected int fCursorOffset; - private boolean fCheckExtraResults= true; protected IProject fProject; public CompletionTestBase(String name) { @@ -44,30 +43,15 @@ public class CompletionTestBase extends AbstractContentAssistTest { assertNotNull(createFile(project, HEADER_FILE_NAME, headerContent)); return createFile(project, SOURCE_FILE_NAME, sourceContent.toString()); } + + protected static final int DEFAULT_FLAGS = AbstractContentAssistTest.DEFAULT_FLAGS | IS_COMPLETION; - /* - * @see org.eclipse.cdt.ui.tests.text.contentassist2.AbstractContentAssistTest#doCheckExtraResults() - */ - @Override - protected boolean doCheckExtraResults() { - return fCheckExtraResults; - } - - private void setCheckExtraResults(boolean check) { - fCheckExtraResults= check; + protected void assertCompletionResults(int offset, String[] expected, CompareType compareType) throws Exception { + assertContentAssistResults(offset, expected, DEFAULT_FLAGS, compareType); } protected void assertMinimumCompletionResults(int offset, String[] expected, CompareType compareType) throws Exception { - setCheckExtraResults(false); - try { - assertCompletionResults(offset, expected, compareType); - } finally { - setCheckExtraResults(true); - } - } - - protected void assertCompletionResults(int offset, String[] expected, CompareType compareType) throws Exception { - assertContentAssistResults(offset, expected, true, compareType); + assertContentAssistResults(offset, expected, DEFAULT_FLAGS | ALLOW_EXTRA_RESULTS, compareType); } protected void assertCompletionResults(String[] expected) throws Exception { @@ -75,7 +59,7 @@ public class CompletionTestBase extends AbstractContentAssistTest { } protected void assertParameterHint(String[] expected) throws Exception { - assertContentAssistResults(fCursorOffset, expected, false, CONTEXT); + assertContentAssistResults(fCursorOffset, expected, AbstractContentAssistTest.DEFAULT_FLAGS, CONTEXT); } protected void assertDotReplacedWithArrow() throws Exception { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java index 2a954648500..ffa8c00c04a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java @@ -624,7 +624,7 @@ public class CompletionTests extends CompletionTestBase { // } public void testAliasTemplate_418479() throws Exception { final String[] expected = { "D", "E" }; - assertContentAssistResults(fCursorOffset, expected, true, ID); + assertCompletionResults(fCursorOffset, expected, ID); } //using namespace ns;void gfunc(){NSC/*cursor*/ @@ -1212,9 +1212,9 @@ public class CompletionTests extends CompletionTestBase { // Waldo::~/*cursor*/ public void testDestructorDefinition_456293() throws Exception { final String[] expectedDisplay = { "~Waldo(void)" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); final String[] expectedReplacement = { "Waldo" }; - assertContentAssistResults(fCursorOffset, expectedReplacement, true, REPLACEMENT); + assertCompletionResults(fCursorOffset, expectedReplacement, REPLACEMENT); } // template struct vector { @@ -1294,7 +1294,7 @@ public class CompletionTests extends CompletionTestBase { // template " }; - assertContentAssistResults(fCursorOffset, expected, true, DISPLAY); + assertCompletionResults(fCursorOffset, expected, DISPLAY); } // struct Wrapper { @@ -1374,7 +1374,7 @@ public class CompletionTests extends CompletionTestBase { // }; public void testTemplateInstanceMemberAccess_459047() throws Exception { final String[] expected = { "test(void)" }; - assertContentAssistResults(fCursorOffset, expected, true, ID); + assertCompletionResults(fCursorOffset, expected, ID); } // template @@ -1393,7 +1393,7 @@ public class CompletionTests extends CompletionTestBase { // A<0>::AA<0>::Type::/*cursor*/ public void testNestedTemplateSpecialization_460341() throws Exception { final String[] expected = { "i" }; - assertContentAssistResults(fCursorOffset, expected, true, ID); + assertCompletionResults(fCursorOffset, expected, ID); } // template @@ -1417,7 +1417,7 @@ public class CompletionTests extends CompletionTestBase { public void testTemplateArgumentList() throws Exception { setCommaAfterFunctionParameter(CCorePlugin.INSERT); final String[] expected = { "Specialization" }; - assertContentAssistResults(fCursorOffset, expected, true, DISPLAY); + assertCompletionResults(fCursorOffset, expected, DISPLAY); } // template @@ -1436,14 +1436,14 @@ public class CompletionTests extends CompletionTestBase { // class TestTemplateSelfReference : TestTemplate::/*cursor*/ public void testTemplateSelfReference_bug456101() throws Exception { final String[] expected = { "NestedClass" }; - assertContentAssistResults(fCursorOffset, expected, true, DISPLAY); + assertCompletionResults(fCursorOffset, expected, DISPLAY); } // template // class TestTemplateSelfReference : TClass::/*cursor*/ public void testTemplateSelfReferencePDOM_bug456101() throws Exception { final String[] expected = { "NestedClass" }; - assertContentAssistResults(fCursorOffset, expected, true, DISPLAY); + assertCompletionResults(fCursorOffset, expected, DISPLAY); } // namespace N { @@ -1452,9 +1452,9 @@ public class CompletionTests extends CompletionTestBase { // using N::fo/*cursor*/; public void testUsingCompletionWithFollowingSemicolon() throws Exception { final String[] expected = { "foo" }; - assertContentAssistResults(fCursorOffset, expected, true, REPLACEMENT); + assertCompletionResults(fCursorOffset, expected, REPLACEMENT); final String[] expectedInformation = { "null" }; - assertContentAssistResults(fCursorOffset, expectedInformation, true, CONTEXT); + assertCompletionResults(fCursorOffset, expectedInformation, CONTEXT); } // namespace N { @@ -1463,7 +1463,7 @@ public class CompletionTests extends CompletionTestBase { // using N::Tp/*cursor*/; public void testUsingCompletionWithoutTemplateArguments() throws Exception { final String[] expected = { "Tpl" }; - assertContentAssistResults(fCursorOffset, expected, true, REPLACEMENT); + assertCompletionResults(fCursorOffset, expected, REPLACEMENT); } // namespace N { @@ -1472,13 +1472,13 @@ public class CompletionTests extends CompletionTestBase { // using N::Tp/*cursor*/ public void testUsingCompletionWithoutTemplateArgumentsButSemicolon() throws Exception { final String[] expected = { "Tpl;" }; - assertContentAssistResults(fCursorOffset, expected, true, REPLACEMENT); + assertCompletionResults(fCursorOffset, expected, REPLACEMENT); } // using Alias = C/*cursor*/ public void testAliasDeclarationCompletion() throws Exception { final String[] expectedID = { "C1", "C2", "C3" }; - assertContentAssistResults(fCursorOffset, expectedID, true, ID); + assertCompletionResults(fCursorOffset, expectedID, ID); } // void default_argument(int i = 23) { @@ -1488,9 +1488,9 @@ public class CompletionTests extends CompletionTestBase { setDisplayDefaultedParameters(true); setDisplayDefaultArguments(true); final String[] expectedDisplay = { "default_argument(int i = 23) : void" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); final String[] expectedReplacement = { "default_argument(i)" }; - assertContentAssistResults(fCursorOffset, expectedReplacement, true, REPLACEMENT); + assertCompletionResults(fCursorOffset, expectedReplacement, REPLACEMENT); } // void default_argument(int i = 23) { @@ -1500,7 +1500,7 @@ public class CompletionTests extends CompletionTestBase { setDisplayDefaultedParameters(true); setDisplayDefaultArguments(false); final String[] expectedDisplay = { "default_argument(int i) : void" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); } // void default_argument(int i = 23) { @@ -1510,7 +1510,7 @@ public class CompletionTests extends CompletionTestBase { setDisplayDefaultedParameters(false); setDisplayDefaultArguments(false); final String[] expectedDisplay = { "default_argument() : void" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); } // template @@ -1520,9 +1520,9 @@ public class CompletionTests extends CompletionTestBase { setDisplayDefaultedParameters(true); setDisplayDefaultArguments(true); final String[] expectedDisplay = { "default_argument" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); final String[] expectedReplacement = { "default_argument<>" }; - assertContentAssistResults(fCursorOffset, expectedReplacement, true, REPLACEMENT); + assertCompletionResults(fCursorOffset, expectedReplacement, REPLACEMENT); } // template @@ -1532,7 +1532,7 @@ public class CompletionTests extends CompletionTestBase { setDisplayDefaultedParameters(true); setDisplayDefaultArguments(false); final String[] expectedDisplay = { "default_argument" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); } // template @@ -1542,7 +1542,7 @@ public class CompletionTests extends CompletionTestBase { setDisplayDefaultedParameters(false); setDisplayDefaultArguments(false); final String[] expectedDisplay = { "default_argument<>" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); } // template @@ -1554,7 +1554,7 @@ public class CompletionTests extends CompletionTestBase { setDisplayDefaultedParameters(true); setDisplayDefaultArguments(true); final String[] expectedDisplay = { "other_tpl>" }; - assertContentAssistResults(fCursorOffset, expectedDisplay, true, DISPLAY); + assertCompletionResults(fCursorOffset, expectedDisplay, DISPLAY); } // struct A { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java index c450c7bb045..7af3d5a79d9 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java @@ -185,8 +185,10 @@ public class CompletionTests_PlainC extends AbstractContentAssistTest { return sourceFile; } + protected static final int DEFAULT_FLAGS = AbstractContentAssistTest.DEFAULT_FLAGS | IS_COMPLETION; + protected void assertCompletionResults(String[] expected) throws Exception { - assertContentAssistResults(fCursorOffset, expected, true, CompareType.ID); + assertContentAssistResults(fCursorOffset, expected, DEFAULT_FLAGS, CompareType.ID); } //void test() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java index 231dac00fd2..2ea697e792f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ParameterHintTests.java @@ -62,7 +62,7 @@ public class ParameterHintTests extends AbstractContentAssistTest { } protected void assertParameterHints(String[] expected) throws Exception { - assertContentAssistResults(getBuffer().length() - 1, expected, false, CompareType.CONTEXT); + assertContentAssistResults(getBuffer().length() - 1, expected, DEFAULT_FLAGS, CompareType.CONTEXT); } //void foo(){aFunc( diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java index 299be909268..17d69588752 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ShowCamelCasePreferenceTest.java @@ -65,9 +65,11 @@ public class ShowCamelCasePreferenceTest extends AbstractContentAssistTest { ContentAssistPreference.SHOW_CAMEL_CASE_MATCHES); super.tearDown(); } + + protected static final int DEFAULT_FLAGS = AbstractContentAssistTest.DEFAULT_FLAGS | IS_COMPLETION; protected void assertCompletionResults(int offset, String[] expected, CompareType compareType) throws Exception { - assertContentAssistResults(offset, expected, true, compareType); + assertContentAssistResults(offset, expected, DEFAULT_FLAGS, compareType); } protected void assertCompletionResults(String[] expected) throws Exception { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java index f636b32ff23..4a40f0f7440 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java @@ -19,6 +19,7 @@ import org.eclipse.jface.text.templates.persistence.TemplateStore; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.tests.text.contentassist2.AbstractContentAssistTest.CompareType; import org.eclipse.cdt.internal.corext.template.c.CContextType; @@ -102,8 +103,11 @@ public class TemplateProposalTest extends AbstractContentAssistTest { CUIPlugin.getDefault().getTemplateStore().add(data); } + protected static final int DEFAULT_FLAGS = AbstractContentAssistTest.DEFAULT_FLAGS | IS_COMPLETION | IS_TEMPLATE; - + protected void assertCompletionResults(String[] expected) throws Exception { + assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, DEFAULT_FLAGS, CompareType.ID); + } //void func() { ///*sel-start*/test foo bar/*sel-end*/ @@ -114,7 +118,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { final String[] expected= { TEMPLATE_NAME_LINE_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -127,7 +131,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { final String[] expected= { TEMPLATE_NAME_LINE_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -139,7 +143,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { final String[] expected= { TEMPLATE_NAME_WORD_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -151,7 +155,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { final String[] expected= { TEMPLATE_NAME_WORD_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -164,7 +168,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { final String[] expected= { TEMPLATE_NAME_WORD_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -175,7 +179,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { final String[] expected= { TEMPLATE_NAME_LINE_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -188,7 +192,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { final String[] expected= { TEMPLATE_NAME_LINE_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -201,7 +205,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { TEMPLATE_NAME_LINE_SELECTION_DISP, TEMPLATE_NAME_WORD_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } //void func() { @@ -214,7 +218,7 @@ public class TemplateProposalTest extends AbstractContentAssistTest { TEMPLATE_NAME_LINE_SELECTION_DISP, TEMPLATE_NAME_WORD_SELECTION_DISP }; - assertContentAssistResults(fSelectionOffset, fSelectionLength, expected, true, true, CompareType.ID); + assertCompletionResults(expected); } }