Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anna Kozlova
2014-10-31 16:21:24 +01:00
46 changed files with 551 additions and 235 deletions
@@ -239,6 +239,14 @@ class Intf {
assert !(sdkRun in noLibs)
}
public void "test super method not matching query qualifier"() {
def base = myFixture.addClass("class Base { void xpaint() {} }").methods[0]
def sub = myFixture.addClass("class Sub extends Base { void xpaint() {} }").methods[0]
assert getPopupElements(new GotoSymbolModel2(project), 'Ba.xpai', false) == [base]
assert getPopupElements(new GotoSymbolModel2(project), 'Su.xpai', false) == [sub]
}
private List<Object> getPopupElements(ChooseByNameModel model, String text, boolean checkboxState = false) {
return calcPopupElements(createPopup(model), text, checkboxState)
}