fixed tests

gbif · May 19, 2021 · 6161872 · 6161872
1 parent a6eb5be
commit 6161872
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 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
@@ -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/.../test/java/org/gbif/registry/ws/it/collections/service/BaseCollectionEntityServiceIT.java b/.../test/java/org/gbif/registry/ws/it/collections/service/BaseCollectionEntityServiceIT.java
@@ -209,83 +209,75 @@ 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<Tag> tags = tagService.listTags(key, null);
+    List<Tag> 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<MachineTag> machineTags = machineTagService.listMachineTags(key);
+    List<MachineTag> 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);
 
     Identifier identifier = new Identifier();
     identifier.setIdentifier("identifier");
     identifier.setType(IdentifierType.LSID);
 
-    int identifierKey = identifierService.addIdentifier(key, identifier);
+    int identifierKey = collectionEntityService.addIdentifier(key, identifier);
 
-    List<Identifier> identifiers = identifierService.listIdentifiers(key);
+    List<Identifier> 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<Comment> comments = commentService.listComments(key);
+    List<Comment> 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());
   }
 }