diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/charts/ChartResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/charts/ChartResourceTest.java index 51bedcd6cb2..be180c7a09c 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/charts/ChartResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/charts/ChartResourceTest.java @@ -75,6 +75,7 @@ import static org.openmetadata.catalog.util.TestUtils.adminAuthHeaders; import static org.openmetadata.catalog.util.TestUtils.assertEntityPagination; import static org.openmetadata.catalog.util.TestUtils.assertResponse; import static org.openmetadata.catalog.util.TestUtils.authHeaders; +import static org.openmetadata.catalog.util.TestUtils.checkUserFollowing; import static org.openmetadata.catalog.util.TestUtils.userAuthHeaders; public class ChartResourceTest extends CatalogApplicationTest { @@ -722,21 +723,6 @@ public class ChartResourceTest extends CatalogApplicationTest { checkUserFollowing(userId, chart.getId(), true, authHeaders); } - private static void checkUserFollowing(UUID userId, UUID chartId, boolean expectedFollowing, - Map authHeaders) throws HttpResponseException { - // GET .../users/{userId} shows user as following table - boolean following = false; - User user = UserResourceTest.getUser(userId, "follows", authHeaders); - for (EntityReference follows : user.getFollows()) { - TestUtils.validateEntityReference(follows); - if (follows.getId().equals(chartId)) { - following = true; - break; - } - } - assertEquals(expectedFollowing, following, "Follower list for the user is invalid"); - } - private void deleteAndCheckFollower(Chart chart, UUID userId, int totalFollowerCount, Map authHeaders) throws HttpResponseException { WebTarget target = CatalogApplicationTest.getResource(String.format("charts/%s/followers/%s", diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java index 032ce409aba..7087c24b6f5 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java @@ -103,6 +103,7 @@ import static org.openmetadata.catalog.util.TestUtils.adminAuthHeaders; import static org.openmetadata.catalog.util.TestUtils.assertEntityPagination; import static org.openmetadata.catalog.util.TestUtils.assertResponse; import static org.openmetadata.catalog.util.TestUtils.authHeaders; +import static org.openmetadata.catalog.util.TestUtils.checkUserFollowing; import static org.openmetadata.catalog.util.TestUtils.userAuthHeaders; import static org.openmetadata.common.utils.CommonUtil.getDateStringByOffset; @@ -1466,21 +1467,6 @@ public class TableResourceTest extends CatalogApplicationTest { } } - private static void checkUserFollowing(UUID userId, UUID tableId, boolean expectedFollowing, - Map authHeaders) throws HttpResponseException { - // GET .../users/{userId} shows user as following table - boolean following = false; - User user = UserResourceTest.getUser(userId, "follows", authHeaders); - for (EntityReference follows : user.getFollows()) { - TestUtils.validateEntityReference(follows); - if (follows.getId().equals(tableId)) { - following = true; - break; - } - } - assertEquals(expectedFollowing, following, "Follower list for the user is invalid"); - } - private static int getTagUsageCount(String tagFQN, Map authHeaders) throws HttpResponseException { return TagResourceTest.getTag(tagFQN, "usageCount", authHeaders).getUsageCount(); } diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/topics/TopicResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/topics/TopicResourceTest.java index 2b821a397b8..7fbaa332eb8 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/topics/TopicResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/topics/TopicResourceTest.java @@ -71,6 +71,7 @@ import static org.openmetadata.catalog.util.TestUtils.adminAuthHeaders; import static org.openmetadata.catalog.util.TestUtils.assertEntityPagination; import static org.openmetadata.catalog.util.TestUtils.assertResponse; import static org.openmetadata.catalog.util.TestUtils.authHeaders; +import static org.openmetadata.catalog.util.TestUtils.checkUserFollowing; import static org.openmetadata.catalog.util.TestUtils.userAuthHeaders; public class TopicResourceTest extends CatalogApplicationTest { @@ -742,21 +743,6 @@ public class TopicResourceTest extends CatalogApplicationTest { checkUserFollowing(userId, topic.getId(), true, authHeaders); } - private static void checkUserFollowing(UUID userId, UUID topicId, boolean expectedFollowing, - Map authHeaders) throws HttpResponseException { - // GET .../users/{userId} shows user as following table - boolean following = false; - User user = UserResourceTest.getUser(userId, "follows", authHeaders); - for (EntityReference follows : user.getFollows()) { - TestUtils.validateEntityReference(follows); - if (follows.getId().equals(topicId)) { - following = true; - break; - } - } - assertEquals(expectedFollowing, following, "Follower list for the user is invalid"); - } - private void deleteAndCheckFollower(Topic topic, UUID userId, int totalFollowerCount, Map authHeaders) throws HttpResponseException { WebTarget target = CatalogApplicationTest.getResource(String.format("topics/%s/followers/%s", diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/util/TestUtils.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/util/TestUtils.java index d34788877a7..9a0ddd73b92 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/util/TestUtils.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/util/TestUtils.java @@ -19,8 +19,10 @@ package org.openmetadata.catalog.util; import org.apache.http.client.HttpResponseException; import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.function.Executable; +import org.openmetadata.catalog.entity.teams.User; import org.openmetadata.catalog.resources.databases.TableResourceTest.TagLabelComparator; import org.openmetadata.catalog.resources.tags.TagResourceTest; +import org.openmetadata.catalog.resources.teams.UserResourceTest; import org.openmetadata.catalog.security.CatalogOpenIdAuthorizationRequestFilter; import org.openmetadata.catalog.type.EntityReference; import org.openmetadata.catalog.type.JdbcInfo; @@ -258,4 +260,19 @@ public final class TestUtils { public static Map userAuthHeaders() { return authHeaders("test@open-metadata.org"); } + + public static void checkUserFollowing(UUID userId, UUID chartId, boolean expectedFollowing, + Map authHeaders) throws HttpResponseException { + // GET .../users/{userId} shows user as following table + boolean following = false; + User user = UserResourceTest.getUser(userId, "follows", authHeaders); + for (EntityReference follows : user.getFollows()) { + TestUtils.validateEntityReference(follows); + if (follows.getId().equals(chartId)) { + following = true; + break; + } + } + assertEquals(expectedFollowing, following, "Follower list for the user is invalid"); + } }