tests polishing

Author: Alexander Furer

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/GrpcServerTestBase.java

@@ -5,9 +5,11 @@
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.examples.GreeterGrpc;
 import io.grpc.examples.GreeterOuterClass;
+import io.grpc.health.v1.HealthGrpc;
 import io.grpc.inprocess.InProcessChannelBuilder;
 import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.reflection.v1alpha.ServerReflectionGrpc;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,7 +25,9 @@
 import org.springframework.util.StringUtils;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -59,6 +63,9 @@ public void initialize(GenericApplicationContext applicationContext) {
     @Autowired
     protected ApplicationContext context;
 
+    @Autowired
+    protected GRpcServicesRegistry registry;
+
     @Autowired
     protected GRpcServerProperties gRpcServerProperties;
 
@@ -113,6 +120,13 @@ public void shutdownChannels() {
         Optional.ofNullable(inProcChannel).ifPresent(ManagedChannel::shutdownNow);
     }
 
+    protected List<String> appServicesNames(){
+        return registry.getServiceNameToServiceBeanMap()
+                .keySet()
+                .stream()
+                .filter(name-> !name.equals(HealthGrpc.SERVICE_NAME) && !name.equals(ServerReflectionGrpc.SERVICE_NAME))
+                .collect(Collectors.toList());
+    }
     @Test
     public void simpleGreeting() throws  Exception {
 

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/actuator/ActuatorTest.java

@@ -27,14 +27,14 @@
 
 import java.time.Duration;
 import java.util.Optional;
+import java.util.Set;
 import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -86,19 +86,22 @@ public void actuatorGrpcTest() throws ExecutionException, InterruptedException {
 
     @Test
     public void actuatorHealthTest() throws ExecutionException, InterruptedException {
-        ResponseEntity<String> response = restTemplate.getForEntity("/actuator/health", String.class);
+        ResponseEntity<String> response = restTemplate.getForEntity("/actuator/health/grpc", String.class);
         assertEquals(HttpStatus.OK, response.getStatusCode());
 
         final DocumentContext json = JsonPath.parse(response.getBody(), Configuration.builder()
                         .mappingProvider(new JacksonMappingProvider())
                         .jsonProvider(new JacksonJsonProvider())
                 .build());
-        final String[] statuses = json.read("components.grpc.components.*status", new TypeRef<String[]>() {
-        });
-        assertThat(statuses,Matchers.arrayWithSize(Matchers.greaterThan(0)));
-        for(String s:statuses) {
-            assertThat(s, is(Status.UP.getCode()));
-        }
+        final TypeRef<Set<String>> setOfString = new TypeRef<Set<String>>() {
+        };
+        final Set<String> services = json.read("components.keys()", setOfString);
+        assertThat(services,Matchers.containsInAnyOrder( super.appServicesNames().toArray(new String[]{})));
+
+        final Set<String> statuses = json.read("components.*status", setOfString);
+        assertThat(statuses,Matchers.contains(Status.UP.getCode()));
+
+
 
     }