Change EntityTestHelper name to EntityResourceTest

This commit is contained in:
sureshms 2021-10-27 07:58:19 -07:00
parent 7ba449844a
commit 651cdd41c7
7 changed files with 19 additions and 19 deletions

View File

@ -48,7 +48,7 @@ import static org.openmetadata.catalog.util.TestUtils.UpdateType.NO_CHANGE;
import static org.openmetadata.catalog.util.TestUtils.adminAuthHeaders;
import static org.openmetadata.catalog.util.TestUtils.authHeaders;
public abstract class EntityTestHelper<T> extends CatalogApplicationTest {
public abstract class EntityResourceTest<T> extends CatalogApplicationTest {
private final Class<T> entityClass;
private final String collectionName;
private final String allFields;
@ -63,7 +63,7 @@ public abstract class EntityTestHelper<T> extends CatalogApplicationTest {
public static final TagLabel TIER1_TAG_LABEL = new TagLabel().withTagFQN("Tier.Tier1");
public static final TagLabel TIER2_TAG_LABEL = new TagLabel().withTagFQN("Tier.Tier2");
public EntityTestHelper(Class<T> entityClass, String collectionName, String fields) {
public EntityResourceTest(Class<T> entityClass, String collectionName, String fields) {
this.entityClass = entityClass;
this.collectionName = collectionName;
this.allFields = fields;

View File

@ -32,7 +32,7 @@ import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.jdbi3.ChartRepository.ChartEntityInterface;
import org.openmetadata.catalog.jdbi3.DashboardServiceRepository.DashboardServiceEntityInterface;
import org.openmetadata.catalog.resources.EntityTestHelper;
import org.openmetadata.catalog.resources.EntityResourceTest;
import org.openmetadata.catalog.resources.charts.ChartResource.ChartList;
import org.openmetadata.catalog.resources.services.DashboardServiceResourceTest;
import org.openmetadata.catalog.resources.teams.UserResourceTest;
@ -79,7 +79,7 @@ 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 EntityTestHelper<Chart> {
public class ChartResourceTest extends EntityResourceTest<Chart> {
private static final Logger LOG = LoggerFactory.getLogger(ChartResourceTest.class);
public static EntityReference SUPERSET_REFERENCE;
public static EntityReference LOOKER_REFERENCE;
@ -92,7 +92,7 @@ public class ChartResourceTest extends EntityTestHelper<Chart> {
@BeforeAll
public static void setup(TestInfo test) throws HttpResponseException, URISyntaxException {
EntityTestHelper.setup(test);
EntityResourceTest.setup(test);
CreateDashboardService createService = new CreateDashboardService().withName("superset")
.withServiceType(DashboardServiceType.Superset).withDashboardUrl(new URI("http://localhost:0"));

View File

@ -32,7 +32,7 @@ import org.openmetadata.catalog.entity.services.DashboardService;
import org.openmetadata.catalog.jdbi3.ChartRepository.ChartEntityInterface;
import org.openmetadata.catalog.jdbi3.DashboardRepository.DashboardEntityInterface;
import org.openmetadata.catalog.jdbi3.DashboardServiceRepository.DashboardServiceEntityInterface;
import org.openmetadata.catalog.resources.EntityTestHelper;
import org.openmetadata.catalog.resources.EntityResourceTest;
import org.openmetadata.catalog.resources.charts.ChartResourceTest;
import org.openmetadata.catalog.resources.dashboards.DashboardResource.DashboardList;
import org.openmetadata.catalog.resources.services.DashboardServiceResourceTest;
@ -74,7 +74,7 @@ import static org.openmetadata.catalog.util.TestUtils.assertEntityPagination;
import static org.openmetadata.catalog.util.TestUtils.assertResponse;
import static org.openmetadata.catalog.util.TestUtils.authHeaders;
public class DashboardResourceTest extends EntityTestHelper<Dashboard> {
public class DashboardResourceTest extends EntityResourceTest<Dashboard> {
private static final Logger LOG = LoggerFactory.getLogger(DashboardResourceTest.class);
public static EntityReference SUPERSET_REFERENCE;
public static EntityReference LOOKER_REFERENCE;
@ -90,7 +90,7 @@ public class DashboardResourceTest extends EntityTestHelper<Dashboard> {
@BeforeAll
public static void setup(TestInfo test) throws HttpResponseException, URISyntaxException {
EntityTestHelper.setup(test);
EntityResourceTest.setup(test);
CreateDashboardService createService = new CreateDashboardService().withName("superset")
.withServiceType(DashboardServiceType.Superset).withDashboardUrl(TestUtils.DASHBOARD_URL);

View File

@ -31,7 +31,7 @@ import org.openmetadata.catalog.entity.services.DatabaseService;
import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.jdbi3.DatabaseRepository.DatabaseEntityInterface;
import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository.DatabaseServiceEntityInterface;
import org.openmetadata.catalog.resources.EntityTestHelper;
import org.openmetadata.catalog.resources.EntityResourceTest;
import org.openmetadata.catalog.resources.databases.DatabaseResource.DatabaseList;
import org.openmetadata.catalog.resources.services.DatabaseServiceResourceTest;
import org.openmetadata.catalog.type.ChangeDescription;
@ -63,7 +63,7 @@ import static org.openmetadata.catalog.util.TestUtils.assertEntityPagination;
import static org.openmetadata.catalog.util.TestUtils.assertResponse;
import static org.openmetadata.catalog.util.TestUtils.authHeaders;
public class DatabaseResourceTest extends EntityTestHelper<Database> {
public class DatabaseResourceTest extends EntityResourceTest<Database> {
private static final Logger LOG = LoggerFactory.getLogger(DatabaseResourceTest.class);
public static EntityReference SNOWFLAKE_REFERENCE;
public static EntityReference REDSHIFT_REFERENCE;
@ -76,7 +76,7 @@ public class DatabaseResourceTest extends EntityTestHelper<Database> {
@BeforeAll
public static void setup(TestInfo test) throws HttpResponseException, URISyntaxException {
EntityTestHelper.setup(test);
EntityResourceTest.setup(test);
CreateDatabaseService createService = new CreateDatabaseService().withName("snowflakeDB")
.withServiceType(DatabaseServiceType.Snowflake).withJdbc(TestUtils.JDBC_INFO);

View File

@ -37,7 +37,7 @@ import org.openmetadata.catalog.entity.teams.Team;
import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.jdbi3.TableRepository.TableEntityInterface;
import org.openmetadata.catalog.resources.EntityTestHelper;
import org.openmetadata.catalog.resources.EntityResourceTest;
import org.openmetadata.catalog.resources.databases.TableResource.TableList;
import org.openmetadata.catalog.resources.services.DatabaseServiceResourceTest;
import org.openmetadata.catalog.resources.tags.TagResourceTest;
@ -116,7 +116,7 @@ import static org.openmetadata.catalog.util.TestUtils.userAuthHeaders;
import static org.openmetadata.common.utils.CommonUtil.getDateStringByOffset;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class TableResourceTest extends EntityTestHelper<Table> {
public class TableResourceTest extends EntityResourceTest<Table> {
private static final Logger LOG = LoggerFactory.getLogger(TableResourceTest.class);
public static Database DATABASE;
public static final TagLabel USER_ADDRESS_TAG_LABEL = new TagLabel().withTagFQN("User.Address");
@ -135,7 +135,7 @@ public class TableResourceTest extends EntityTestHelper<Table> {
@BeforeAll
public static void setup(TestInfo test) throws HttpResponseException, URISyntaxException {
EntityTestHelper.setup(test);
EntityResourceTest.setup(test);
CreateDatabaseService createSnowflake = new CreateDatabaseService()
.withName(DatabaseServiceResourceTest.getName(test, 1))

View File

@ -32,7 +32,7 @@ import org.openmetadata.catalog.entity.services.PipelineService;
import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.jdbi3.PipelineServiceRepository.PipelineServiceEntityInterface;
import org.openmetadata.catalog.jdbi3.TaskRepository.TaskEntityInterface;
import org.openmetadata.catalog.resources.EntityTestHelper;
import org.openmetadata.catalog.resources.EntityResourceTest;
import org.openmetadata.catalog.resources.tasks.TaskResource.TaskList;
import org.openmetadata.catalog.type.ChangeDescription;
import org.openmetadata.catalog.type.EntityReference;
@ -76,7 +76,7 @@ import static org.openmetadata.catalog.util.TestUtils.assertResponse;
import static org.openmetadata.catalog.util.TestUtils.authHeaders;
public class TaskResourceTest extends EntityTestHelper<Task> {
public class TaskResourceTest extends EntityResourceTest<Task> {
private static final Logger LOG = LoggerFactory.getLogger(TaskResourceTest.class);
public static EntityReference AIRFLOW_REFERENCE;
public static EntityReference PREFECT_REFERENCE;
@ -90,7 +90,7 @@ public class TaskResourceTest extends EntityTestHelper<Task> {
@BeforeAll
public static void setup(TestInfo test) throws HttpResponseException, URISyntaxException {
EntityTestHelper.setup(test);
EntityResourceTest.setup(test);
CreatePipelineService createService = new CreatePipelineService().withName("airflow")
.withServiceType(PipelineServiceType.Airflow).withPipelineUrl(new URI("http://localhost:0"));

View File

@ -27,7 +27,7 @@ import org.openmetadata.catalog.entity.data.Topic;
import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.jdbi3.TopicRepository.TopicEntityInterface;
import org.openmetadata.catalog.resources.EntityTestHelper;
import org.openmetadata.catalog.resources.EntityResourceTest;
import org.openmetadata.catalog.resources.teams.UserResourceTest;
import org.openmetadata.catalog.resources.topics.TopicResource.TopicList;
import org.openmetadata.catalog.type.EntityReference;
@ -70,7 +70,7 @@ 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 EntityTestHelper<Topic> {
public class TopicResourceTest extends EntityResourceTest<Topic> {
private static final Logger LOG = LoggerFactory.getLogger(TopicResourceTest.class);
public TopicResourceTest() {