Skip to content

Commit

Permalink
split ITs into service and resource (WIP)
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcos-lg
marcos-lg committed May 3, 2021
1 parent 0d8b7ad commit 0c47799
Show file tree
Hide file tree
Showing 25 changed files with 1,193 additions and 903 deletions.
10 changes: 8 additions & 2 deletions ...on-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.springframework.cloud.openfeign.FeignAutoConfiguration;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
import org.springframework.cloud.sleuth.zipkin2.ZipkinAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
Expand All @@ -65,9 +66,14 @@

import com.zaxxer.hikari.HikariDataSource;

// TODO: remove zipkin auto config

@TestConfiguration
@SpringBootApplication(exclude = {RabbitAutoConfiguration.class,
ElasticSearchRestHealthContributorAutoConfiguration.class})
@SpringBootApplication(
exclude = {
RabbitAutoConfiguration.class,
ElasticSearchRestHealthContributorAutoConfiguration.class
})
@MapperScan("org.gbif.registry.persistence.mapper")
@ComponentScan(
basePackages = {
Expand Down
184 changes: 60 additions & 124 deletions ...t/collections/BaseCollectionEntityIT.java → ...ctions/BaseCollectionEntityServiceIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@
import org.gbif.registry.database.TestCaseDatabaseInitializer;
import org.gbif.registry.identity.service.IdentityService;
import org.gbif.registry.search.test.EsManageServer;
import org.gbif.registry.ws.client.collections.CrudClient;
import org.gbif.registry.ws.it.BaseItTest;
import org.gbif.ws.NotFoundException;
import org.gbif.ws.client.filter.SimplePrincipalProvider;
import org.gbif.ws.security.KeyStore;

import java.util.Collections;
import java.util.List;
Expand All @@ -49,21 +46,18 @@

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;

/** Base class to test the CRUD operations of {@link CollectionEntity}. */
public abstract class BaseCollectionEntityIT<
public abstract class BaseCollectionEntityServiceIT<
T extends CollectionEntity & Identifiable & Taggable & MachineTaggable & Commentable>
extends BaseItTest {
extends BaseServiceTest {

protected final CrudService<T> entityService;
protected final CrudService<T> client;
protected final CrudService<T> crudService;

public static final Pageable DEFAULT_PAGE = new PagingRequest(0L, 5);

Expand All @@ -72,17 +66,13 @@ public abstract class BaseCollectionEntityIT<
@RegisterExtension
protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer();

public BaseCollectionEntityIT(
CrudService<T> entityService,
Class<? extends CrudService<T>> cls,
public BaseCollectionEntityServiceIT(
CrudService<T> crudService,
SimplePrincipalProvider principalProvider,
EsManageServer esServer,
IdentityService identityService,
int localServerPort,
KeyStore keyStore) {
IdentityService identityService) {
super(principalProvider, esServer);
this.entityService = entityService;
this.client = prepareClient(localServerPort, keyStore, cls);
this.crudService = crudService;
collectionsDatabaseInitializer = new CollectionsDatabaseInitializer(identityService);
}

Expand All @@ -96,18 +86,15 @@ public BaseCollectionEntityIT(

protected abstract T newInvalidEntity();

@ParameterizedTest
@EnumSource(ServiceType.class)
public void crudTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);

@Test
public void crudTest() {
// create
T entity = newEntity();
UUID key = service.create(entity);
UUID key = crudService.create(entity);

assertNotNull(key);

T entitySaved = service.get(key);
T entitySaved = crudService.get(key);
assertEquals(key, entitySaved.getKey());
assertNewEntity(entitySaved);
assertNotNull(entitySaved.getCreatedBy());
Expand All @@ -117,109 +104,77 @@ public void crudTest(ServiceType serviceType) {

// update
entity = updateEntity(entitySaved);
service.update(entity);
crudService.update(entity);

entitySaved = service.get(key);
entitySaved = crudService.get(key);
assertUpdatedEntity(entitySaved);

// delete
service.delete(key);
entitySaved = service.get(key);
crudService.delete(key);
entitySaved = crudService.get(key);
assertNotNull(entitySaved.getDeleted());
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void createInvalidEntityTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);
assertThrows(ValidationException.class, () -> service.create(newInvalidEntity()));
@Test
public void createInvalidEntityTest() {
assertThrows(ValidationException.class, () -> crudService.create(newInvalidEntity()));
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void deleteMissingEntityTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);
assertThrows(IllegalArgumentException.class, () -> service.delete(UUID.randomUUID()));
@Test
public void deleteMissingEntityTest() {
assertThrows(IllegalArgumentException.class, () -> crudService.delete(UUID.randomUUID()));
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void updateDeletedEntityTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);

@Test
public void updateDeletedEntityTest() {
T entity = newEntity();
UUID key = service.create(entity);
UUID key = crudService.create(entity);
entity.setKey(key);
service.delete(key);
crudService.delete(key);

T entity2 = service.get(key);
T entity2 = crudService.get(key);
assertNotNull(entity2.getDeleted());
assertThrows(IllegalArgumentException.class, () -> service.update(entity2));
assertThrows(IllegalArgumentException.class, () -> crudService.update(entity2));
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void restoreDeletedEntityTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);

@Test
public void restoreDeletedEntityTest() {
T entity = newEntity();
UUID key = service.create(entity);
UUID key = crudService.create(entity);
entity.setKey(key);
service.delete(key);
entity = service.get(key);
crudService.delete(key);
entity = crudService.get(key);
assertNotNull(entity.getDeleted());

// restore it
entity.setDeleted(null);
service.update(entity);
entity = service.get(key);
crudService.update(entity);
entity = crudService.get(key);
assertNull(entity.getDeleted());
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void updateInvalidEntityTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);

@Test
public void updateInvalidEntityTest() {
T entity = newEntity();
UUID key = service.create(entity);
UUID key = crudService.create(entity);

T newEntity = newInvalidEntity();
newEntity.setKey(key);
assertThrows(ValidationException.class, () -> service.update(newEntity));
assertThrows(ValidationException.class, () -> crudService.update(newEntity));
}

@Test
public void updateEntityKeyMismatchTest() {
CrudClient<T> crudClient = (CrudClient<T>) client;

T entity = newEntity();
UUID key = crudClient.create(entity);
T entityCreated = crudClient.get(key);

assertThrows(
IllegalArgumentException.class,
() -> crudClient.updateResource(UUID.randomUUID(), entityCreated));
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void getMissingEntity(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);

public void getMissingEntity() {
try {
T entity = service.get(UUID.randomUUID());
T entity = crudService.get(UUID.randomUUID());
assertNull(entity);
} catch (Exception ex) {
assertEquals(NotFoundException.class, ex.getClass());
}
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void createFullEntityTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);

@Test
public void createFullEntityTest() {
T entity = newEntity();

MachineTag machineTag = new MachineTag("ns", "name", "value");
Expand All @@ -234,8 +189,8 @@ public void createFullEntityTest(ServiceType serviceType) {
identifier.setType(IdentifierType.LSID);
entity.setIdentifiers(Collections.singletonList(identifier));

UUID key = service.create(entity);
T entitySaved = service.get(key);
UUID key = crudService.create(entity);
T entitySaved = crudService.get(key);

assertEquals(1, entitySaved.getMachineTags().size());
assertEquals("value", entitySaved.getMachineTags().get(0).getValue());
Expand All @@ -246,13 +201,11 @@ public void createFullEntityTest(ServiceType serviceType) {
assertEquals(IdentifierType.LSID, entitySaved.getIdentifiers().get(0).getType());
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void tagsTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);
TagService tagService = (TagService) service;
@Test
public void tagsTest() {
TagService tagService = (TagService) crudService;

UUID key = service.create(newEntity());
UUID key = crudService.create(newEntity());

Tag tag = new Tag();
tag.setValue("value");
Expand All @@ -267,14 +220,12 @@ public void tagsTest(ServiceType serviceType) {
assertEquals(0, tagService.listTags(key, null).size());
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void machineTagsTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);
MachineTagService machineTagService = (MachineTagService) service;
@Test
public void machineTagsTest() {
MachineTagService machineTagService = (MachineTagService) crudService;

T entity = newEntity();
UUID key = service.create(entity);
UUID key = crudService.create(entity);

MachineTag machineTag = new MachineTag("ns", "name", "value");
int machineTagKey = machineTagService.addMachineTag(key, machineTag);
Expand All @@ -288,14 +239,12 @@ public void machineTagsTest(ServiceType serviceType) {
assertEquals(0, machineTagService.listMachineTags(key).size());
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void identifiersTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);
IdentifierService identifierService = (IdentifierService) service;
@Test
public void identifiersTest() {
IdentifierService identifierService = (IdentifierService) crudService;

T entity = newEntity();
UUID key = service.create(entity);
UUID key = crudService.create(entity);

Identifier identifier = new Identifier();
identifier.setIdentifier("identifier");
Expand All @@ -313,14 +262,12 @@ public void identifiersTest(ServiceType serviceType) {
assertEquals(0, identifierService.listIdentifiers(key).size());
}

@ParameterizedTest
@EnumSource(ServiceType.class)
public void commentsTest(ServiceType serviceType) {
CrudService<T> service = getService(serviceType, entityService, client);
CommentService commentService = (CommentService) service;
@Test
public void commentsTest() {
CommentService commentService = (CommentService) crudService;

T entity = newEntity();
UUID key = service.create(entity);
UUID key = crudService.create(entity);

Comment comment = new Comment();
comment.setContent("test comment");
Expand All @@ -335,15 +282,4 @@ public void commentsTest(ServiceType serviceType) {
commentService.deleteComment(key, commentKey);
assertEquals(0, commentService.listComments(key).size());
}

protected CrudService<T> getService(ServiceType param) {
switch (param) {
case CLIENT:
return client;
case RESOURCE:
return entityService;
default:
throw new IllegalStateException("Must be resource or client");
}
}
}
Loading

0 comments on commit 0c47799

Please sign in to comment.