Skip to content

Commit 9b92c76

Browse files
committed
update test
1 parent eb2ef5f commit 9b92c76

File tree

1 file changed

+35
-9
lines changed

1 file changed

+35
-9
lines changed

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/AgentConfigTest.java

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,14 @@ class AgentConfigTest {
2525
@ArgumentsSource(InstrumentationEnabledParams.class)
2626
void testIsInstrumentationEnabled(
2727
@SuppressWarnings("unused") String description,
28-
boolean firstEnabled,
29-
boolean secondEnabled,
28+
Boolean firstEnabled,
29+
Boolean secondEnabled,
3030
boolean defaultEnabled,
3131
boolean expected) {
3232

3333
ConfigProperties config = mock(ConfigProperties.class);
34-
when(config.getBoolean("otel.instrumentation.first.enabled", defaultEnabled))
35-
.thenReturn(firstEnabled);
36-
when(config.getBoolean("otel.instrumentation.second.enabled", defaultEnabled))
37-
.thenReturn(secondEnabled);
34+
when(config.getBoolean("otel.instrumentation.first.enabled")).thenReturn(firstEnabled);
35+
when(config.getBoolean("otel.instrumentation.second.enabled")).thenReturn(secondEnabled);
3836

3937
assertEquals(
4038
expected,
@@ -49,13 +47,41 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
4947
return Stream.of(
5048
Arguments.of(
5149
"enabled by default, both instrumentations are off", false, false, true, false),
52-
Arguments.of("enabled by default, one instrumentation is on", true, false, true, false),
50+
Arguments.of("enabled by default, first instrumentation is on", true, null, true, true),
51+
Arguments.of("enabled by default, second instrumentation is on", null, true, true, true),
5352
Arguments.of("enabled by default, both instrumentations are on", true, true, true, true),
53+
Arguments.of(
54+
"enabled by default, first instrumentation is off, second is on",
55+
false,
56+
true,
57+
true,
58+
false),
59+
Arguments.of(
60+
"enabled by default, first instrumentation is on, second is off",
61+
true,
62+
false,
63+
true,
64+
true),
65+
Arguments.of("enabled by default", null, null, true, true),
5466
Arguments.of(
5567
"disabled by default, both instrumentations are off", false, false, false, false),
56-
Arguments.of("disabled by default, one instrumentation is on", true, false, false, true),
68+
Arguments.of("disabled by default, first instrumentation is on", true, null, false, true),
69+
Arguments.of(
70+
"disabled by default, second instrumentation is on", null, true, false, true),
71+
Arguments.of("disabled by default, both instrumentation are on", true, true, false, true),
72+
Arguments.of(
73+
"disabled by default, first instrumentation is off, second is on",
74+
false,
75+
true,
76+
false,
77+
false),
5778
Arguments.of(
58-
"disabled by default, both instrumentation are on", true, true, false, true));
79+
"disabled by default, first instrumentation is on, second is off",
80+
true,
81+
false,
82+
false,
83+
true),
84+
Arguments.of("disabled by default", null, null, false, false));
5985
}
6086
}
6187
}

0 commit comments

Comments
 (0)