Skip to content

Commit 3a8e66b

Browse files
committed
Reduce some test duplication by moving common classes to the main directory.
This allowed me to declare a test dependency on the servlet-3.0:testing directory. (Test directories can't depend on other test directories.) Still need to copy over all the test classes because of how the test hierarchy is declared.
1 parent 367f0a1 commit 3a8e66b

27 files changed

+31
-577
lines changed

instrumentation/servlet/servlet-3.0/library/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ plugins {
55
dependencies {
66
compileOnly("javax.servlet:javax.servlet-api:3.0.1")
77

8+
testImplementation(project(":instrumentation:servlet:servlet-3.0:testing"))
9+
810
testLibrary("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
911
testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
1012
testLibrary("org.apache.tomcat.embed:tomcat-embed-core:8.0.41")

instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/RequestDispatcherServlet.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/Servlet3MappingResolverFactory.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)