API Tests fix #124

tillias · Jan 16, 2021 · db97dc3 · db97dc3
1 parent d3b11bd
commit db97dc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/test/java/com/github/microcatalog/service/custom/ImportServiceBorderTest.java b/src/test/java/com/github/microcatalog/service/custom/ImportServiceBorderTest.java
@@ -2,6 +2,7 @@
 
 import com.github.microcatalog.domain.Microservice;
 import com.github.microcatalog.repository.MicroserviceRepository;
+import com.github.microcatalog.service.custom.exceptions.ImportException;
 import com.github.microcatalog.service.dto.custom.FullMicroserviceDto;
 import com.github.microcatalog.service.dto.custom.MicroserviceImportDescriptorDto;
 import org.junit.jupiter.api.Test;
@@ -12,6 +13,7 @@
 import java.util.Optional;
 
 import static com.github.microcatalog.service.dto.custom.builder.MicroserviceImportDescriptorDtoBuilder.aMicroserviceImportDescriptorDto;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.BDDMockito.given;
@@ -39,8 +41,8 @@ void importFromDescriptor_microserviceWithNameAlreadyExists_NoException() {
                 .withName(name)
                 .build();
 
-        final Optional<FullMicroserviceDto> maybeDto = sut.importFromDescriptor(descriptorDto);
-        assertFalse(maybeDto.isPresent());
+        assertThatThrownBy(() -> sut.importFromDescriptor(descriptorDto))
+            .isInstanceOf(ImportException.class)
+            .hasMessageStartingWith(String.format("Microservice with name (%s) already exists. Stopping import", name));
     }
-
 }
diff --git a/src/test/java/com/github/microcatalog/service/custom/ImportServiceTest.java b/src/test/java/com/github/microcatalog/service/custom/ImportServiceTest.java
@@ -47,7 +47,8 @@ void importFromDescriptor_missingName_Exception() {
             .withName(null)
             .build();
 
-        assertThatThrownBy(() -> sut.importFromDescriptor(descriptorDto)).isInstanceOf(ImportException.class)
+        assertThatThrownBy(() -> sut.importFromDescriptor(descriptorDto))
+            .isInstanceOf(ImportException.class)
             .hasMessageStartingWith("Microservice name can't be null");
     }