diff --git a/catalog-rest-service/pom.xml b/catalog-rest-service/pom.xml index 1891f9a5fae..950cc16d6a5 100644 --- a/catalog-rest-service/pom.xml +++ b/catalog-rest-service/pom.xml @@ -169,11 +169,6 @@ com.fasterxml.jackson.core jackson-databind - - org.openmetadata - common - ${project.version} - org.glassfish.jersey.media jersey-media-json-jackson @@ -237,10 +232,6 @@ org.glassfish.jersey.core jersey-client - - org.junit.jupiter - junit-jupiter-engine - io.dropwizard dropwizard-client @@ -271,25 +262,25 @@ org.testcontainers testcontainers - 1.16.3 + 1.17.1 test org.testcontainers junit-jupiter - 1.16.3 + 1.17.1 test org.testcontainers postgresql - 1.16.3 + 1.17.1 test org.testcontainers mysql - 1.16.3 + 1.17.1 test diff --git a/openmetadata-ui/pom.xml b/openmetadata-ui/pom.xml index 3a21bb88a53..710605d926f 100644 --- a/openmetadata-ui/pom.xml +++ b/openmetadata-ui/pom.xml @@ -14,6 +14,7 @@ 2.0.12-1 7.5 + 4.1.1 false @@ -64,12 +65,6 @@ ${org.junit.jupiter.version} test - - io.github.artsok - rerunner-jupiter - 2.1.6 - test - io.rest-assured diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/objectRepository/TableDetails.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/objectRepository/TableDetails.java index 79deb292946..7170027fca8 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/objectRepository/TableDetails.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/objectRepository/TableDetails.java @@ -19,11 +19,11 @@ public class TableDetails { By selectUser = By.xpath("//div[@data-testid=\"list-item\"]"); By saveManage = By.cssSelector("[data-testid='saveManageTab']"); By follow = By.cssSelector("button[data-testid='follow-button']"); - By schema = By.xpath("[data-testid='Schema']");; - By lineage = By.cssSelector("[data-testid='Lineage']");; + By schema = By.xpath("[data-testid='Schema']"); + By lineage = By.cssSelector("[data-testid='Lineage']"); By lineageComponents = By.cssSelector("[data-testid='node-label']"); By profiler = By.cssSelector("[data-testid='Profiler']"); - By sampleData = By.cssSelector("[data-testid='Sample Data']");; + By sampleData = By.cssSelector("[data-testid='Sample Data']"); By selectTier1 = By.xpath("(//div[@data-testid='card-list'])[1]"); By tier1 = By.xpath("(/h4[@class='tw-text-base tw-mb-0']"); By addTagTextBox = By.xpath("//input[@data-testid='associatedTagName']"); diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/CommonTests.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/CommonTests.java index 989b191ab39..b7cf4ff00f7 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/CommonTests.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/CommonTests.java @@ -45,7 +45,7 @@ class CommonTests { static WebDriver webDriver; static Common common; static Actions actions; - static Faker faker = new Faker(); + static final Faker faker = new Faker(); static String tagCategoryDisplayName = faker.name().firstName(); static WebDriverWait wait; static String url = Property.getInstance().getURL(); diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/PayLoad.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/PayLoad.java index c52e51716cb..97d23811b32 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/PayLoad.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/PayLoad.java @@ -6,48 +6,43 @@ import org.jetbrains.annotations.NotNull; public class PayLoad { public static String changeDescriptionServices() { - String payLoad = - "{\n" - + " \"id\": \"b610c069-b0cc-43cf-9845-3236c8666eae\",\n" - + " \"name\": \"bigquery_gcp\",\n" - + " \"serviceType\": \"BigQuery\",\n" - + " \"description\": \"test\",\n" - + " \"version\": 0.2,\n" - + " \"updatedAt\": 1640848954438,\n" - + " \"updatedBy\": \"anonymous\",\n" - + " \"href\": \"http://localhost:8585/api/v1/services/databaseServices/b610c069-b0cc-43cf-9845-3236c8666eae\",\n" - + " \"jdbc\": {\n" - + " \"driverClass\": \"jdbc\",\n" - + " \"connectionUrl\": \"jdbc://9999\"\n" - + " },\n" - + " \"changeDescription\": {\n" - + " \"fieldsAdded\": [],\n" - + " \"fieldsUpdated\": [\n" - + " {\n" - + " \"name\": \"description\",\n" - + " \"oldValue\": \"\",\n" - + " \"newValue\": \"Kushal123\"\n" - + " }\n" - + " ],\n" - + " \"fieldsDeleted\": [],\n" - + " \"previousVersion\": 0.1\n" - + " }\n" - + "}"; - return payLoad; + return "{\n" + + " \"id\": \"b610c069-b0cc-43cf-9845-3236c8666eae\",\n" + + " \"name\": \"bigquery_gcp\",\n" + + " \"serviceType\": \"BigQuery\",\n" + + " \"description\": \"test\",\n" + + " \"version\": 0.2,\n" + + " \"updatedAt\": 1640848954438,\n" + + " \"updatedBy\": \"anonymous\",\n" + + " \"href\": \"http://localhost:8585/api/v1/services/databaseServices/b610c069-b0cc-43cf-9845-3236c8666eae\",\n" + + " \"jdbc\": {\n" + + " \"driverClass\": \"jdbc\",\n" + + " \"connectionUrl\": \"jdbc://9999\"\n" + + " },\n" + + " \"changeDescription\": {\n" + + " \"fieldsAdded\": [],\n" + + " \"fieldsUpdated\": [\n" + + " {\n" + + " \"name\": \"description\",\n" + + " \"oldValue\": \"\",\n" + + " \"newValue\": \"Kushal123\"\n" + + " }\n" + + " ],\n" + + " \"fieldsDeleted\": [],\n" + + " \"previousVersion\": 0.1\n" + + " }\n" + + "}"; } @NotNull @Contract(pure = true) public static String changeDescriptionDatabase() { - String payload = - "[\n" - + " {\n" - + " \"op\": \"replace\",\n" - + " \"path\": \"/description\",\n" - + " \"value\": \"\"\n" - + " }\n" - + "]"; - - return payload; + return "[\n" + + " {\n" + + " \"op\": \"replace\",\n" + + " \"path\": \"/description\",\n" + + " \"value\": \"\"\n" + + " }\n" + + "]"; } } 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 57c9c522b6b..4e6847aca6c 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 @@ -14,7 +14,6 @@ package org.openmetadata.catalog.selenium.pages.dashboardService; import com.github.javafaker.Faker; -import java.io.IOException; import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -142,7 +141,7 @@ class DashboardServiceTestPage { @Test @Order(4) - void checkConnectionConfigTab() throws InterruptedException, IOException { + void checkConnectionConfigTab() throws InterruptedException { openDashboardServicePage(); Thread.sleep(2000); Events.click(webDriver, common.containsText(serviceName)); diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/explore/Explore.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/explore/Explore.java index d21e648145c..4e35761a8ea 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/explore/Explore.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/explore/Explore.java @@ -190,7 +190,7 @@ class Explore { @Test @Order(6) - void checkBasics() throws Exception { + void checkBasics() { webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10)); openExplorePage(); try { @@ -280,7 +280,7 @@ class Explore { @Test @Order(10) - void checkRandomDashboardCount() throws InterruptedException { + void checkRandomDashboardCount() { webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10)); openExplorePage(); Events.click(webDriver, explorePage.dashboard()); @@ -301,7 +301,7 @@ class Explore { @Test @Order(11) - void checkRandomPipelineCount() throws InterruptedException { + void checkRandomPipelineCount() { webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10)); openExplorePage(); Events.click(webDriver, explorePage.pipeline()); @@ -322,7 +322,7 @@ class Explore { @Test @Order(12) - void checkSearchBarInvalidValue() throws InterruptedException { + void checkSearchBarInvalidValue() { webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10)); String searchCriteria = "asasds"; Events.click(webDriver, myDataPage.closeWhatsNew()); 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 d97f5b5d9ec..499b72f0689 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 @@ -236,7 +236,7 @@ class TableDetailsPageTest { @Test @Order(8) - void checkManage() throws InterruptedException { + void checkManage() { webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10)); openExplorePage(); Events.click(webDriver, common.selectTableLink(1)); diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pagesWithoutData/myData/MyDataPageTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pagesWithoutData/myData/MyDataPageTest.java index bdc615c8128..7e8cb5c738c 100644 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pagesWithoutData/myData/MyDataPageTest.java +++ b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pagesWithoutData/myData/MyDataPageTest.java @@ -77,7 +77,7 @@ class MyDataPageTest { @Test @Order(3) - void checkRecentViews() throws Exception { + void checkRecentViews() { checkWhatsNew(); WebElement recentViews = webDriver.findElement(common.containsText("No recently viewed data.")); if (!recentViews.isDisplayed()) { @@ -87,7 +87,7 @@ class MyDataPageTest { @Test @Order(4) - void checkRecentSearch() throws Exception { + void checkRecentSearch() { checkWhatsNew(); WebElement recentSearch = webDriver.findElement(common.containsText("No searched terms.")); if (!recentSearch.isDisplayed()) { @@ -97,7 +97,7 @@ class MyDataPageTest { @Test @Order(5) - void checkMyDataTab() throws Exception { + void checkMyDataTab() { checkWhatsNew(); WebElement myDataResults = webDriver.findElement(common.containsText("You have not owned anything yet.")); if (!myDataResults.isDisplayed()) { @@ -107,7 +107,7 @@ class MyDataPageTest { @Test @Order(6) - void checkFollowingTab() throws Exception { + void checkFollowingTab() { checkWhatsNew(); WebElement followResults = webDriver.findElement(common.containsText("You have not followed anything yet.")); if (!followResults.isDisplayed()) { diff --git a/pom.xml b/pom.xml index 618f1b5a435..7183a45b4d1 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ UTF-8 - 4.4.0 + 4.5.1 1.7.36 2.13.2 2.0.28 @@ -58,13 +58,13 @@ 1.5.0 2.11.0 8.1.0 - 2.1.0.6 + 2.1.0.7 2.9.0 - 8.0.28 - 42.3.3 + 8.0.29 + 42.3.5 1.1.1 2.6 - 1.18.22 + 1.18.24 10.0.8 @@ -128,7 +128,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} + 2.13.2.2 io.dropwizard @@ -415,7 +415,7 @@ org.apache.johnzon johnzon-core - 1.2.16 + 1.2.17 com.fasterxml.jackson.datatype @@ -559,7 +559,7 @@ com.puppycrawl.tools checkstyle - 10.1 + 10.2