seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Selenium] Fix unexpected fail of "CheckRestoringSplitEditorTest" selenium test (#11322)

6.19.x
Igor Ohrimenko 2018-09-25 09:47:38 +03:00 committed by GitHub
parent 8d1b665b96
commit 3eb7ee83fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidget.ui.xml
View File

@ -222,9 +222,9 @@
<g:FlowPanel addStyleNames="{style.mainPanel}" debugId="editor-tab">
<g:SimplePanel ui:field="iconPanel" styleName="{style.iconPanel}" />
<g:Label ui:field="title" styleName="{style.titlePanel}" />
<g:Label ui:field="title" styleName="{style.titlePanel}" debugId="editor-tab-title"/>
<g:FlowPanel styleName="{style.closeTabPanel}">
<g:FlowPanel ui:field="closeButton" styleName="{style.closeTabButton}">
<g:FlowPanel ui:field="closeButton" styleName="{style.closeTabButton}" debugId="editor-tab-close-icon">
<svg:SVGImage resource="{resources.closeIcon}"/>
</g:FlowPanel>
</g:FlowPanel>

97
selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CodenvyEditor.java
View File

@ -32,6 +32,7 @@ import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.DEBUGGE
import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.DEBUGGER_BREAK_POINT_ACTIVE;
import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.DEBUGGER_BREAK_POINT_INACTIVE;
import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.DEBUGGER_PREFIX_XPATH;
import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.DEFINED_EDITOR_ACTIVE_LINE_XPATH_TEMPLATE;
import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.EDITOR_TABS_PANEL;
import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.HIGHLIGHT_ITEM_PATTERN;
import static org.eclipse.che.selenium.pageobject.CodenvyEditor.Locators.HOVER_POPUP_XPATH;
@ -154,6 +155,9 @@ public class CodenvyEditor {
String CONTEXT_MENU = "//div[@id='menu-lock-layer-id']/div[2]";
String EDITOR_TABS_PANEL = "gwt-debug-multiSplitPanel-tabsPanel";
String ACTIVE_LINE_NUMBER = "gwt-debug-cursorPosition";
String DEFINED_EDITOR_ACTIVE_LINE_XPATH_TEMPLATE =
"(//div[@id='gwt-debug-editorPartStack-contentPanel'])[%s]"
+ "//div[@id='gwt-debug-cursorPosition']";
String TAB_CONTEXT_MENU_BODY = "//*[@id='gwt-debug-contextMenu/closeAllEditors']/parent::tbody";
String POSITION_CURSOR_NUMBER =
"//div[@id='gwt-debug-editorPartStack-contentPanel']//div[text()='%s']";
@ -215,6 +219,9 @@ public class CodenvyEditor {
"//div[@class='textviewTooltip' and contains(@style,'visibility: visible')]";
String AUTOCOMPLETE_PROPOSAL_DOC_ID = "gwt-debug-content-assistant-doc-popup";
String LANGUAGE_SERVER_REFACTORING_RENAME_FIELD_CSS = "input.orionCodenvy";
String FOCUSED_TAB_XPATH_TEMPLATE =
"//div[@id='gwt-debug-editor-tab-title' and text()='%s']"
+ "//parent::div[@id='gwt-debug-editor-tab' and @focused]";
}
public enum TabActionLocator {
@ -721,9 +728,13 @@ public class CodenvyEditor {
* @param positionChar char's number where cursor should be placed
*/
public void goToPosition(int positionLine, int positionChar) {
goToPosition(0, positionLine, positionChar);
}
public void goToPosition(int editorIndex, int positionLine, int positionChar) {
openGoToLineFormAndSetCursorToPosition(positionLine, positionChar);
waitActive();
waitCursorPosition(positionLine, positionChar);
waitCursorPosition(editorIndex, positionLine, positionChar);
}
/**
@ -1242,6 +1253,7 @@ public class CodenvyEditor {
*/
public void selectTabByName(String nameOfFile) {
seleniumWebDriverHelper.waitAndClick(By.xpath(format(TAB_FILE_NAME_XPATH, nameOfFile)));
waitTabSelection(0, nameOfFile);
}
/**
@ -1661,15 +1673,38 @@ public class CodenvyEditor {
/**
* Gets current cursor position, it means line's number and char's number.
*
* @return cursor position which defined in line's number and char's number.
* @return cursor position which defined in line's {@link Pair#first} number and char's {@link
* Pair#second} number.
*/
public Pair<Integer, Integer> getCurrentCursorPositionsFromVisible() {
public Pair<Integer, Integer> getCurrentCursorPosition() {
waitActive();
WebElement currentActiveElement =
activeLineNumbers.stream().filter(webElement -> webElement.isDisplayed()).findFirst().get();
return getCursorPositionFromWebElement(currentActiveElement);
}
public Pair<Integer, Integer> getCurrentCursorPosition(int editorIndex) {
int adoptedIndexOfEditor = editorIndex + 1;
String editorActiveLineXpath =
format(DEFINED_EDITOR_ACTIVE_LINE_XPATH_TEMPLATE, adoptedIndexOfEditor);
List<WebElement> positionWidget =
seleniumWebDriverHelper.waitPresenceOfAllElements(By.xpath(editorActiveLineXpath));
String cursorPosition =
positionWidget
.stream()
.filter(element -> !element.getText().isEmpty())
.findFirst()
.get()
.getText();
List<String> lineAndCharPosition = asList(cursorPosition.split(":"));
int positionRow = Integer.parseInt(lineAndCharPosition.get(0));
int positionChar = Integer.parseInt(lineAndCharPosition.get(1));
return new Pair<>(positionRow, positionChar);
}
/**
* Waits active and focused editor's tab and gets cursor position.
*
@ -1693,13 +1728,20 @@ public class CodenvyEditor {
* @param charPosition char's position where cursor should be placed
*/
public void waitCursorPosition(final int linePosition, final int charPosition) {
waitCursorPosition(0, linePosition, charPosition);
}
public void waitCursorPosition(
final int editorIndex, final int linePosition, final int charPosition) {
webDriverWaitFactory
.get()
.until(
(ExpectedCondition<Boolean>)
webDriver ->
(getCursorPositionsFromActive().first == linePosition)
&& (getCursorPositionsFromActive().second == charPosition));
webDriver -> {
Pair<Integer, Integer> position = getCurrentCursorPosition(editorIndex);
return (linePosition == position.first) && (charPosition == position.second);
});
}
private Pair<Integer, Integer> getCursorPositionFromWebElement(WebElement webElement) {
@ -1711,7 +1753,7 @@ public class CodenvyEditor {
/** Gets number of the current line where cursor is placed */
public int getPositionVisible() {
waitActive();
return getCurrentCursorPositionsFromVisible().first;
return getCurrentCursorPosition().first;
}
/**
@ -1732,7 +1774,7 @@ public class CodenvyEditor {
* @return number of the char's position on which cursor is placed
*/
public int getPositionOfChar() {
return getCurrentCursorPositionsFromVisible().second;
return getCurrentCursorPosition().second;
}
/**
@ -2058,12 +2100,51 @@ public class CodenvyEditor {
* @param tabName title of the editor's tab which is split
*/
public void selectTabByIndexEditorWindow(int index, String tabName) {
selectTab(index, tabName);
waitTabSelection(index, tabName);
seleniumWebDriverHelper.waitSuccessCondition(
driver -> {
if (isTabFocused(index, tabName)) {
return true;
}
selectTab(index, tabName);
return false;
});
}
private void selectTab(int index, String tabName) {
seleniumWebDriverHelper
.waitPresenceOfAllElements(By.xpath(format(TAB_FILE_NAME_XPATH, tabName)))
.get(index)
.click();
}
public boolean isTabSelected(int editorIndex, String tabTitle) {
return null != getEditorTabs(tabTitle).get(editorIndex).getAttribute("active");
}
public boolean isTabFocused(int editorIndex, String tabTitle) {
return null != getEditorTabs(tabTitle).get(editorIndex).getAttribute("focused");
}
public void waitTabSelection(int editorIndex, String tabTitle) {
seleniumWebDriverHelper.waitSuccessCondition(driver -> isTabSelected(editorIndex, tabTitle));
}
public void waitTabFocusing(int editorIndex, String tabTitle) {
seleniumWebDriverHelper.waitSuccessCondition(driver -> isTabFocused(editorIndex, tabTitle));
}
private List<WebElement> getEditorTabs(String tabTitle) {
final String editorTabXpathTemplate =
"//div[@id='gwt-debug-editor-tab']//div[text()='%s']//parent::div[@id='gwt-debug-editor-tab']";
final String editorTabXpath = format(editorTabXpathTemplate, tabTitle);
return seleniumWebDriverHelper.waitVisibilityOfAllElements(By.xpath(editorTabXpath));
}
/**
* Selects window of certain {@code index} of split editor's tab with specified {@code tabName}
* and opens context menu for this tab.

13
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/CheckRestoringSplitEditorTest.java
View File

@ -85,7 +85,7 @@ public class CheckRestoringSplitEditorTest {
projectExplorer.waitItem(PROJECT_NAME);
projectExplorer.quickExpandWithJavaScript();
splitEditorAndOpenFiles();
setPositionsForSplittedEditor();
setPositionsForSplitEditor();
editor.waitActive();
if (popupDialogsBrowser.isAlertPresent()) {
popupDialogsBrowser.acceptAlert();
@ -117,7 +117,7 @@ public class CheckRestoringSplitEditorTest {
editor.waitActive();
editor.selectTabByName(nameOfEditorTab);
editor.waitCursorPosition(pair.first, pair.second);
editor.waitCursorPosition(numOfEditor - 1, pair.first, pair.second);
try {
editor.waitTextInDefinedSplitEditor(
@ -145,13 +145,12 @@ public class CheckRestoringSplitEditorTest {
projectExplorer.openItemByPath(PROJECT_NAME + "/" + namePomFile);
}
private void setPositionsForSplittedEditor() {
private void setPositionsForSplitEditor() {
editor.selectTabByIndexEditorWindow(0, javaClassTab);
editor.goToCursorPositionVisible(
cursorPositionForJavaFile.first, cursorPositionForJavaFile.second);
editor.goToPosition(0, cursorPositionForJavaFile.first, cursorPositionForJavaFile.second);
editor.selectTabByName(readmeFileName);
editor.goToPosition(cursorPositionForReadMeFile.first, cursorPositionForReadMeFile.second);
editor.goToPosition(1, cursorPositionForReadMeFile.first, cursorPositionForReadMeFile.second);
editor.selectTabByName(pomFileTab);
editor.goToPosition(cursorPositionForPomFile.first, cursorPositionForPomFile.second);
editor.goToPosition(2, cursorPositionForPomFile.first, cursorPositionForPomFile.second);
}
}