diff --git a/bin/initAndIngest.sh b/bin/initAndIngest.sh deleted file mode 100755 index e832a65654a..00000000000 --- a/bin/initAndIngest.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright 2021 Collate -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#cd .. -echo "Maven clean package" -mvn -DskipTests clean package -echo "Docker compose up" -cd docker/local-metadata/ -docker-compose up -d --build -echo "docker build done" -echo "waiting for data ingestion" -while ! wget -O /dev/null -o /dev/null localhost:8585/api/v1/teams/name/Finance; do sleep 5; done \ No newline at end of file diff --git a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/initAndIngest/StartServerAndIngestSampleDataTest.java b/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/initAndIngest/StartServerAndIngestSampleDataTest.java deleted file mode 100644 index a14b1b2ed27..00000000000 --- a/openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/initAndIngest/StartServerAndIngestSampleDataTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2021 Collate - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openmetadata.catalog.selenium.initAndIngest; - -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.io.IOException; -import java.util.logging.Logger; - -public class StartServerAndIngestSampleDataTest { - - private static final Logger LOG = Logger.getLogger(StartServerAndIngestSampleDataTest.class.getName()); - - // RUN THIS TEST FIRST - - @Test - public void initAndIngestTest() throws IOException, InterruptedException { - File scriptDir = new File("../bin/initAndIngest.sh"); - String absolutePath = scriptDir.getAbsolutePath(); - String[] runScript = {"sh", absolutePath}; - Process processRunScript = Runtime.getRuntime().exec(runScript); - processRunScript.waitFor(); - LOG.info("Server started and Ingested the data"); - } -} - 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 fd4954c31a1..c1b9ee15955 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 @@ -167,9 +167,6 @@ public class DashboardDetailsPageTest { Events.sendKeys(webDriver, By.cssSelector("[data-testid='searchBox']"), dashboardName); Events.click(webDriver, By.cssSelector("[data-testid='data-name']")); Thread.sleep(waitTime); - // actions.moveToElement(webDriver.findElement( - // - // By.xpath("//table[@data-testid='schema-table']//div[@data-testid='tag-conatiner']//span"))).perform(); Events.click( webDriver, By.xpath("//table[@data-testid='schema-table']//div[@data-testid='tag-conatiner']//span")); 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 aec5a6fcd5c..82f8106af2e 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 @@ -181,19 +181,19 @@ public class TableDetailsPageTest { Events.click(webDriver, By.cssSelector("[data-testid='saveAssociatedTag']")); } - // @Test - // @Order(7) - // public void basicChecks() throws InterruptedException { - // openExplorePage(); - // Events.sendKeys(webDriver, By.cssSelector("[data-testid='searchBox']"), tableName); - // Events.click(webDriver, By.cssSelector("[data-testid='data-name']")); - // Thread.sleep(2000); - // Events.click(webDriver, By.cssSelector("[data-testid='follow-button']")); - // Events.click(webDriver, By.cssSelector("[data-testid='getFollowerDetail']")); - // Events.click(webDriver, By.cssSelector("[data-testid='follow-button']")); - // Events.click(webDriver, By.cssSelector("[data-testid='getFollowerDetail']")); - // Events.click(webDriver, By.cssSelector("[data-testid='sample-data-button']")); - // } + @Test + @Order(7) + public void basicChecks() throws InterruptedException { + openExplorePage(); + Events.sendKeys(webDriver, By.cssSelector("[data-testid='searchBox']"), tableName); + Events.click(webDriver, By.cssSelector("[data-testid='data-name']")); + Thread.sleep(2000); + Events.click(webDriver, By.cssSelector("[data-testid='follow-button']")); + Events.click(webDriver, By.cssSelector("[data-testid='getFollowerDetail']")); + Events.click(webDriver, By.cssSelector("[data-testid='follow-button']")); + Events.click(webDriver, By.cssSelector("[data-testid='getFollowerDetail']")); + Events.click(webDriver, By.cssSelector("[data-testid='sample-data-button']")); + } @Test @Order(8) @@ -329,21 +329,7 @@ public class TableDetailsPageTest { webDriver.findElement(By.cssSelector("[data-testid='searchBox']")).sendKeys("fact_sale"); Events.click(webDriver, By.cssSelector("[data-testid='data-name']")); Thread.sleep(2000); - 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(); - // Thread.sleep(waitTime); - // } - // for (int i = 1; i <= 3; i++) { - // Events.click(webDriver, - // By.xpath("(//div[@data-testid='related-tables-data']//div//span)")); - // Events.click(webDriver, By.xpath("(//span[@data-testid='more-related-tables-data'])" + - // "[" + i + "]")); - // webDriver.navigate().back(); - // Thread.sleep(waitTime); - // } + Events.click(webDriver, By.xpath("(//div[@data-testid='related-tables-data']//a)")); } @Test 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 c8172043ea6..53d1c4e2546 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 @@ -205,13 +205,7 @@ public class TagsPageTest { Events.click(webDriver, By.cssSelector("[data-testid='tables']")); // Tables Events.click( webDriver, - By.cssSelector( - "[data-testid='checkbox']" - + "[id='" - + tagCategoryDisplayName - + "." - + tagDisplayName - + "']")); + By.cssSelector("[data-testid='checkbox'][id='" + tagCategoryDisplayName + "." + tagDisplayName + "']")); Events.click(webDriver, By.xpath("//button[@data-testid='table-link']")); } 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 fb6e91d1a0a..a1a45be0f55 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 @@ -48,7 +48,7 @@ public class MyDataPageTest { @Test @Order(2) - public void checkOverview() throws Exception { + public void checkOverview() { checkWhatsNew(); String tablesCount = webDriver.findElement(By.xpath("//div[@data-testid='tables-summary']//span[@data-testid='filter-count']")).getAttribute("innerHTML"); Assert.assertEquals(tablesCount, "0");