Skip to content

Commit 5328e2b

Browse files
Implement tests reordering for TestNG (#8467)
1 parent 72fbf84 commit 5328e2b

File tree

19 files changed

+307
-152
lines changed

19 files changed

+307
-152
lines changed

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ TestSuiteImpl testSuiteStart(
2525
* @return {@code true} if the test is new, {@code false} if it is an existing test <b>or if the
2626
* list of known tests is not available</b>.
2727
*/
28-
boolean isNew(TestIdentifier test);
28+
boolean isNew(@Nonnull TestIdentifier test);
2929

30-
boolean isFlaky(TestIdentifier test);
30+
boolean isFlaky(@Nonnull TestIdentifier test);
3131

3232
boolean isModified(TestSourceData testSourceData);
3333

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import java.util.Collection;
4747
import java.util.Collections;
4848
import java.util.function.Consumer;
49+
import javax.annotation.Nonnull;
4950
import javax.annotation.Nullable;
5051
import org.slf4j.Logger;
5152
import org.slf4j.LoggerFactory;
@@ -190,6 +191,7 @@ private void populateSourceDataTags(
190191
}
191192
}
192193

194+
@Nonnull
193195
public TestIdentifier getIdentifier() {
194196
return identifier;
195197
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ public ProxyTestModule(
9090
}
9191

9292
@Override
93-
public boolean isNew(TestIdentifier test) {
93+
public boolean isNew(@Nonnull TestIdentifier test) {
9494
return executionStrategy.isNew(test);
9595
}
9696

9797
@Override
98-
public boolean isFlaky(TestIdentifier test) {
98+
public boolean isFlaky(@Nonnull TestIdentifier test) {
9999
return executionStrategy.isFlaky(test);
100100
}
101101

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ public HeadlessTestModule(
7575
}
7676

7777
@Override
78-
public boolean isNew(TestIdentifier test) {
78+
public boolean isNew(@Nonnull TestIdentifier test) {
7979
return executionStrategy.isNew(test);
8080
}
8181

8282
@Override
83-
public boolean isFlaky(TestIdentifier test) {
83+
public boolean isFlaky(@Nonnull TestIdentifier test) {
8484
return executionStrategy.isFlaky(test);
8585
}
8686

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ public TestExecutionPolicy executionPolicy(TestIdentifier test, TestSourceData s
105105
}
106106

107107
@Override
108-
public boolean isNew(TestIdentifier test) {
108+
public boolean isNew(@Nonnull TestIdentifier test) {
109109
return false;
110110
}
111111

112112
@Override
113-
public boolean isFlaky(TestIdentifier test) {
113+
public boolean isFlaky(@Nonnull TestIdentifier test) {
114114
return false;
115115
}
116116

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ public TestExecutionPolicy executionPolicy(TestIdentifier test, TestSourceData t
300300
}
301301

302302
@Override
303-
public boolean isNew(TestIdentifier test) {
303+
public boolean isNew(@Nonnull TestIdentifier test) {
304304
return testModule.isNew(test);
305305
}
306306

307307
@Override
308-
public boolean isFlaky(TestIdentifier test) {
308+
public boolean isFlaky(@Nonnull TestIdentifier test) {
309309
return testModule.isFlaky(test);
310310
}
311311

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public ExecutionSettings getExecutionSettings() {
5353
return executionSettings;
5454
}
5555

56-
public boolean isNew(TestIdentifier test) {
56+
public boolean isNew(@Nonnull TestIdentifier test) {
5757
return executionSettings.isKnownTestsDataAvailable()
5858
&& !executionSettings.isKnown(test.toFQN());
5959
}
6060

61-
public boolean isFlaky(TestIdentifier test) {
61+
public boolean isFlaky(@Nonnull TestIdentifier test) {
6262
return executionSettings.isFlaky(test.toFQN());
6363
}
6464

@@ -163,7 +163,7 @@ private boolean isAutoRetryApplicable(TestIdentifier test) {
163163
&& autoRetriesUsed.get() < config.getCiVisibilityTotalFlakyRetryCount();
164164
}
165165

166-
private boolean isEFDApplicable(TestIdentifier test, TestSourceData testSource) {
166+
private boolean isEFDApplicable(@Nonnull TestIdentifier test, TestSourceData testSource) {
167167
EarlyFlakeDetectionSettings efdSettings = executionSettings.getEarlyFlakeDetectionSettings();
168168
return efdSettings.isEnabled()
169169
&& !isEFDLimitReached()

0 commit comments

Comments
 (0)