Skip to content

Commit e6028c5

Browse files
daniel-mohedanodaniel-mohedano
committed
formatting fixes
1 parent 96110c6 commit e6028c5

File tree

12 files changed

+59
-60
lines changed

12 files changed

+59
-60
lines changed

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private TestEventsHandlerFactory(
158158
services, repoServices, coverageServices, executionSettings);
159159
} else {
160160
sessionFactory =
161-
headlessTestFrameworkEssionFactory(
161+
headlessTestFrameworkSessionFactory(
162162
services, repoServices, coverageServices, executionSettings);
163163
}
164164
}
@@ -259,7 +259,7 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory(
259259
};
260260
}
261261

262-
private static TestFrameworkSession.Factory headlessTestFrameworkEssionFactory(
262+
private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory(
263263
CiVisibilityServices services,
264264
CiVisibilityRepoServices repoServices,
265265
CiVisibilityCoverageServices.Child coverageServices,

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,9 @@ private boolean isFeatureEnabled(
289289
}
290290

291291
private void overrideIntegerSetting(
292-
Function<Config, Integer> valueGetter, Function<Integer, Boolean> overrideCheck, Consumer<Integer> overrideAction) {
292+
Function<Config, Integer> valueGetter,
293+
Function<Integer, Boolean> overrideCheck,
294+
Consumer<Integer> overrideAction) {
293295
Integer value = valueGetter.apply(config);
294296
if (value != null && overrideCheck.apply(value)) {
295297
overrideAction.accept(value);

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
public class TestManagementSettings {
66

7-
public static final TestManagementSettings DEFAULT =
8-
new TestManagementSettings(false, -1);
7+
public static final TestManagementSettings DEFAULT = new TestManagementSettings(false, -1);
98

109
private final boolean enabled;
1110
private int attemptToFixRetries;

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettingsJsonAdapter.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package datadog.trace.civisibility.config;
22

33
import com.squareup.moshi.FromJson;
4-
54
import java.util.Map;
65

76
public class TestManagementSettingsJsonAdapter {
8-
public static final TestManagementSettingsJsonAdapter INSTANCE = new TestManagementSettingsJsonAdapter();
7+
public static final TestManagementSettingsJsonAdapter INSTANCE =
8+
new TestManagementSettingsJsonAdapter();
99

1010
@FromJson
1111
public TestManagementSettings fromJson(Map<String, Object> json) {
@@ -18,7 +18,6 @@ public TestManagementSettings fromJson(Map<String, Object> json) {
1818

1919
return new TestManagementSettings(
2020
enabled != null ? enabled : false,
21-
attemptToFixRetries != null ? attemptToFixRetries.intValue() : -1
22-
);
21+
attemptToFixRetries != null ? attemptToFixRetries.intValue() : -1);
2322
}
2423
}

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestManagementSettingsSerializer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.civisibility.config;
22

33
import datadog.trace.civisibility.ipc.serialization.Serializer;
4-
54
import java.nio.ByteBuffer;
65

76
public class TestManagementSettingsSerializer {

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ private void onModuleFinish(AgentSpan moduleSpan) {
196196
SpanUtils.propagateTag(span, moduleSpan, Tags.TEST_ITR_TESTS_SKIPPING_COUNT, Long::sum);
197197
SpanUtils.propagateTag(span, moduleSpan, DDTags.CI_ITR_TESTS_SKIPPED, Boolean::logicalOr);
198198

199-
SpanUtils.propagateTag(span, moduleSpan, Tags.TEST_TEST_MANAGEMENT_ENABLED, Boolean::logicalOr);
199+
SpanUtils.propagateTag(
200+
span, moduleSpan, Tags.TEST_TEST_MANAGEMENT_ENABLED, Boolean::logicalOr);
200201
}
201202
}
202203

‎dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class ExecutionSettingsTest extends Specification {
8080
true,
8181
true,
8282
new EarlyFlakeDetectionSettings(true, [new EarlyFlakeDetectionSettings.ExecutionsByDuration(10, 20), new EarlyFlakeDetectionSettings.ExecutionsByDuration(30, 40)], 10),
83-
new TestManagementSettings(true, 20),
83+
new TestManagementSettings(true, 20),
8484
"itrCorrelationId",
8585
[(new TestIdentifier("bc", "def", null)): new TestMetadata(true), (new TestIdentifier("de", "f", null)): new TestMetadata(true)],
8686
["cov" : BitSet.valueOf(new byte[]{

‎dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/TestManagementSettingsSerializerTest.groovy‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ class TestManagementSettingsSerializerTest extends Specification {
1616
deserialized == settings
1717

1818
where:
19-
settings << [
20-
TestManagementSettings.DEFAULT,
21-
new TestManagementSettings(true, 10),
22-
]
19+
settings << [TestManagementSettings.DEFAULT, new TestManagementSettings(true, 10),]
2320
}
2421
}

‎dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,45 @@ import datadog.trace.civisibility.test.ExecutionStrategy
1818

1919
class HeadlessTestSessionTest extends SpanWriterTest {
2020

21-
def "test tags are populated correctly in span"() {
22-
setup:
23-
def session = givenAHeadlessTestSession()
24-
25-
when:
26-
session.end(null)
27-
28-
then:
29-
ListWriterAssert.assertTraces(TEST_WRITER, 1, false, {
30-
trace(1) {
31-
span(0) {
32-
spanType DDSpanTypes.TEST_SESSION_END
33-
tags(false) {
34-
"$Tags.TEST_TEST_MANAGEMENT_ENABLED" true
35-
}
36-
}
37-
}
38-
})
39-
}
40-
41-
42-
private HeadlessTestSession givenAHeadlessTestSession() {
43-
def executionSettings = Stub(ExecutionSettings)
44-
executionSettings.getTestManagementSettings() >> new TestManagementSettings(true, 10)
45-
46-
def executionStrategy = new ExecutionStrategy(Stub(Config), executionSettings, Stub(SourcePathResolver), Stub(LinesResolver))
47-
48-
new HeadlessTestSession(
49-
"project-name",
50-
null,
51-
Provider.UNSUPPORTED,
52-
Stub(Config),
53-
Stub(CiVisibilityMetricCollector),
54-
Stub(TestDecorator),
55-
Stub(SourcePathResolver),
56-
Stub(Codeowners),
57-
Stub(LinesResolver),
58-
Stub(CoverageStore.Factory),
59-
executionStrategy
60-
)
61-
}
21+
def "test tags are populated correctly in span"() {
22+
setup:
23+
def session = givenAHeadlessTestSession()
24+
25+
when:
26+
session.end(null)
27+
28+
then:
29+
ListWriterAssert.assertTraces(TEST_WRITER, 1, false, {
30+
trace(1) {
31+
span(0) {
32+
spanType DDSpanTypes.TEST_SESSION_END
33+
tags(false) {
34+
"$Tags.TEST_TEST_MANAGEMENT_ENABLED" true
35+
}
36+
}
37+
}
38+
})
39+
}
40+
41+
42+
private HeadlessTestSession givenAHeadlessTestSession() {
43+
def executionSettings = Stub(ExecutionSettings)
44+
executionSettings.getTestManagementSettings() >> new TestManagementSettings(true, 10)
45+
46+
def executionStrategy = new ExecutionStrategy(Stub(Config), executionSettings, Stub(SourcePathResolver), Stub(LinesResolver))
47+
48+
new HeadlessTestSession(
49+
"project-name",
50+
null,
51+
Provider.UNSUPPORTED,
52+
Stub(Config),
53+
Stub(CiVisibilityMetricCollector),
54+
Stub(TestDecorator),
55+
Stub(SourcePathResolver),
56+
Stub(Codeowners),
57+
Stub(LinesResolver),
58+
Stub(CoverageStore.Factory),
59+
executionStrategy
60+
)
61+
}
6262
}

‎dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public final class CiVisibilityConfig {
7878
"civisibility.remote.env.vars.provider.key";
7979
public static final String CIVISIBILITY_TEST_ORDER = "civisibility.test.order";
8080
public static final String TEST_MANAGEMENT_ENABLED = "test.management.enabled";
81-
public static final String TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES = "test.management.attempt.to.fix.retries";
81+
public static final String TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES =
82+
"test.management.attempt.to.fix.retries";
8283

8384
/* COVERAGE SETTINGS */
8485
public static final String CIVISIBILITY_CODE_COVERAGE_ENABLED =

0 commit comments

Comments
 (0)