From adc3e49da63bb750dff1334d88b06db1776af974 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Wed, 9 Feb 2022 21:20:43 +0100 Subject: [PATCH] Refactoring: use hasSize() with assertJ --- .../integration/helpers/IntegrationTestHelper.java | 2 +- .../integration/selenium/SearchTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java b/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java index d62e3eb84..6ede04436 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java +++ b/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java @@ -177,7 +177,7 @@ public class IntegrationTestHelper .isEqualTo(Localization.getString("info.title.database.import.dialog")); List<WebElement> tableRows = driver.findElements(By.cssSelector(".container form table tr")); - assertThat(tableRows.size()).isEqualTo(destinationAccounts.size()); + assertThat(tableRows).hasSize(destinationAccounts.size()); for(int i = 0; i < destinationAccounts.size(); i++) { diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java index 2581feaf0..c39891c95 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java @@ -61,7 +61,7 @@ class SearchTest extends SeleniumTestBase // results List<WebElement> results = driver.findElements(By.cssSelector(".search-container .card-panel")); - assertThat(results.size()).isEqualTo(10); + assertThat(results).hasSize(10); } @Test @@ -80,13 +80,13 @@ class SearchTest extends SeleniumTestBase // validate results List<WebElement> results = driver.findElements(By.cssSelector(".search-container .card-panel")); - assertThat(results.size()).isEqualTo(10); + assertThat(results).hasSize(10); // === PAGE 1 === pages.get(3).click(); pages = driver.findElements(By.cssSelector(".pagination-position-top .pagination li")); - assertThat(pages.size()).isEqualTo(5); + assertThat(results).hasSize(5); // previous button should be enabled assertThat(pages.get(0).getAttribute("class")).doesNotContain("disabled"); @@ -101,7 +101,7 @@ class SearchTest extends SeleniumTestBase // validate results = driver.findElements(By.cssSelector(".search-container .card-panel")); - assertThat(results.size()).isEqualTo(4); + assertThat(results).hasSize(4); } @Test @@ -124,7 +124,7 @@ class SearchTest extends SeleniumTestBase // results List<WebElement> results = driver.findElements(By.cssSelector(".search-container .card-panel")); - assertThat(results.size()).isEqualTo(2); + assertThat(results).hasSize(2); } @Test @@ -135,7 +135,7 @@ class SearchTest extends SeleniumTestBase assertThat(driver.findElement(By.cssSelector(".headline-date")).getText()).isEqualTo("May 2019"); List<WebElement> transactionsRows = driver.findElements(By.cssSelector(".transaction-container .hide-on-med-and-down.transaction-row-top")); - assertThat(transactionsRows.size()).isEqualTo(25); + assertThat(transactionsRows).hasSize(25); assertThat(transactionsRows.get(0).getAttribute("class")).contains("background-blue-light"); for(int i = 1; i < transactionsRows.size(); i++) { -- GitLab