Skip to content

Commit ce34120

Browse files
committed
remove function override and correct tests
Signed-off-by: Mohamed Macow <mmacovv@gmail.com>
1 parent afab3e1 commit ce34120

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
* @author Spencer Gibb
3838
* @author Tim Ysewyn
3939
* @author Olga Maciaszek-Sharma
40-
* @author Mohamed Macow
4140
*/
4241
public class EurekaDiscoveryClient implements DiscoveryClient {
4342

@@ -88,11 +87,6 @@ public List<String> getServices() {
8887
return names;
8988
}
9089

91-
@Override
92-
public void probe() {
93-
this.eurekaClient.getApplications();
94-
}
95-
9690
@Override
9791
public int getOrder() {
9892
return clientConfig instanceof Ordered ? ((Ordered) clientConfig).getOrder() : DiscoveryClient.DEFAULT_ORDER;

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientTests.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
import org.mockito.Mock;
2525
import org.mockito.junit.jupiter.MockitoExtension;
2626

27-
import static org.assertj.core.api.Assertions.assertThat;
28-
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
29-
import static org.junit.jupiter.api.Assertions.assertThrows;
27+
import static org.assertj.core.api.Assertions.assertThatCode;
28+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3029
import static org.mockito.Mockito.when;
3130

3231

@@ -45,16 +44,18 @@ class EurekaDiscoveryClientTests {
4544
@Test
4645
void shouldCompleteProbeWhenClientHealthy() {
4746
when(eurekaClient.getApplications()).thenReturn(new Applications());
48-
assertDoesNotThrow(() -> client.probe());
47+
48+
assertThatCode(() -> client.probe())
49+
.doesNotThrowAnyException();
4950
}
5051

5152
@Test
5253
void shouldThrowProbeWhenClientThrows() {
5354
RuntimeException eurekaException = new RuntimeException("exception");
5455
when(eurekaClient.getApplications()).thenThrow(eurekaException);
5556

56-
RuntimeException thrown = assertThrows(RuntimeException.class, () -> client.probe());
57-
assertThat(eurekaException.getMessage()).isEqualTo(thrown.getMessage());
57+
assertThatExceptionOfType(eurekaException.getClass())
58+
.isThrownBy(() -> client.probe())
59+
.withMessage(eurekaException.getMessage());
5860
}
59-
6061
}

0 commit comments

Comments
 (0)