Skip to content

Commit 2da77e1

Browse files
committed
test extensions
1 parent 158de7f commit 2da77e1

File tree

3 files changed

+58
-2
lines changed

3 files changed

+58
-2
lines changed
Submodule integrations-core updated 3586 files

dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTestBase.groovy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ import datadog.trace.api.Config
66
import datadog.trace.api.DDSpanTypes
77
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
88
import datadog.trace.bootstrap.instrumentation.api.Tags
9+
import datadog.trace.test.util.TestSourceFileExtension
910
import org.apache.derby.jdbc.EmbeddedDataSource
1011
import org.h2.jdbcx.JdbcDataSource
12+
import org.junit.jupiter.api.extension.ExtendWith
1113
import spock.lang.Shared
1214
import test.TestConnection
1315
import test.WrappedConnection
@@ -24,6 +26,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
2426
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
2527
import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
2628

29+
@ExtendWith(TestSourceFileExtension)
2730
abstract class JDBCInstrumentationTest extends VersionedNamingTestBase {
2831

2932
@Shared
@@ -752,7 +755,7 @@ abstract class JDBCInstrumentationTest extends VersionedNamingTestBase {
752755
for (int i = 0; i < numQueries; ++i) {
753756
res[i] == 3
754757
}
755-
assertTraces(5) {
758+
assertTraces(6) {
756759
trace(1) {
757760
span {
758761
operationName this.operation(dbType)
@@ -849,6 +852,7 @@ abstract class JDBCInstrumentationTest extends VersionedNamingTestBase {
849852
protected abstract boolean dbmTraceInjected()
850853
}
851854
855+
@ExtendWith(TestSourceFileExtension)
852856
class JDBCInstrumentationV0Test extends JDBCInstrumentationTest {
853857
854858
@Override
@@ -872,6 +876,7 @@ class JDBCInstrumentationV0Test extends JDBCInstrumentationTest {
872876
}
873877
}
874878
879+
TestSourceFileExtension
875880
class JDBCInstrumentationV1ForkedTest extends JDBCInstrumentationTest {
876881
877882
@Override
@@ -895,6 +900,7 @@ class JDBCInstrumentationV1ForkedTest extends JDBCInstrumentationTest {
895900
}
896901
}
897902
903+
@ExtendWith(TestSourceFileExtension)
898904
class JDBCInstrumentationDBMTraceInjectedForkedTest extends JDBCInstrumentationTest {
899905
900906
@Override
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package datadog.trace.test.util
2+
3+
import org.junit.jupiter.api.extension.ExtensionContext
4+
import org.junit.jupiter.api.extension.TestWatcher
5+
6+
class TestSourceFileExtension implements TestWatcher {
7+
TestSourceFileExtension() {
8+
System.out.println("TestSourceFileExtension initialized!")
9+
}
10+
11+
@Override
12+
void testSuccessful(ExtensionContext context) {
13+
System.out.println("test was successful!")
14+
getTestData(context)
15+
}
16+
17+
@Override
18+
void testFailed(ExtensionContext context, Throwable cause) {
19+
System.out.println("test failed!")
20+
getTestData(context)
21+
}
22+
23+
@Override
24+
void testAborted(ExtensionContext context, Throwable cause) {
25+
System.out.println("test aborted!")
26+
getTestData(context)
27+
}
28+
29+
@Override
30+
void testDisabled(ExtensionContext context, Optional<String> reason) {
31+
System.out.println("test disabled!")
32+
getTestData(context)
33+
}
34+
35+
private static void getTestData(ExtensionContext context) {
36+
String testClassName = context.getTestClass().get().getSimpleName()
37+
String testMethodName = context.getTestMethod().get().getName()
38+
String className = context.getClass()
39+
String requiredTestClassName = context.getRequiredTestClass().getName()
40+
String requiredTestMethodName = context.getRequiredTestMethod().getName()
41+
42+
System.out.println("--------------------------")
43+
System.out.println("testClassName: " + testClassName)
44+
System.out.println("testMethodName: " + testMethodName)
45+
System.out.println("className: " + className)
46+
System.out.println("requiredTestClassName: " + requiredTestClassName)
47+
System.out.println("requiredTestMethodName: " + requiredTestMethodName)
48+
System.out.println("--------------------------")
49+
}
50+
}

0 commit comments

Comments
 (0)