From 6161872542c6a12192b99242c0119478a884e35e Mon Sep 17 00:00:00 2001 From: Marcos Lopez Gonzalez Date: Wed, 19 May 2021 14:39:44 +0200 Subject: [PATCH] fixed tests --- .../DirectoryUpdateService.java | 3 +- .../BaseCollectionEntityServiceIT.java | 40 ++++++++----------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/registry-cli/src/main/java/org/gbif/registry/cli/directoryupdate/DirectoryUpdateService.java b/registry-cli/src/main/java/org/gbif/registry/cli/directoryupdate/DirectoryUpdateService.java index 926562bc49..6c23939a0f 100644 --- a/registry-cli/src/main/java/org/gbif/registry/cli/directoryupdate/DirectoryUpdateService.java +++ b/registry-cli/src/main/java/org/gbif/registry/cli/directoryupdate/DirectoryUpdateService.java @@ -16,6 +16,7 @@ package org.gbif.registry.cli.directoryupdate; import org.gbif.registry.cli.common.spring.SpringContextBuilder; +import org.gbif.registry.service.WithMyBatis; import java.time.LocalTime; import java.time.temporal.ChronoUnit; @@ -61,7 +62,7 @@ public DirectoryUpdateService(DirectoryUpdateConfiguration config) { SpringContextBuilder.create() .withDbConfiguration(config.db) .withDirectoryConfiguration(config.directory) - .withComponents(DirectoryUpdater.class) + .withComponents(DirectoryUpdater.class, WithMyBatis.class) .build(), Executors.newScheduledThreadPool(1)); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseCollectionEntityServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseCollectionEntityServiceIT.java index 677d99a7a6..dfe0ad4e9a 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseCollectionEntityServiceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/BaseCollectionEntityServiceIT.java @@ -209,46 +209,40 @@ public void createFullEntityTest() { @Test public void tagsTest() { - TagService tagService = (TagService) collectionEntityService; - UUID key = collectionEntityService.create(testData.newEntity()); Tag tag = new Tag(); tag.setValue("value"); - int tagKey = tagService.addTag(key, tag); + int tagKey = collectionEntityService.addTag(key, tag); - List tags = tagService.listTags(key, null); + List tags = collectionEntityService.listTags(key, null); assertEquals(1, tags.size()); assertEquals(tagKey, tags.get(0).getKey()); assertEquals("value", tags.get(0).getValue()); - tagService.deleteTag(key, tagKey); - assertEquals(0, tagService.listTags(key, null).size()); + collectionEntityService.deleteTag(key, tagKey); + assertEquals(0, collectionEntityService.listTags(key, null).size()); } @Test public void machineTagsTest() { - MachineTagService machineTagService = (MachineTagService) collectionEntityService; - T entity = testData.newEntity(); UUID key = collectionEntityService.create(entity); MachineTag machineTag = new MachineTag("ns", "name", "value"); - int machineTagKey = machineTagService.addMachineTag(key, machineTag); + int machineTagKey = collectionEntityService.addMachineTag(key, machineTag); - List machineTags = machineTagService.listMachineTags(key); + List machineTags = collectionEntityService.listMachineTags(key); assertEquals(1, machineTags.size()); assertEquals(machineTagKey, machineTags.get(0).getKey()); assertEquals("value", machineTags.get(0).getValue()); - machineTagService.deleteMachineTag(key, machineTagKey); - assertEquals(0, machineTagService.listMachineTags(key).size()); + collectionEntityService.deleteMachineTag(key, machineTagKey); + assertEquals(0, collectionEntityService.listMachineTags(key).size()); } @Test public void identifiersTest() { - IdentifierService identifierService = (IdentifierService) collectionEntityService; - T entity = testData.newEntity(); UUID key = collectionEntityService.create(entity); @@ -256,36 +250,34 @@ public void identifiersTest() { identifier.setIdentifier("identifier"); identifier.setType(IdentifierType.LSID); - int identifierKey = identifierService.addIdentifier(key, identifier); + int identifierKey = collectionEntityService.addIdentifier(key, identifier); - List identifiers = identifierService.listIdentifiers(key); + List identifiers = collectionEntityService.listIdentifiers(key); assertEquals(1, identifiers.size()); assertEquals(identifierKey, identifiers.get(0).getKey()); assertEquals("identifier", identifiers.get(0).getIdentifier()); assertEquals(IdentifierType.LSID, identifiers.get(0).getType()); - identifierService.deleteIdentifier(key, identifierKey); - assertEquals(0, identifierService.listIdentifiers(key).size()); + collectionEntityService.deleteIdentifier(key, identifierKey); + assertEquals(0, collectionEntityService.listIdentifiers(key).size()); } @Test public void commentsTest() { - CommentService commentService = (CommentService) collectionEntityService; - T entity = testData.newEntity(); UUID key = collectionEntityService.create(entity); Comment comment = new Comment(); comment.setContent("test comment"); - int commentKey = commentService.addComment(key, comment); + int commentKey = collectionEntityService.addComment(key, comment); - List comments = commentService.listComments(key); + List comments = collectionEntityService.listComments(key); assertEquals(1, comments.size()); assertEquals(commentKey, comments.get(0).getKey()); assertEquals(comment.getContent(), comments.get(0).getContent()); - commentService.deleteComment(key, commentKey); - assertEquals(0, commentService.listComments(key).size()); + collectionEntityService.deleteComment(key, commentKey); + assertEquals(0, collectionEntityService.listComments(key).size()); } }