refactor

Author: trask

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/boot/SpringBootBasedTest.java

@@ -59,4 +59,9 @@ protected void configure(HttpServerTestOptions options) {
         Boolean.getBoolean("testLatestDeps") ? 500 : 200);
     options.setExpectedException(new RuntimeException(EXCEPTION.getBody()));
   }
+
+  @Override
+  protected boolean shouldTestDeferredResult() {
+    return Boolean.getBoolean("testLatestDeps");
+  }
 }

instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java

@@ -23,6 +23,7 @@
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
@@ -42,7 +43,6 @@
 import java.util.Locale;
 import java.util.function.Consumer;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -60,6 +60,10 @@ public abstract class AbstractSpringBootBasedTest
 
   protected abstract Class<?> securityConfigClass();
 
+  protected boolean shouldTestDeferredResult() {
+    return true;
+  }
+
   @Override
   protected void stopServer(ConfigurableApplicationContext ctx) {
     ctx.close();
@@ -147,8 +151,9 @@ void testCharacterEncodingOfTestPassword(String testPassword) {
   }
 
   @Test
-  @EnabledIfSystemProperty(named = "testLatestDeps", matches = "true")
   void deferredResult() {
+    assumeTrue(shouldTestDeferredResult());
+
     AggregatedHttpResponse response =
         client.execute(request(DEFERRED_RESULT, "GET")).aggregate().join();