Skip to content

Commit 6bb558f

Browse files
committed
Replace top level iteration class.
1 parent b70d779 commit 6bb558f

2 files changed

Lines changed: 30 additions & 7 deletions

File tree

  • randomizedtesting-jupiter/src

randomizedtesting-jupiter/src/main/java/com/carrotsearch/randomizedtesting/jupiter/RandomizedTestEngine.java

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.junit.platform.engine.TestEngine;
88
import org.junit.platform.engine.TestExecutionResult;
99
import org.junit.platform.engine.UniqueId;
10+
import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
1011
import org.junit.platform.engine.support.descriptor.EngineDescriptor;
1112

1213
/**
@@ -24,7 +25,7 @@ public class RandomizedTestEngine implements TestEngine {
2425
public static final String ENGINE_ID = "randomizedtesting-jupiter";
2526

2627
/** Configuration parameter controlling the number of test iterations. Default: {@code 1}. */
27-
public static final String ITERATIONS_PROPERTY = "tests.iterations";
28+
public static final String ITERATIONS_PROPERTY = "tests.iters";
2829

2930
private static final String JUPITER_ENGINE_ID = "junit-jupiter";
3031

@@ -42,32 +43,48 @@ public TestDescriptor discover(EngineDiscoveryRequest request, UniqueId uniqueId
4243
.getConfigurationParameters()
4344
.get(ITERATIONS_PROPERTY)
4445
.map(Integer::parseInt)
45-
.orElse(1);
46+
.orElse(0);
47+
48+
System.out.println(uniqueId);
4649

4750
var engineDescriptor = new EngineDescriptor(uniqueId, "Randomized Testing");
4851
for (int i = 1; i <= iterations; i++) {
49-
var iterationUniqueId = uniqueId.append("iteration", String.valueOf(i));
52+
var iterationUniqueId = uniqueId.append("seed", String.valueOf(i));
5053
var jupiterRootId = iterationUniqueId.append("engine", JUPITER_ENGINE_ID);
5154
var jupiterDescriptor = jupiterEngine.discover(request, jupiterRootId);
52-
var iterationDescriptor = new IterationDescriptor(iterationUniqueId, i);
55+
var iterationDescriptor = new TopSeedDescriptor(iterationUniqueId, i);
5356
iterationDescriptor.addChild(jupiterDescriptor);
5457
engineDescriptor.addChild(iterationDescriptor);
5558
}
5659
return engineDescriptor;
5760
}
5861

62+
public static class TopSeedDescriptor extends AbstractTestDescriptor {
63+
private final long seed;
64+
65+
public TopSeedDescriptor(UniqueId uniqueId, long seed) {
66+
super(uniqueId, "Seed #" + new Seed(seed));
67+
this.seed = seed;
68+
}
69+
70+
@Override
71+
public Type getType() {
72+
return Type.CONTAINER;
73+
}
74+
}
75+
5976
@Override
6077
public void execute(ExecutionRequest request) {
6178
var engineDescriptor = request.getRootTestDescriptor();
6279
var listener = request.getEngineExecutionListener();
6380
listener.executionStarted(engineDescriptor);
6481
for (var child : engineDescriptor.getChildren()) {
65-
executeIteration((IterationDescriptor) child, request);
82+
executeIteration((TopSeedDescriptor) child, request);
6683
}
6784
listener.executionFinished(engineDescriptor, TestExecutionResult.successful());
6885
}
6986

70-
private void executeIteration(IterationDescriptor iterationDescriptor, ExecutionRequest request) {
87+
private void executeIteration(TopSeedDescriptor iterationDescriptor, ExecutionRequest request) {
7188
var listener = request.getEngineExecutionListener();
7289
listener.executionStarted(iterationDescriptor);
7390
for (var jupiterDescriptor : iterationDescriptor.getChildren()) {

randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/jupiter/experiments/AdHoc.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22

33
import com.carrotsearch.randomizedtesting.jupiter.Randomized;
44
import com.carrotsearch.randomizedtesting.jupiter.RandomizedContext;
5+
import org.junit.jupiter.api.BeforeAll;
56
import org.junit.jupiter.api.Disabled;
67
import org.junit.jupiter.api.RepeatedTest;
78

89
public class AdHoc {
9-
@Disabled
10+
//@Disabled
1011
@Randomized
1112
public static class TestClass {
13+
@BeforeAll
14+
public static void foo() {
15+
System.out.println("Foo!");
16+
}
17+
1218
@RepeatedTest(10)
1319
public void testMethod(RandomizedContext ctx) {
1420
assert ctx.getRandom().nextBoolean();

0 commit comments

Comments
 (0)