MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
anna
2012-07-20 11:09:15 +02:00
parent 2d80237442 9174f21059
commit 05c59c4737
12 changed files with 258 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/template/PreferStartMatchesInLookups.java
+11
View File
@@ -0,0 +1,11 @@
import java.util.*;
class BarGoo {}
class Foo {
{
Map<BarGoo, StringBuilder> goos;
<caret>
}
}
java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
+27 -12
View File
@@ -40,7 +40,6 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
@Override
protected void tearDown() throws Exception {
((TemplateManagerImpl)TemplateManager.getInstance(getProject())).setTemplateTesting(false);
TemplateState state = TemplateManagerImpl.getTemplateState(myFixture.getEditor());
if (state != null) {
state.gotoEnd();
}
@@ -147,28 +146,44 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
public void testToar() throws Throwable {
configure();
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate("toar", "other"));
TemplateManagerImpl.getTemplateState(getEditor()).gotoEnd();
startTemplate("toar", "other")
state.gotoEnd();
checkResult();
}
def startTemplate(String name, String group) {
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate(name, group));
}
private void configure() {
myFixture.configureByFile(getTestName(false) + ".java");
}
public void testIter() throws Throwable {
configure();
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate("iter", "iterations"));
final TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
startTemplate("iter", "iterations")
state.nextTab();
((LookupImpl)LookupManagerImpl.getActiveLookup(getEditor())).finishLookup((char)0);
checkResult();
}
public void testPreferStartMatchesInLookups() throws Throwable {
configure();
startTemplate("iter", "iterations")
myFixture.type('ese\n') //for entrySet
assert myFixture.lookupElementStrings == ['barGooStringBuilderEntry', 'gooStringBuilderEntry', 'stringBuilderEntry', 'builderEntry', 'entry']
myFixture.type('e')
assert myFixture.lookupElementStrings == ['entry', 'barGooStringBuilderEntry', 'gooStringBuilderEntry', 'stringBuilderEntry', 'builderEntry']
assert LookupManager.getActiveLookup(editor).currentItem.lookupString == 'entry'
}
private TemplateState getState() {
TemplateManagerImpl.getTemplateState(getEditor())
}
public void testIter1() throws Throwable {
configure();
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate("iter", "iterations"));
final TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
startTemplate("iter", "iterations")
state.nextTab();
checkResult();
}
@@ -178,7 +193,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
try {
configure();
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate("iter", "iterations"));
startTemplate("iter", "iterations")
stripTrailingSpaces();
checkResult();
}
@@ -196,20 +211,20 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
public void testIterParameterizedInner() {
configure();
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate("iter", "iterations"));
startTemplate("iter", "iterations")
stripTrailingSpaces();
checkResult();
}
public void testVarargToar() {
configure();
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate("toar", "other"));
startTemplate("toar", "other")
checkResult();
}
public void testSoutp() {
configure();
TemplateManager.getInstance(getProject()).startTemplate(getEditor(), TemplateSettings.getInstance().getTemplate("soutp", "output"));
startTemplate("soutp", "output")
checkResult();
}
@@ -354,7 +369,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase {
writeCommand { manager.startTemplate(editor, template) }
final TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
final TemplateState state = getState();
for (int i = 0; i < 3; i++) {
assertFalse(String.valueOf(i), state.isFinished());