From 0e300a1be800ef7a3951f296974b83ca5d26ca33 Mon Sep 17 00:00:00 2001 From: parthp2107 <83201188+parthp2107@users.noreply.github.com> Date: Tue, 30 Nov 2021 17:08:18 +0530 Subject: [PATCH] added orders to test classes and did minor changes to tests (#1474) * added orders to test classes and added minor changes to tests * minor change * minor change --- .../DashboardDetailsPageTest.java | 1 + .../DashboardServiceTestPage.java | 1 + .../DatabaseServicePageTest.java | 1 + .../pages/ingestion/IngestionPageTest.java | 3 ++- .../MessagingServicePageTest.java | 1 + .../selenium/pages/myData/MyDataPageTest.java | 10 ++++++-- .../PipelineDetailsPageTest.java | 1 + .../PipelineServiceTestPage.java | 1 + .../tableDetails/TableDetailsPageTest.java | 25 ++++++++++--------- .../selenium/pages/tags/TagsPageTest.java | 1 + .../selenium/pages/teams/TeamsPageTest.java | 1 + .../topicDetails/TopicDetailsPageTest.java | 1 + .../test/resources/junit-platform.properties | 1 + 13 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 openmetadata-ui/src/test/resources/junit-platform.properties diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java index 8db2bdffd43..f1f515d2aa4 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java @@ -36,6 +36,7 @@ import org.openqa.selenium.support.ui.WebDriverWait; import java.time.Duration; import java.util.ArrayList; +@Order(5) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class DashboardDetailsPageTest { static WebDriver webDriver; diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardService/DashboardServiceTestPage.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardService/DashboardServiceTestPage.java index b70649e1597..6600e476266 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardService/DashboardServiceTestPage.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardService/DashboardServiceTestPage.java @@ -38,6 +38,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; +@Order(9) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class DashboardServiceTestPage { static WebDriver webDriver; diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/databaseService/DatabaseServicePageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/databaseService/DatabaseServicePageTest.java index 87a4284a4a5..5718ecf85e5 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/databaseService/DatabaseServicePageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/databaseService/DatabaseServicePageTest.java @@ -38,6 +38,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; +@Order(8) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class DatabaseServicePageTest { diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/ingestion/IngestionPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/ingestion/IngestionPageTest.java index 16dbb0a9df6..8e5bad37da0 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/ingestion/IngestionPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/ingestion/IngestionPageTest.java @@ -35,6 +35,7 @@ import org.junit.jupiter.api.MethodOrderer; import java.time.Duration; import java.util.ArrayList; +@Order(12) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class IngestionPageTest { @@ -75,7 +76,7 @@ public class IngestionPageTest { openIngestionPage(); Events.click(webDriver, By.cssSelector("[data-testid='add-new-ingestion-button']")); Events.sendKeys(webDriver, By.cssSelector("[id='name'][name='name']"), faker.name().firstName()); - Events.click(webDriver, By.cssSelector("[value='BigQuery$$bigquery']")); + Events.click(webDriver, By.cssSelector("[value='BigQuery$$bigquery_gcp']")); Events.click(webDriver, By.cssSelector("[value='bigquery']")); Events.click(webDriver, By.cssSelector("[data-testid='next-button']")); Events.sendKeys(webDriver, By.cssSelector("[name='username']"), "openmetadata_user"); diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/messagingService/MessagingServicePageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/messagingService/MessagingServicePageTest.java index 1a1823502a0..45a1d540022 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/messagingService/MessagingServicePageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/messagingService/MessagingServicePageTest.java @@ -38,6 +38,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; +@Order(11) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MessagingServicePageTest { static WebDriver webDriver; diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/myData/MyDataPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/myData/MyDataPageTest.java index 9f188564890..2e2cd6d57e1 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/myData/MyDataPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/myData/MyDataPageTest.java @@ -18,8 +18,10 @@ package org.openmetadata.catalog.selenium.pages.myData; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.openmetadata.catalog.selenium.events.Events; import org.openmetadata.catalog.selenium.properties.Property; import org.openqa.selenium.By; @@ -33,6 +35,8 @@ import org.openqa.selenium.support.ui.WebDriverWait; import java.time.Duration; import java.util.ArrayList; +@Order(1) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MyDataPageTest { static WebDriver webDriver; @@ -145,8 +149,9 @@ public class MyDataPageTest { Events.click(webDriver, By.cssSelector("[data-testid='list-item']")); // Select User/Team Events.click(webDriver, By.cssSelector("[data-testid='saveManageTab']")); // Save Events.click(webDriver, By.cssSelector("[data-testid='image']")); + webDriver.navigate().refresh(); Events.click(webDriver, By.cssSelector("[data-testid='tab'][id='myDataTab']")); // My Data - Events.click(webDriver, By.cssSelector("[data-testid='table-link']")); + Events.click(webDriver, By.xpath("//a[@data-testid='table-link']//button")); } @Test @@ -157,8 +162,9 @@ public class MyDataPageTest { Events.click(webDriver, By.xpath("(//a[@data-testid='table-link'])[last()]")); Events.click(webDriver, By.cssSelector("[data-testid='follow-button']")); Events.click(webDriver, By.cssSelector("[data-testid='image']")); + webDriver.navigate().refresh(); Events.click(webDriver, By.cssSelector("[data-testid='tab'][id='followingTab']")); // Following - Events.click(webDriver, By.cssSelector("[data-testid='table-link']")); + Events.click(webDriver, By.xpath("//a[@data-testid='table-link']//button")); } @Test diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineDetails/PipelineDetailsPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineDetails/PipelineDetailsPageTest.java index d9b6d8f6618..99932b6f56f 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineDetails/PipelineDetailsPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineDetails/PipelineDetailsPageTest.java @@ -38,6 +38,7 @@ import org.junit.jupiter.api.MethodOrderer; import java.time.Duration; import java.util.ArrayList; +@Order(6) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PipelineDetailsPageTest { static WebDriver webDriver; diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineService/PipelineServiceTestPage.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineService/PipelineServiceTestPage.java index 90f0e4aefc3..0f0fa171cd8 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineService/PipelineServiceTestPage.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/pipelineService/PipelineServiceTestPage.java @@ -38,6 +38,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; +@Order(10) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class PipelineServiceTestPage { static WebDriver webDriver; diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java index b76fbf485d4..31902d06e2d 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java @@ -37,6 +37,7 @@ import org.junit.jupiter.api.MethodOrderer; import java.time.Duration; import java.util.ArrayList; +@Order(4) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TableDetailsPageTest { static WebDriver webDriver; @@ -158,16 +159,16 @@ public class TableDetailsPageTest { Events.sendKeys(webDriver, By.cssSelector("[data-testid='searchBox']"), tableName); Events.click(webDriver, By.cssSelector("[data-testid='data-name']")); Events.click(webDriver, By.xpath("(//button[@data-testid='tab'])[2]")); // Profiler - for (int i = 1; i <= 4; i++) { - Events.click( - webDriver, By.xpath("(//td[@data-testid='tableBody-cell']//span)" + "[" + i + "]")); // Profiler - actions.moveToElement( - webDriver.findElement(By.xpath("(//tr[@data-testid='tableBody-row']//td" + "[" + i + "]" + ")"))) - .perform(); - Events.click( - webDriver, By.xpath("(//td[@data-testid='tableBody-cell']//span)" + "[" + i + "]")); // Profiler - Thread.sleep(waitTime); - } +// for (int i = 1; i <= 4; i++) { +// Events.click( +// webDriver, By.xpath("(//td[@data-testid='tableBody-cell']//span)" + "[" + i + "]")); // Profiler +// actions.moveToElement( +// webDriver.findElement(By.xpath("(//tr[@data-testid='tableBody-row']//td" + "[" + i + "]" + ")"))) +// .perform(); +// Events.click( +// webDriver, By.xpath("(//td[@data-testid='tableBody-cell']//span)" + "[" + i + "]")); // Profiler +// Thread.sleep(waitTime); +// } } @Test @@ -245,7 +246,7 @@ public class TableDetailsPageTest { openExplorePage(); webDriver.findElement(By.cssSelector("[data-testid='searchBox']")).sendKeys("fact_sale"); Events.click(webDriver, By.cssSelector("[data-testid='data-name']")); - Events.click(webDriver, By.xpath("(//div[@data-testid='related-tables-data']//a)")); + Events.click(webDriver, By.xpath("(//div[@data-testid='related-tables-data']/a)")); // for (int i = 1; i <= 3; i++) { // Events.click(webDriver, By.xpath("(//div[@data-testid='related-tables-data']//a)" + "[" + i + "]")); // webDriver.navigate().back(); @@ -266,7 +267,7 @@ public class TableDetailsPageTest { webDriver.findElement(By.cssSelector("[data-testid='searchBox']")).sendKeys("fact_sale"); Events.click(webDriver, By.cssSelector("[data-testid='data-name']")); Events.click(webDriver, By.xpath( - "(//div[@data-testid='frequently-joined-columns']//span//a)")); + "(//div[@data-testid='frequently-joined-columns']/span/a)")); } @AfterEach diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tags/TagsPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tags/TagsPageTest.java index 1f149021fea..5f21ee8c09a 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tags/TagsPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tags/TagsPageTest.java @@ -36,6 +36,7 @@ import org.junit.jupiter.api.MethodOrderer; import java.time.Duration; import java.util.ArrayList; +@Order(3) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TagsPageTest { diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java index 09d31d473b6..de51b114555 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java @@ -36,6 +36,7 @@ import org.junit.jupiter.api.MethodOrderer; import java.time.Duration; import java.util.ArrayList; +@Order(2) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TeamsPageTest { diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/topicDetails/TopicDetailsPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/topicDetails/TopicDetailsPageTest.java index ab4e814834a..d539819e4fd 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/topicDetails/TopicDetailsPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/topicDetails/TopicDetailsPageTest.java @@ -36,6 +36,7 @@ import org.junit.jupiter.api.MethodOrderer; import java.time.Duration; import java.util.ArrayList; +@Order(7) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TopicDetailsPageTest { static WebDriver webDriver; diff --git a/openmetadata-ui/src/test/resources/junit-platform.properties b/openmetadata-ui/src/test/resources/junit-platform.properties new file mode 100644 index 00000000000..6011214f1fd --- /dev/null +++ b/openmetadata-ui/src/test/resources/junit-platform.properties @@ -0,0 +1 @@ +junit.jupiter.testclass.order.default = org.junit.jupiter.api.ClassOrderer$OrderAnnotation \ No newline at end of file