refine ut

open-telemetry · Dec 4, 2024 · 6dea116 · 6dea116
1 parent c63a933
commit 6dea116
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/...ava/server/VertxLatestHttpServerTest.java → ...tion/vertx/VertxLatestHttpServerTest.java b/...ava/server/VertxLatestHttpServerTest.java → ...tion/vertx/VertxLatestHttpServerTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.Vertx;

diff --git a/...est/java/server/VertxLatestWebServer.java → ...mentation/vertx/VertxLatestWebServer.java b/...est/java/server/VertxLatestWebServer.java → ...mentation/vertx/VertxLatestWebServer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpServerResponse;

diff --git a/...Test/java/server/VertxHttpServerTest.java → ...umentation/vertx/VertxHttpServerTest.java b/...Test/java/server/VertxHttpServerTest.java → ...umentation/vertx/VertxHttpServerTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import io.vertx.core.AbstractVerticle;
 

diff --git a/...sion3Test/java/server/VertxWebServer.java → ...instrumentation/vertx/VertxWebServer.java b/...sion3Test/java/server/VertxWebServer.java → ...instrumentation/vertx/VertxWebServer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import io.vertx.core.Future;
 import io.vertx.core.http.HttpServerResponse;

diff --git a/...a/server/AbstractVertxHttpServerTest.java → ...on/vertx/AbstractVertxHttpServerTest.java b/...a/server/AbstractVertxHttpServerTest.java → ...on/vertx/AbstractVertxHttpServerTest.java
@@ -3,9 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
-
-import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import io.opentelemetry.instrumentation.api.internal.HttpConstants;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -32,23 +30,21 @@ abstract class AbstractVertxHttpServerTest extends AbstractHttpServerTest<Vertx>
 
   @Override
   protected void configure(HttpServerTestOptions options) {
+    super.configure(options);
     options.setTestPathParam(true);
     // server spans are ended inside of the controller spans
     options.setVerifyServerSpanEndTime(false);
     options.setContextPath("/vertx-app");
-    options.setExpectedException(new IllegalStateException(EXCEPTION.getBody()));
-    super.configure(options);
-  }
-
-  @Override
-  public String expectedHttpRoute(ServerEndpoint endpoint, String method) {
-    if (Objects.equals(method, HttpConstants._OTHER)) {
-      return getContextPath() + endpoint.getPath();
-    }
-    if (Objects.equals(endpoint, ServerEndpoint.NOT_FOUND)) {
-      return getContextPath();
-    }
-    return super.expectedHttpRoute(endpoint, method);
+    options.setExpectedHttpRoute(
+        (endpoint, method) -> {
+          if (Objects.equals(method, HttpConstants._OTHER)) {
+            return getContextPath() + endpoint.getPath();
+          }
+          if (Objects.equals(endpoint, ServerEndpoint.NOT_FOUND)) {
+            return getContextPath();
+          }
+          return super.expectedHttpRoute(endpoint, method);
+        });
   }
 
   @Override

diff --git a/...n/java/server/AbstractVertxWebServer.java → ...ntation/vertx/AbstractVertxWebServer.java b/...n/java/server/AbstractVertxWebServer.java → ...ntation/vertx/AbstractVertxWebServer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package server;
+package io.opentelemetry.javaagent.instrumentation.vertx;
 
 import static io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest.controller;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;