Skip to content

Commit d189d17

Browse files
committed
Reworked tests into a proper module. This allows testing encapsulation properly.
1 parent 8507e2a commit d189d17

22 files changed

Lines changed: 55 additions & 42 deletions

randomizedtesting-jupiter/build.gradle

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,5 @@ test {
1010
useJUnitPlatform {
1111
excludeTags 'nested-integration-test'
1212
}
13-
14-
def argProvider = objects.newInstance(UnsafeMemoryAccessArgProvider)
15-
argProvider.launcher.set(javaLauncher)
16-
jvmArgumentProviders.add(argProvider)
17-
}
18-
19-
abstract class UnsafeMemoryAccessArgProvider implements CommandLineArgumentProvider {
20-
@Nested
21-
abstract Property<JavaLauncher> getLauncher()
22-
23-
@Override
24-
Iterable<String> asArguments() {
25-
launcher.get().metadata.languageVersion.asInt() >= 25
26-
? ["--sun-misc-unsafe-memory-access=deny"]
27-
: []
28-
}
13+
jvmArgs("-Dnet.bytebuddy.safe=true")
2914
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public String toString() {
4040
return "Randomized context [" + ("seedChain=" + getSeedChain() + ",") + "]";
4141
}
4242

43-
SeedChain getSeedChain() {
43+
public SeedChain getSeedChain() {
4444
ArrayList<Seed> seeds = new ArrayList<>();
4545
for (RandomizedContext c = this; c != null; c = c.getParent()) {
4646
seeds.add(c.seed);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private RandomizedContext getRandomizedContextFor(ExtensionContext extensionCont
207207
// exception handling and seed stack frame injection
208208
//
209209

210-
static final String AUGMENTED_SEED_CLASS = "__randomizedtesting.SeedChain";
210+
public static final String AUGMENTED_SEED_CLASS = "__randomizedtesting.SeedChain";
211211

212212
@Override
213213
public void handleTestExecutionException(ExtensionContext context, Throwable throwable)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public record SeedChain(List<Seed> seeds) {
1414
private static final SeedChain EMPTY = new SeedChain(List.of());
1515

16-
static SeedChain parse(String chain) {
16+
public static SeedChain parse(String chain) {
1717
return new SeedChain(
1818
Stream.of(chain.replaceAll("[\\[\\]]", "").split("[:]"))
1919
.map(v -> v.trim().toLowerCase(Locale.ROOT))

randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/jupiter/F001_RandomizedContextInjection.java renamed to randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/tests/F001_RandomizedContextInjection.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
package com.carrotsearch.randomizedtesting.jupiter;
1+
package com.carrotsearch.randomizedtesting.tests;
22

3-
import static com.carrotsearch.randomizedtesting.jupiter.infra.TestInfra.*;
3+
import static com.carrotsearch.randomizedtesting.tests.infra.TestInfra.*;
44
import static org.junit.platform.testkit.engine.EventConditions.*;
55

6-
import com.carrotsearch.randomizedtesting.jupiter.infra.IgnoreInStandaloneRuns;
6+
import com.carrotsearch.randomizedtesting.jupiter.Randomized;
7+
import com.carrotsearch.randomizedtesting.jupiter.RandomizedContext;
8+
import com.carrotsearch.randomizedtesting.jupiter.RandomizedContextSupplier;
9+
import com.carrotsearch.randomizedtesting.jupiter.SeedChain;
10+
import com.carrotsearch.randomizedtesting.tests.infra.IgnoreInStandaloneRuns;
711
import java.io.PrintWriter;
812
import java.util.stream.Collectors;
913
import java.util.stream.IntStream;

randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/jupiter/F001_RandomizedContextInjection.md renamed to randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/tests/F001_RandomizedContextInjection.md

File renamed without changes.

randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/jupiter/F002_SeedRecovery.java renamed to randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/tests/F002_SeedRecovery.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
package com.carrotsearch.randomizedtesting.jupiter;
1+
package com.carrotsearch.randomizedtesting.tests;
22

3-
import static com.carrotsearch.randomizedtesting.jupiter.infra.TestInfra.*;
3+
import static com.carrotsearch.randomizedtesting.tests.infra.TestInfra.*;
44
import static org.junit.platform.testkit.engine.EventConditions.*;
55
import static org.junit.platform.testkit.engine.TestExecutionResultConditions.*;
66

7-
import com.carrotsearch.randomizedtesting.jupiter.infra.IgnoreInStandaloneRuns;
7+
import com.carrotsearch.randomizedtesting.jupiter.Randomized;
8+
import com.carrotsearch.randomizedtesting.jupiter.RandomizedContext;
9+
import com.carrotsearch.randomizedtesting.jupiter.RandomizedContextSupplier;
10+
import com.carrotsearch.randomizedtesting.tests.infra.IgnoreInStandaloneRuns;
811
import java.util.stream.Stream;
912
import org.assertj.core.api.Assertions;
1013
import org.assertj.core.api.Condition;

randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/jupiter/F002_SeedRecovery.md renamed to randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/tests/F002_SeedRecovery.md

File renamed without changes.

randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/jupiter/F003_RandomInjection.java renamed to randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/tests/F003_RandomInjection.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package com.carrotsearch.randomizedtesting.jupiter;
1+
package com.carrotsearch.randomizedtesting.tests;
22

3-
import static com.carrotsearch.randomizedtesting.jupiter.infra.TestInfra.*;
3+
import static com.carrotsearch.randomizedtesting.tests.infra.TestInfra.*;
44
import static org.junit.platform.testkit.engine.EventConditions.*;
55

6-
import com.carrotsearch.randomizedtesting.jupiter.infra.IgnoreInStandaloneRuns;
6+
import com.carrotsearch.randomizedtesting.jupiter.Randomized;
7+
import com.carrotsearch.randomizedtesting.jupiter.RandomizedContextSupplier;
8+
import com.carrotsearch.randomizedtesting.tests.infra.IgnoreInStandaloneRuns;
79
import java.io.PrintWriter;
810
import java.util.Locale;
911
import java.util.Random;

randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/jupiter/F003_RandomInjection.md renamed to randomizedtesting-jupiter/src/test/java/com/carrotsearch/randomizedtesting/tests/F003_RandomInjection.md

File renamed without changes.

0 commit comments

Comments
 (0)