|
34 | 34 | import org.mockito.InjectMocks; |
35 | 35 | import org.mockito.Mock; |
36 | 36 | import org.mockito.junit.jupiter.MockitoExtension; |
| 37 | +import org.springframework.beans.factory.NoSuchBeanDefinitionException; |
37 | 38 | import org.springframework.context.ApplicationContext; |
38 | 39 |
|
39 | 40 | import static org.assertj.core.api.Assertions.assertThat; |
@@ -61,10 +62,11 @@ class ObservationServiceTest { |
61 | 62 |
|
62 | 63 | @Test |
63 | 64 | void testValidation() { |
| 65 | + when(applicationContext.getBean("not-existing-observation", ObservationFactory.class)).thenThrow(NoSuchBeanDefinitionException.class); |
64 | 66 | NotFoundException notFoundException = Assertions.assertThrows(NotFoundException.class, () -> |
65 | | - observationService.addObservation(new Observation().setStudyId(1L).setObservationId(1).setType("my-observation")) |
| 67 | + observationService.addObservation(new Observation().setStudyId(1L).setObservationId(1).setType("not-existing-observation")) |
66 | 68 | ); |
67 | | - Assertions.assertEquals("ObservationFactory for Observation[study: 1, id:1, type: my-observation] cannot be found", notFoundException.getMessage()); |
| 69 | + Assertions.assertEquals("ObservationFactory for Observation[study: 1, id:1, type: not-existing-observation] cannot be found", notFoundException.getMessage()); |
68 | 70 |
|
69 | 71 | ObservationFactory factory = mock(ObservationFactory.class); |
70 | 72 | when(factory.validate(any())).thenThrow(new ConfigurationValidationException(ConfigurationValidationReport.init().error("My error"))); |
@@ -152,7 +154,7 @@ void testGetObservationFactory_optional() { |
152 | 154 | java.util.Optional<ObservationFactory> present = observationService.getObservationFactory(obs); |
153 | 155 | org.assertj.core.api.Assertions.assertThat(present).containsSame(factory); |
154 | 156 |
|
155 | | - org.mockito.Mockito.when(applicationContext.getBean("x", ObservationFactory.class)).thenReturn(null); |
| 157 | + org.mockito.Mockito.when(applicationContext.getBean("x", ObservationFactory.class)).thenThrow(NoSuchBeanDefinitionException.class); |
156 | 158 | java.util.Optional<ObservationFactory> empty = observationService.getObservationFactory(obs); |
157 | 159 | org.assertj.core.api.Assertions.assertThat(empty).isEmpty(); |
158 | 160 | } |
|
0 commit comments