Skip to content

Refactor combobox remove redundant elementfinder #9 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 22, 2019
Merged

Refactor combobox remove redundant elementfinder #9 #37

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7125a1a
refactored state of elements
Aug 8, 2019
0c16676
re-check waitForNotExists methods for correct work. split 1 test to 2…
Aug 9, 2019
b0567a6
removed IElementWithState interface
Aug 9, 2019
9fc21fd
refactored conditional wait
Aug 9, 2019
59f2641
merged with the master branch
Aug 9, 2019
6e6fe54
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 13, 2019
f1ca748
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 16, 2019
7f03255
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 21, 2019
1dc49f6
Merge branch 'master' of https://github.com/aquality-automation/aqual…
Aug 21, 2019
1bcac4b
removed redundant ElementFinder usage from getSelectedText() and getV…
Aug 21, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/main/java/aquality/selenium/elements/ComboBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,12 @@ public void clickAndSelectByValue(String value) {

@Override
public String getSelectedText() {
if(ElementFinder.getInstance().findElements(getLocator(), getDefaultTimeout(), getElementState()).isEmpty()) {
throw new IllegalStateException(String.format(getLocManager().getValue("loc.element.wasnotfoundinstate"), getName(), getElementState(), getDefaultTimeout()));
}
return ElementActionRetrier.doWithRetry(() -> new Select(getElement()).getFirstSelectedOption().getText());
}

@Override
public List<String> getValues() {
getLogger().info(getLocManager().getValue("loc.combobox.get.values"));
if(ElementFinder.getInstance().findElements(getLocator(), getDefaultTimeout(), getElementState()).isEmpty()){
throw new IllegalStateException(String.format(getLocManager().getValue("loc.element.wasnotfoundinstate"), getName(), getElementState(), getDefaultTimeout()));
}
return ElementActionRetrier.doWithRetry(() ->
new Select(getElement()).getOptions()
.stream()
Expand Down