Skip to content

Commit dcdb23f

Browse files
zeitlingerzeitlinger
committed
convert servlet 5 tests to java
1 parent b5b5e09 commit dcdb23f

21 files changed

+100
-100
lines changed

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5AsyncTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty;
77

8-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
8+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

1111
public class JettyServlet5AsyncTest extends JettyServlet5Test {
1212

1313
@Override
1414
public Class<? extends Servlet> servlet() {
15-
return TestServlet3.Async.class;
15+
return TestServlet5.Async.class;
1616
}
1717

1818
@Override

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5FakeAsyncTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty;
77

8-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
8+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

1111
public class JettyServlet5FakeAsyncTest extends JettyServlet5Test {
1212
@Override
1313
public Class<? extends Servlet> servlet() {
14-
return TestServlet3.FakeAsync.class;
14+
return TestServlet5.FakeAsync.class;
1515
}
1616
}

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5SyncTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty;
77

8-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
8+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
99
import jakarta.servlet.Servlet;
1010

1111
public class JettyServlet5SyncTest extends JettyServlet5Test {
1212
@Override
1313
public Class<? extends Servlet> servlet() {
14-
return TestServlet3.Sync.class;
14+
return TestServlet5.Sync.class;
1515
}
1616
}

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
1414
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
1515
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
16-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.AbstractServlet3Test;
16+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.AbstractServlet5Test;
1717
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
1818
import io.opentelemetry.sdk.trace.data.SpanData;
1919
import java.io.IOException;
@@ -27,7 +27,7 @@
2727
import org.junit.jupiter.api.extension.RegisterExtension;
2828

2929
public abstract class JettyServlet5Test
30-
extends AbstractServlet3Test<Server, ServletContextHandler> {
30+
extends AbstractServlet5Test<Server, ServletContextHandler> {
3131

3232
@RegisterExtension
3333
protected static final InstrumentationExtension testing =

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServletHandlerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
1515
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
1616
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
17-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.AbstractServlet3Test;
18-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
17+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.AbstractServlet5Test;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
1919
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
2020
import io.opentelemetry.sdk.trace.data.SpanData;
2121
import io.opentelemetry.semconv.HttpAttributes;
@@ -30,7 +30,7 @@
3030
import org.eclipse.jetty.servlet.ServletHandler;
3131
import org.junit.jupiter.api.extension.RegisterExtension;
3232

33-
public class JettyServletHandlerTest extends AbstractServlet3Test<Server, ServletHandler> {
33+
public class JettyServletHandlerTest extends AbstractServlet5Test<Server, ServletHandler> {
3434

3535
@RegisterExtension
3636
protected static final InstrumentationExtension testing =
@@ -109,6 +109,6 @@ public void stopServer(Server server) throws Exception {
109109

110110
@Override
111111
public Class<? extends Servlet> servlet() {
112-
return TestServlet3.Sync.class;
112+
return TestServlet5.Sync.class;
113113
}
114114
}

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyDispatchTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.dispatch;
77

88
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
9-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty.JettyServlet3Test;
9+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.JettyServlet5Test;
1010

11-
public abstract class JettyDispatchTest extends JettyServlet3Test {
11+
public abstract class JettyDispatchTest extends JettyServlet5Test {
1212

1313
@Override
1414
protected void configure(HttpServerTestOptions options) {

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5DispatchAsyncTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1616
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1717

18-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty.dispatch.JettyDispatchTest;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.dispatch.JettyDispatchTest;
19+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
2121
import org.eclipse.jetty.servlet.ServletContextHandler;
2222

2323
public class JettyServlet5DispatchAsyncTest extends JettyDispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
26-
return TestServlet3.Async.class;
26+
return TestServlet5.Async.class;
2727
}
2828

2929
@Override
@@ -35,22 +35,22 @@ public boolean isAsyncTest() {
3535
protected void setupServlets(ServletContextHandler context) throws Exception {
3636
super.setupServlets(context);
3737
addServlet(
38-
context, "/dispatch" + HTML_PRINT_WRITER.getPath(), TestServlet3.DispatchAsync.class);
38+
context, "/dispatch" + HTML_PRINT_WRITER.getPath(), TestServlet5.DispatchAsync.class);
3939
addServlet(
4040
context,
4141
"/dispatch" + HTML_SERVLET_OUTPUT_STREAM.getPath(),
42-
TestServlet3.DispatchAsync.class);
43-
addServlet(context, "/dispatch" + SUCCESS.getPath(), TestServlet3.DispatchAsync.class);
44-
addServlet(context, "/dispatch" + QUERY_PARAM.getPath(), TestServlet3.DispatchAsync.class);
45-
addServlet(context, "/dispatch" + ERROR.getPath(), TestServlet3.DispatchAsync.class);
46-
addServlet(context, "/dispatch" + EXCEPTION.getPath(), TestServlet3.DispatchAsync.class);
47-
addServlet(context, "/dispatch" + REDIRECT.getPath(), TestServlet3.DispatchAsync.class);
48-
addServlet(context, "/dispatch" + AUTH_REQUIRED.getPath(), TestServlet3.DispatchAsync.class);
49-
addServlet(context, "/dispatch" + CAPTURE_HEADERS.getPath(), TestServlet3.DispatchAsync.class);
42+
TestServlet5.DispatchAsync.class);
43+
addServlet(context, "/dispatch" + SUCCESS.getPath(), TestServlet5.DispatchAsync.class);
44+
addServlet(context, "/dispatch" + QUERY_PARAM.getPath(), TestServlet5.DispatchAsync.class);
45+
addServlet(context, "/dispatch" + ERROR.getPath(), TestServlet5.DispatchAsync.class);
46+
addServlet(context, "/dispatch" + EXCEPTION.getPath(), TestServlet5.DispatchAsync.class);
47+
addServlet(context, "/dispatch" + REDIRECT.getPath(), TestServlet5.DispatchAsync.class);
48+
addServlet(context, "/dispatch" + AUTH_REQUIRED.getPath(), TestServlet5.DispatchAsync.class);
49+
addServlet(context, "/dispatch" + CAPTURE_HEADERS.getPath(), TestServlet5.DispatchAsync.class);
5050
addServlet(
51-
context, "/dispatch" + CAPTURE_PARAMETERS.getPath(), TestServlet3.DispatchAsync.class);
52-
addServlet(context, "/dispatch" + INDEXED_CHILD.getPath(), TestServlet3.DispatchAsync.class);
53-
addServlet(context, "/dispatch/recursive", TestServlet3.DispatchRecursive.class);
51+
context, "/dispatch" + CAPTURE_PARAMETERS.getPath(), TestServlet5.DispatchAsync.class);
52+
addServlet(context, "/dispatch" + INDEXED_CHILD.getPath(), TestServlet5.DispatchAsync.class);
53+
addServlet(context, "/dispatch/recursive", TestServlet5.DispatchRecursive.class);
5454
}
5555

5656
@Override

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5DispatchImmediateTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1616
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1717

18-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.jetty.dispatch.JettyDispatchTest;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty.dispatch.JettyDispatchTest;
19+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
2121
import org.eclipse.jetty.servlet.ServletContextHandler;
2222

2323
public class JettyServlet5DispatchImmediateTest extends JettyDispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
26-
return TestServlet3.Async.class;
26+
return TestServlet5.Async.class;
2727
}
2828

2929
@Override
@@ -40,24 +40,24 @@ public boolean errorEndpointUsesSendError() {
4040
protected void setupServlets(ServletContextHandler context) throws Exception {
4141
super.setupServlets(context);
4242
addServlet(
43-
context, "/dispatch" + HTML_PRINT_WRITER.getPath(), TestServlet3.DispatchImmediate.class);
43+
context, "/dispatch" + HTML_PRINT_WRITER.getPath(), TestServlet5.DispatchImmediate.class);
4444
addServlet(
4545
context,
4646
"/dispatch" + HTML_SERVLET_OUTPUT_STREAM.getPath(),
47-
TestServlet3.DispatchImmediate.class);
48-
addServlet(context, "/dispatch" + SUCCESS.getPath(), TestServlet3.DispatchImmediate.class);
49-
addServlet(context, "/dispatch" + QUERY_PARAM.getPath(), TestServlet3.DispatchImmediate.class);
50-
addServlet(context, "/dispatch" + ERROR.getPath(), TestServlet3.DispatchImmediate.class);
51-
addServlet(context, "/dispatch" + EXCEPTION.getPath(), TestServlet3.DispatchImmediate.class);
52-
addServlet(context, "/dispatch" + REDIRECT.getPath(), TestServlet3.DispatchImmediate.class);
47+
TestServlet5.DispatchImmediate.class);
48+
addServlet(context, "/dispatch" + SUCCESS.getPath(), TestServlet5.DispatchImmediate.class);
49+
addServlet(context, "/dispatch" + QUERY_PARAM.getPath(), TestServlet5.DispatchImmediate.class);
50+
addServlet(context, "/dispatch" + ERROR.getPath(), TestServlet5.DispatchImmediate.class);
51+
addServlet(context, "/dispatch" + EXCEPTION.getPath(), TestServlet5.DispatchImmediate.class);
52+
addServlet(context, "/dispatch" + REDIRECT.getPath(), TestServlet5.DispatchImmediate.class);
5353
addServlet(
54-
context, "/dispatch" + AUTH_REQUIRED.getPath(), TestServlet3.DispatchImmediate.class);
54+
context, "/dispatch" + AUTH_REQUIRED.getPath(), TestServlet5.DispatchImmediate.class);
5555
addServlet(
56-
context, "/dispatch" + CAPTURE_HEADERS.getPath(), TestServlet3.DispatchImmediate.class);
56+
context, "/dispatch" + CAPTURE_HEADERS.getPath(), TestServlet5.DispatchImmediate.class);
5757
addServlet(
58-
context, "/dispatch" + CAPTURE_PARAMETERS.getPath(), TestServlet3.DispatchImmediate.class);
58+
context, "/dispatch" + CAPTURE_PARAMETERS.getPath(), TestServlet5.DispatchImmediate.class);
5959
addServlet(
60-
context, "/dispatch" + INDEXED_CHILD.getPath(), TestServlet3.DispatchImmediate.class);
61-
addServlet(context, "/dispatch/recursive", TestServlet3.DispatchRecursive.class);
60+
context, "/dispatch" + INDEXED_CHILD.getPath(), TestServlet5.DispatchImmediate.class);
61+
addServlet(context, "/dispatch/recursive", TestServlet5.DispatchRecursive.class);
6262
}
6363
}

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5ForwardTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
1616
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1717

18-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.RequestDispatcherServlet;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.RequestDispatcherServlet;
19+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
2121
import org.eclipse.jetty.servlet.ServletContextHandler;
2222

2323
public class JettyServlet5ForwardTest extends JettyDispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
26-
return TestServlet3.Sync.class; // dispatch to sync servlet
26+
return TestServlet5.Sync.class; // dispatch to sync servlet
2727
}
2828

2929
@Override

‎instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5IncludeTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1616

1717
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
18-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.RequestDispatcherServlet;
19-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat.TestServlet3;
18+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.RequestDispatcherServlet;
19+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat.TestServlet5;
2020
import jakarta.servlet.Servlet;
2121
import org.eclipse.jetty.servlet.ServletContextHandler;
2222

2323
public class JettyServlet5IncludeTest extends JettyDispatchTest {
2424
@Override
2525
public Class<? extends Servlet> servlet() {
26-
return TestServlet3.Sync.class; // dispatch to sync servlet
26+
return TestServlet5.Sync.class; // dispatch to sync servlet
2727
}
2828

2929
@Override

0 commit comments

Comments
 (0)