Skip to content

Commit 6df3e03

Browse files
daniel-mohedanodaniel-mohedano
committed
fix: selenium tests
1 parent a7340df commit 6df3e03

File tree

6 files changed

+45
-30
lines changed

6 files changed

+45
-30
lines changed

‎dd-java-agent/instrumentation/selenium-3.13/build.gradle‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ dependencies {
3232
testImplementation group: 'org.seleniumhq.selenium', name: 'htmlunit-driver', version: '2.70.0'
3333

3434
latestDepTestImplementation group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '+'
35-
latestDepTestImplementation group: 'org.seleniumhq.selenium', name: 'htmlunit-driver', version: '+'
35+
latestDepTestImplementation group: 'org.seleniumhq.selenium', name: 'htmlunit3-driver', version: '+'
36+
}
37+
38+
configurations {
39+
// Needed for test, but for latestDepTest the old htmlunit-driver was renamed to htmlunit3-driver,
40+
// and both define the same HtmlUnitDriver class, so exclude the old one.
41+
latestDepTestImplementation.exclude group: 'org.seleniumhq.selenium', module: 'htmlunit-driver'
3642
}
3743

3844
configurations.matching({ it.name.startsWith('test') || it.name.startsWith('latestDepTest') }).configureEach({

‎dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testFixturesRunt
1515
com.fasterxml.jackson.core:jackson-annotations:2.20=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
1616
com.fasterxml.jackson.core:jackson-core:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
1717
com.fasterxml.jackson.core:jackson-databind:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
18-
com.fasterxml.jackson:jackson-bom:2.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
1918
com.github.javaparser:javaparser-core:3.25.6=codenarc
2019
com.github.jnr:jffi:1.3.14=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
2120
com.github.jnr:jnr-a64asm:1.0.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -48,7 +47,7 @@ com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnota
4847
com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
4948
com.google.re2j:re2j:1.7=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
5049
com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
51-
com.shapesecurity:salvation2:3.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
50+
com.shapesecurity:salvation2:3.0.1=testCompileClasspath,testRuntimeClasspath
5251
com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
5352
com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
5453
com.squareup.okhttp3:okhttp:3.11.0=compileClasspath
@@ -57,12 +56,15 @@ com.squareup.okio:okio:1.14.0=compileClasspath
5756
com.squareup.okio:okio:1.17.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
5857
com.thoughtworks.qdox:qdox:1.12.1=codenarc
5958
com.vaadin.external.google:android-json:0.0.20131108.vaadin1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
60-
commons-codec:commons-codec:1.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
59+
commons-codec:commons-codec:1.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
60+
commons-codec:commons-codec:1.15=testCompileClasspath,testRuntimeClasspath
6161
commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
62-
commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
62+
commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
6363
commons-io:commons-io:2.20.0=spotbugs
64-
commons-logging:commons-logging:1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
65-
commons-net:commons-net:3.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
64+
commons-io:commons-io:2.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
65+
commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath
66+
commons-logging:commons-logging:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
67+
commons-net:commons-net:3.9.0=testCompileClasspath,testRuntimeClasspath
6668
de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
6769
io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath
6870
io.opentelemetry:opentelemetry-api:1.60.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
@@ -88,26 +90,27 @@ net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClas
8890
net.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
8991
net.minidev:json-smart:2.4.10=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
9092
net.sf.saxon:Saxon-HE:12.9=spotbugs
91-
net.sourceforge.htmlunit:htmlunit-core-js:2.70.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
92-
net.sourceforge.htmlunit:htmlunit-cssparser:1.14.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
93-
net.sourceforge.htmlunit:htmlunit-xpath:2.70.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
94-
net.sourceforge.htmlunit:htmlunit:2.70.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
95-
net.sourceforge.htmlunit:neko-htmlunit:2.70.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
93+
net.sourceforge.htmlunit:htmlunit-core-js:2.70.0=testCompileClasspath,testRuntimeClasspath
94+
net.sourceforge.htmlunit:htmlunit-cssparser:1.14.0=testCompileClasspath,testRuntimeClasspath
95+
net.sourceforge.htmlunit:htmlunit-xpath:2.70.0=testCompileClasspath,testRuntimeClasspath
96+
net.sourceforge.htmlunit:htmlunit:2.70.0=testCompileClasspath,testRuntimeClasspath
97+
net.sourceforge.htmlunit:neko-htmlunit:2.70.0=testCompileClasspath,testRuntimeClasspath
9698
org.apache.ant:ant-antlr:1.10.14=codenarc
9799
org.apache.ant:ant-junit:1.10.14=codenarc
98100
org.apache.bcel:bcel:6.11.0=spotbugs
99101
org.apache.commons:commons-exec:1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath
100-
org.apache.commons:commons-lang3:3.12.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
102+
org.apache.commons:commons-lang3:3.12.0=testCompileClasspath,testRuntimeClasspath
101103
org.apache.commons:commons-lang3:3.19.0=spotbugs
102-
org.apache.commons:commons-text:1.10.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
104+
org.apache.commons:commons-lang3:3.20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
105+
org.apache.commons:commons-text:1.10.0=testCompileClasspath,testRuntimeClasspath
103106
org.apache.commons:commons-text:1.14.0=spotbugs
104107
org.apache.httpcomponents:httpclient:4.5.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
105108
org.apache.httpcomponents:httpcore:4.4.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
106109
org.apache.httpcomponents:httpmime:4.5.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
107110
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
108111
org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
109112
org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath,testFixturesCompileClasspath
110-
org.brotli:dec:0.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113+
org.brotli:dec:0.1.2=testCompileClasspath,testRuntimeClasspath
111114
org.checkerframework:checker-compat-qual:2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
112115
org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
113116
org.codehaus.groovy:groovy-ant:3.0.23=codenarc
@@ -122,17 +125,24 @@ org.codehaus.groovy:groovy:3.0.25=latestDepTestCompileClasspath,latestDepTestRun
122125
org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,testCompileClasspath,testRuntimeClasspath
123126
org.codenarc:CodeNarc:3.7.0=codenarc
124127
org.dom4j:dom4j:2.2.0=spotbugs
125-
org.eclipse.jetty.websocket:websocket-api:9.4.50.v20221201=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
126-
org.eclipse.jetty.websocket:websocket-client:9.4.50.v20221201=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
127-
org.eclipse.jetty.websocket:websocket-common:9.4.50.v20221201=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
128-
org.eclipse.jetty:jetty-client:9.4.50.v20221201=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
129-
org.eclipse.jetty:jetty-http:9.4.50.v20221201=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
130-
org.eclipse.jetty:jetty-io:9.4.50.v20221201=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
131-
org.eclipse.jetty:jetty-util:9.4.50.v20221201=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
128+
org.eclipse.jetty.websocket:websocket-api:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath
129+
org.eclipse.jetty.websocket:websocket-client:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath
130+
org.eclipse.jetty.websocket:websocket-common:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath
131+
org.eclipse.jetty:jetty-client:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath
132+
org.eclipse.jetty:jetty-http:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath
133+
org.eclipse.jetty:jetty-io:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath
134+
org.eclipse.jetty:jetty-util:9.4.50.v20221201=testCompileClasspath,testRuntimeClasspath
132135
org.freemarker:freemarker:2.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
133136
org.gmetrics:GMetrics:2.1.0=codenarc
134137
org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
135138
org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath
139+
org.htmlunit:htmlunit-core-js:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
140+
org.htmlunit:htmlunit-csp:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
141+
org.htmlunit:htmlunit-cssparser:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
142+
org.htmlunit:htmlunit-websocket-client:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
143+
org.htmlunit:htmlunit-xpath:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
144+
org.htmlunit:htmlunit:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
145+
org.htmlunit:neko-htmlunit:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
136146
org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
137147
org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
138148
org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -166,7 +176,7 @@ org.ow2.asm:asm-util:9.9=spotbugs
166176
org.ow2.asm:asm:9.9=spotbugs
167177
org.ow2.asm:asm:9.9.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
168178
org.seleniumhq.selenium:htmlunit-driver:2.70.0=testCompileClasspath,testRuntimeClasspath
169-
org.seleniumhq.selenium:htmlunit-driver:4.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
179+
org.seleniumhq.selenium:htmlunit3-driver:4.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
170180
org.seleniumhq.selenium:selenium-api:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath
171181
org.seleniumhq.selenium:selenium-api:4.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
172182
org.seleniumhq.selenium:selenium-chrome-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/instrumentation/selenium-3.13/src/latestDepTest/groovy/datadog/trace/instrumentation/selenium/SeleniumLatestTest.groovy‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.selenium
22

3-
import com.gargoylesoftware.htmlunit.Version
43
import org.example.TestSucceedMultipleSelenium
54
import org.junit.jupiter.api.Assumptions
65
import spock.util.environment.Jvm
@@ -15,7 +14,6 @@ class SeleniumLatestTest extends AbstractSeleniumTest {
1514

1615
def dynamicData = assertSpansData(testcaseName, [
1716
"content.meta.['test.browser.driver_version']": SeleniumUtils.SELENIUM_VERSION,
18-
"content.meta.['test.browser.version']" : Version.getProductVersion()
1917
])
2018
assertRumData(testCasesCount, dynamicData)
2119

‎dd-java-agent/instrumentation/selenium-3.13/src/latestDepTest/java/org/example/TestSucceedMultipleSelenium.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.example;
22

3-
import com.gargoylesoftware.htmlunit.BrowserVersion;
3+
import org.htmlunit.BrowserVersion;
44
import org.junit.jupiter.api.AfterAll;
55
import org.junit.jupiter.api.Assertions;
66
import org.junit.jupiter.api.BeforeAll;

‎dd-java-agent/instrumentation/selenium-3.13/src/latestDepTest/resources/test-succeed-multiple/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
"test.browser.driver" : "selenium",
5252
"test.browser.driver_version" : ${content_meta_test_browser_driver_version},
5353
"test.browser.name" : "htmlunit",
54-
"test.browser.version" : ${content_meta_test_browser_version},
5554
"test.codeowners" : "[\"owner1\",\"owner2\"]",
55+
"test.final_status" : "pass",
5656
"test.framework" : "junit5",
5757
"test.framework_version" : ${content_meta_test_framework_version},
5858
"test.is_rum_active" : "true",
@@ -103,8 +103,8 @@
103103
"test.browser.driver" : "selenium",
104104
"test.browser.driver_version" : ${content_meta_test_browser_driver_version},
105105
"test.browser.name" : "htmlunit",
106-
"test.browser.version" : ${content_meta_test_browser_version},
107106
"test.codeowners" : "[\"owner1\",\"owner2\"]",
107+
"test.final_status" : "pass",
108108
"test.framework" : "junit5",
109109
"test.framework_version" : ${content_meta_test_framework_version},
110110
"test.is_rum_active" : "true",
@@ -204,4 +204,4 @@
204204
},
205205
"type" : "test_module_end",
206206
"version" : 1
207-
} ]
207+
} ]

‎dd-java-agent/instrumentation/selenium-3.13/src/test/resources/test-succeed/events.ftl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"test.browser.name" : "htmlunit",
5454
"test.browser.version" : "2.70.0",
5555
"test.codeowners" : "[\"owner1\",\"owner2\"]",
56+
"test.final_status" : "pass",
5657
"test.framework" : "junit5",
5758
"test.framework_version" : ${content_meta_test_framework_version},
5859
"test.is_rum_active" : "true",
@@ -152,4 +153,4 @@
152153
},
153154
"type" : "test_module_end",
154155
"version" : 1
155-
} ]
156+
} ]

0 commit comments

Comments
 (0)