Fix unit tests

Author: oliemansm

example-graphql-tools/src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
 graphql:
   servlet:
     exception-handlers-enabled: true
-    tracing-enabled: "metrics-only"
+    tracing-enabled: metrics-only
 graphiql:
   headers:
     Authorization: "Bearer 05bd9a5f3fe0408f89520946b0fe1b06"

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLInstrumentationAutoConfiguration.java

@@ -37,16 +37,16 @@ public class GraphQLInstrumentationAutoConfiguration {
 
   @Bean
   @ConditionalOnMissingBean({TracingInstrumentation.class, MetricsInstrumentation.class})
-  @ConditionalOnExpression("'${graphql.servlet.tracing-enabled}' == 'metrics-only' "
-      + "|| '${graphql.servlet.tracing-enabled}' == 'true'")
+  @ConditionalOnExpression("'${graphql.servlet.tracing-enabled:false}' == 'metrics-only' "
+      + "|| '${graphql.servlet.tracing-enabled:false}' == 'true'")
   public TracingInstrumentation tracingInstrumentation() {
     return new TracingInstrumentation();
   }
 
   @Bean
   @ConditionalOnMissingBean
-  @ConditionalOnExpression("${graphql.servlet.actuator-metrics:false}"
-      + "&& '${graphql.servlet.tracing-enabled}' == 'false'")
+  @ConditionalOnExpression("${graphql.servlet.actuator-metrics:false} "
+      + "&& '${graphql.servlet.tracing-enabled:false}' == 'false'")
   public TracingNoResolversInstrumentation tracingNoResolversInstrumentation() {
     return new TracingNoResolversInstrumentation();
   }
@@ -71,7 +71,7 @@ public MaxQueryDepthInstrumentation maxQueryDepthInstrumentation() {
   @ConditionalOnMissingBean
   public MetricsInstrumentation metricsInstrumentation(MeterRegistry meterRegistry) {
     return new MetricsInstrumentation(meterRegistry,
-        Boolean.TRUE.toString().equals(graphqlServletProperties.getTracingEnabled()));
+        Boolean.TRUE.toString().equalsIgnoreCase(graphqlServletProperties.getTracingEnabled()));
   }
 
   @Bean

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/spring/web/boot/test/instrumentation/GraphQLInstrumentationAutoConfigurationTest.java

@@ -1,6 +1,7 @@
 package graphql.kickstart.spring.web.boot.test.instrumentation;
 
 import graphql.kickstart.spring.web.boot.GraphQLInstrumentationAutoConfiguration;
+import graphql.kickstart.spring.web.boot.GraphQLServletProperties;
 import graphql.kickstart.spring.web.boot.metrics.MetricsInstrumentation;
 import graphql.kickstart.spring.web.boot.metrics.TracingNoResolversInstrumentation;
 import graphql.kickstart.spring.web.boot.test.AbstractAutoConfigurationTest;
@@ -14,6 +15,7 @@
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
@@ -24,7 +26,7 @@
 /**
  * @author Marcel Overdijk
  */
-public class GraphQLInstrumentationAutoConfigurationTest extends AbstractAutoConfigurationTest {
+class GraphQLInstrumentationAutoConfigurationTest extends AbstractAutoConfigurationTest {
 
     public GraphQLInstrumentationAutoConfigurationTest() {
         super(AnnotationConfigWebApplicationContext.class, GraphQLInstrumentationAutoConfiguration.class);
@@ -46,36 +48,36 @@ MeterRegistry meterRegistry() {
     }
 
     @Test
-    public void noDefaultInstrumentations() {
+    void noDefaultInstrumentations() {
         load(DefaultConfiguration.class);
 
         assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
             .isThrownBy(() -> this.getContext().getBean(Instrumentation.class));
     }
 
     @Test
-    public void tracingInstrumentationEnabled() {
+    void tracingInstrumentationEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true");
 
         assertThat(this.getContext().getBean(TracingInstrumentation.class)).isNotNull();
     }
 
     @Test
-    public void maxQueryComplexityEnabled() {
+    void maxQueryComplexityEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.maxQueryComplexity=10");
 
         assertThat(this.getContext().getBean(MaxQueryComplexityInstrumentation.class)).isNotNull();
     }
 
     @Test
-    public void maxQueryDepthEnabled() {
+    void maxQueryDepthEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.maxQueryDepth=10");
 
         assertThat(this.getContext().getBean(MaxQueryDepthInstrumentation.class)).isNotNull();
     }
 
     @Test
-    public void actuatorMetricsEnabledAndTracingEnabled() {
+    void actuatorMetricsEnabledAndTracingEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true", "graphql.servlet.actuator-metrics=true");
 
         assertThat(this.getContext().getBean(MetricsInstrumentation.class)).isNotNull();
@@ -84,31 +86,31 @@ public void actuatorMetricsEnabledAndTracingEnabled() {
     }
 
     @Test
-    public void tracingInstrumentationDisabledAndMetricsEnabled() {
+    void tracingInstrumentationDisabledAndMetricsEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=false", "graphql.servlet.actuator-metrics=true");
 
         assertThat(this.getContext().getBean(MetricsInstrumentation.class)).isNotNull();
         assertThat(this.getContext().getBean(TracingNoResolversInstrumentation.class)).isNotNull();
     }
 
     @Test
-    public void tracingMetricsWithTracingDisabled() {
-        load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled='metrics-only'", "graphql.servlet.actuator-metrics=true");
+    void tracingMetricsWithTracingDisabled() {
+        load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=metrics-only", "graphql.servlet.actuator-metrics=true");
 
         assertThat(this.getContext().getBean("metricsInstrumentation")).isNotNull();
         assertThat(this.getContext().getBean("tracingInstrumentation")).isNotNull();
     }
 
     @Test
-    public void actuatorMetricsEnabled() {
+    void actuatorMetricsEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.actuator-metrics=true");
 
-        assertThat(this.getContext().getBean(MetricsInstrumentation.class)).isNotNull();
         assertThat(this.getContext().getBean(TracingNoResolversInstrumentation.class)).isNotNull();
+        assertThat(this.getContext().getBean(MetricsInstrumentation.class)).isNotNull();
     }
 
     @Test
-    public void tracingInstrumentationEnabledAndMetricsDisabled() {
+    void tracingInstrumentationEnabledAndMetricsDisabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true", "graphql.servlet.actuator-metrics=false");
 
         assertThat(this.getContext().getBean(TracingInstrumentation.class)).isNotNull();
@@ -117,7 +119,7 @@ public void tracingInstrumentationEnabledAndMetricsDisabled() {
     }
 
     @Test
-    public void tracingInstrumentationDisabledAndMetricsDisabled() {
+    void tracingInstrumentationDisabledAndMetricsDisabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=false", "graphql.servlet.actuator-metrics=false");
 
         assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
@@ -129,7 +131,7 @@ public void tracingInstrumentationDisabledAndMetricsDisabled() {
     }
 
     @Test
-    public void actuatorMetricsDisabled() {
+    void actuatorMetricsDisabled() {
         load(DefaultConfiguration.class, "graphql.servlet.actuator-metrics=false");
 
         assertThatExceptionOfType(NoSuchBeanDefinitionException.class)

graphql-spring-boot-autoconfigure/src/test/resources/application.yml

@@ -1 +1,2 @@
-graphql.servlet.mapping: /test
+graphql.servlet.mapping: /test
+debug: true