Skip to content

Commit 6640b9e

Browse files
Avoid multiple seed calculation if none provided
1 parent 9d44812 commit 6640b9e

2 files changed

Lines changed: 41 additions & 6 deletions

File tree

‎build.gradle.kts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import com.github.stickerifier.stickerify.JlinkJavaLauncher
22
import com.github.stickerifier.stickerify.JlinkTask
3+
import com.github.stickerifier.stickerify.JunitSeedArgumentProvider
34
import io.spring.gradle.nullability.NullabilityOptions
45
import org.gradle.internal.buildconfiguration.DaemonJvmPropertiesConfigurator
56
import org.gradle.kotlin.dsl.support.serviceOf
@@ -86,14 +87,11 @@ tasks.test {
8687
events("started", "passed", "failed", "skipped")
8788
}
8889

89-
val seedProvider = providers.gradleProperty("junitSeed").orElse(providers.provider { System.nanoTime().toString() })
90-
jvmArgumentProviders.add(CommandLineArgumentProvider {
91-
val seed = seedProvider.get()
92-
listOf("-Djunit.jupiter.execution.order.random.seed=$seed")
93-
})
90+
val seedProvider = JunitSeedArgumentProvider(providers.gradleProperty("junitSeed"))
91+
jvmArgumentProviders.add(seedProvider)
9492

9593
doFirst {
96-
println("Test seed: ${seedProvider.get()}")
94+
println("Test seed: ${seedProvider.resolveSeed()}")
9795
}
9896
}
9997

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package com.github.stickerifier.stickerify;
2+
3+
import org.gradle.api.provider.Provider;
4+
import org.gradle.api.tasks.Input;
5+
import org.gradle.api.tasks.Optional;
6+
import org.gradle.process.CommandLineArgumentProvider;
7+
8+
import java.util.Collections;
9+
10+
public class JunitSeedArgumentProvider implements CommandLineArgumentProvider {
11+
12+
private final Provider<String> explicitSeed;
13+
private String resolvedSeed;
14+
15+
public JunitSeedArgumentProvider(Provider<String> explicitSeed) {
16+
this.explicitSeed = explicitSeed;
17+
}
18+
19+
@Input
20+
@Optional
21+
public Provider<String> getExplicitSeed() {
22+
return explicitSeed;
23+
}
24+
25+
public synchronized String resolveSeed() {
26+
if (resolvedSeed == null) {
27+
resolvedSeed = explicitSeed.getOrElse(String.valueOf(System.nanoTime()));
28+
}
29+
return resolvedSeed;
30+
}
31+
32+
@Override
33+
public Iterable<String> asArguments() {
34+
return Collections.singletonList("-Djunit.jupiter.execution.order.random.seed=" + resolveSeed());
35+
}
36+
37+
}

0 commit comments

Comments
 (0)