Skip to content
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.

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

Remove suppressing rules #5268

Merged
merged 3 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
</module>
<module name="ReturnCount">
<property name="severity" value="error" />
<property name="max" value="2" />
<property name="max" value="3" />
</module>
<module name="StringLiteralEquality">
<property name="severity" value="error" />
Expand Down
7 changes: 0 additions & 7 deletions config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@
<suppress checks="JavadocStyle" files=".*.java"/>

<!-- Minor, useless, not definite rules -->
<suppress checks="NeedBraces" files=".*.java"/>
<suppress checks="ReturnCount" files=".*.java"/>
<suppress checks="RegexpSingleline" files=".*.java"/>
<suppress checks="DeclarationOrder" files=".*.java"/>
<suppress checks="VisibilityModifier" files=".*.java"/>
<suppress checks="AvoidStarImport" files=".*.java"/>
<suppress checks="EqualsAvoidNull" files=".*.java"/>
<suppress checks="MagicNumber" files=".*.java"/>
<suppress checks="ExplicitInitialization" files=".*.java"/>
<suppress checks="SuperClone" files=".*.java"/>
<suppress checks="IllegalThrows" files=".*.java"/>
<suppress checks="MissingDeprecated" files=".*.java"/>
</suppressions>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public MUITableColumnAssert<T> sorting(ColumnSorting columnSorting) {
SoftAssert.jdiAssert(element().sorting(), Matchers.is(columnSorting));
return this;
}

@JDIAction("Check that '{name}' has cell in row {0}")
public MUITableColumnAssert<T> cell(int rowIndex) {
SoftAssert.jdiAssert(element().cell(rowIndex).isExist() ? "is exist" : "is not exist", Matchers.is("is exist"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public MUITableJoinedCellAssert text(Matcher<String> condition) {
SoftAssert.jdiAssert(element().getText(), condition);
return this;
}

@Override
public MUITableJoinedCellAssert text(String condition) {
return text(Matchers.equalTo(condition));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ public MUITableRowAssert cells(Matcher<List<? extends MUITableCell<?>>> conditio
SoftAssert.jdiAssert(element().cells(), condition);
return this;
}

@JDIAction("Check that '{name}' row cells text matches {0}")
public MUITableRowAssert cellsMatch(List<String> cellsValueExpected) {
SoftAssert.jdiAssert(element().cellsText(), Matchers.contains(cellsValueExpected.toArray(new String[0])));
return this;
}

@JDIAction("Check that '{name}' row cells text does not match {0}")
public MUITableRowAssert cellsDontMatch(List<String> cellsValueExpected) {
SoftAssert.jdiAssert(element().cellsText(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import static com.epam.jdi.light.driver.WebDriverFactory.jsExecute;

public class MUITable extends UIBaseElement<MUITableAssert> implements HasAssert<MUITableAssert>, ISetup {

private String rowLocator;
private String columnLocator;
private String columnMenuLocator;
Expand Down Expand Up @@ -178,7 +178,7 @@ public MUITableColumn<MUITableDefaultCell> column(String columnName) {
public MUITableColumn<MUITableDefaultCell> column(int rowIndex, String value) {
return column(rowIndex, value, MUITableDefaultCell.class);
}

/**
* The method is used for a tables where a header column has sub-columns, e.x.:
* <p>
Expand All @@ -198,7 +198,7 @@ public MUITableColumn<MUITableDefaultCell> column(int rowIndex, String value) {
public MUITableJoinedColumn joinedColumn(String columnName) {
List<Integer> columnIndexes = tableHeader.subColumnsIndexes(columnName);
MUITableDefaultCell mainHeaderCell = tableHeader.cell(columnName, MUITableDefaultCell.class);

List<MUITableJoinedCell> cells = new ArrayList<>();
List<MUITableRow> rows = rows();
for (MUITableRow row : rows) {
Expand All @@ -211,7 +211,7 @@ public MUITableJoinedColumn joinedColumn(String columnName) {
}
return new MUITableJoinedColumn(mainHeaderCell.columnIndex(), cells);
}

@JDIAction("Get '{name}' column menu")
public Menu columnMenu() {
return new Menu().setCore(Menu.class, UIFactory.$(columnMenuLocator));
Expand Down Expand Up @@ -257,20 +257,19 @@ public MUITableAssert is() {
return new MUITableAssert().set(this);
}


@JDIAction("Scroll table content and return list of rows")
private List<MUITableRow> scroll(int columnsOffsetPixels, int rowsNumber) {
if (!scrollableElementLocator.isEmpty()) {
String rowHeightScript = "return document.evaluate(\"%s//div[@role = 'row']\", document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.offsetHeight";
Object scriptResult = jsExecute(String.format(rowHeightScript, scrollableElementLocator));
int rowHeight = Integer.parseInt(scriptResult.toString());
int rowHeight = Integer.parseInt(scriptResult.toString());

String script = "document.evaluate(\"%s\", document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.scrollBy(%d, %d)";
jsExecute(String.format(script, scrollableElementLocator, columnsOffsetPixels, rowHeight * rowsNumber));
}
return rows();
}

/**
* Scrolling by rows amount
* @param rowsNumber the number of the row to scroll down
Expand All @@ -279,7 +278,7 @@ private List<MUITableRow> scroll(int columnsOffsetPixels, int rowsNumber) {
public List<MUITableRow> scrollDown(int rowsNumber) {
return scroll(0, rowsNumber);
}

/**
* Scrolling by rows amount
* @param rowsNumber the number of the row to scroll up
Expand All @@ -288,7 +287,7 @@ public List<MUITableRow> scrollDown(int rowsNumber) {
public List<MUITableRow> scrollUp(int rowsNumber) {
return scroll(0, -rowsNumber);
}

/**
* Scrolling right by pixels
* @param columnsOffsetPixel the number of the pixels to scroll right
Expand All @@ -297,7 +296,7 @@ public List<MUITableRow> scrollUp(int rowsNumber) {
public List<MUITableRow> scrollRight(int columnsOffsetPixel) {
return scroll(columnsOffsetPixel, 0);
}

/**
* Scrolling left by pixels
* @param columnsOffsetPixel the number of the pixels to scroll left
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public boolean isExist() {
public int size() {
return cells().size();
}

@JDIAction("Check that '{name}' is sorted")
public boolean isSorted() {
return cells().get(0).core().hasAttribute("aria-sort");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class MUITableHeader extends MUITableCellContainer<MUITableHeaderAssert>
private final String columnHeaderLocator;
private final String buttonLocator;
private final String selectedRowsLocator;

public MUITableHeader(JMUITableHeader tableHeader) {
super(0);
this.headerRowLocator = tableHeader.headerRow();
Expand All @@ -32,7 +32,7 @@ public MUITableHeader(JMUITableHeader tableHeader) {
this.selectedRowsLocator = tableHeader.selectedRows();
base().setLocator(tableHeader.root());
}

@JDIAction("Get '{name}' selected rows amount")
public int selectedRows() {
Text selectedRows = new Text().setCore(Text.class, core().find(selectedRowsLocator));
Expand All @@ -54,7 +54,7 @@ public Button button() {
public MUITableHeaderAssert is() {
return new MUITableHeaderAssert().set(this);
}

public List<MUITableRow> headerRows() {
if (rows.isEmpty()) {
List<UIElement> rowList = core().finds(headerRowLocator).stream()
Expand All @@ -66,7 +66,7 @@ public List<MUITableRow> headerRows() {
}
return rows;
}

public <T extends MUITableCell<?>> T cell(String columnHeader, Class<T> cellType) {
Optional<MUITableRow> matchedHeaderRow = headerRows().stream().filter(hRow -> {
MUITableDefaultCell cell = hRow.cell(columnHeader);
Expand All @@ -78,15 +78,15 @@ public <T extends MUITableCell<?>> T cell(String columnHeader, Class<T> cellType
return createCellInstance(-1, -1, cellType);
}
}

public MUITableDefaultCell cell(String columnName) {
return cell(columnName, MUITableDefaultCell.class);
}

public MUITableDefaultCell cell(int columnNumber) {
return headerRows().get(headerRows().size() - 1).cell(columnNumber);
}

public MUITableColumn<MUITableDefaultCell> column(String columnName) {
MUITableDefaultCell cell = cell(columnName, MUITableDefaultCell.class);
return new MUITableColumn<>(cell.columnIndex(), Collections.singletonList(cell), MUITableDefaultCell.class);
Expand All @@ -96,7 +96,7 @@ public MUITableColumn<MUITableDefaultCell> column(int columnNumber) {
MUITableDefaultCell cell = cell(columnNumber);
return new MUITableColumn<>(cell.columnIndex(), Collections.singletonList(cell), MUITableDefaultCell.class);
}

public List<Integer> subColumnsIndexes(String columnName) {
List<Integer> columnIndexes = new ArrayList<>();
for (int i = 1; i <= headerRows().size(); i++) {
Expand All @@ -116,7 +116,7 @@ public List<Integer> subColumnsIndexes(String columnName) {
}
return columnIndexes;
}

private int getColspanSumOnTheLeftFromTargetColumn(MUITableRow row, int targetColumnIndex) {
int sum = 0;
List<MUITableDefaultCell> cells = row.cells();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
import com.epam.jdi.light.material.asserts.displaydata.table.MUITableJoinedCellAssert;

public class MUITableJoinedCell extends MUITableCell<MUITableJoinedCellAssert> implements IsText, HasClick {

private Map<String, MUITableDefaultCell> subColumns;

protected MUITableJoinedCell(int rowIndex, Map<String, MUITableDefaultCell> subColumns) {
super(rowIndex, -1);
this.subColumns = subColumns;
}

@Override
public String getText() {
StringBuilder joinedCellsValue = new StringBuilder();
for (Entry<String, MUITableDefaultCell> subColumn : subColumns.entrySet()) {
String cellText = subColumn.getValue().getText();
if (subColumns.size() > 1) {
joinedCellsValue.append(String.format("%s: %s; ",
joinedCellsValue.append(String.format("%s: %s; ",
subColumn.getKey(),
cellText));
} else {
Expand All @@ -31,7 +31,7 @@ public String getText() {
}
return joinedCellsValue.toString();
}

@Override
public MUITableJoinedCellAssert has() {
return new MUITableJoinedCellAssert().set(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
public class MUITableJoinedColumn extends MUITableCellContainer<MUITableColumnAssert<MUITableJoinedCell>> {

private final List<MUITableJoinedCell> cells;

public MUITableJoinedColumn(int mainColumnIndex, List<MUITableJoinedCell> rows) {
super(mainColumnIndex);
this.cells = rows;
}

public MUITableJoinedCell cell(int rowNumber) {
return cells.get(rowNumber - 1);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@ public UIElement content() {
public <T extends UIElement> T content(Class<T> clazz) {
return this.content().with(clazz);
}

}
Loading