Skip to content

Commit 60058b9

Browse files
committed
Rely on auto detection of test framework in test suites
1 parent e303cf1 commit 60058b9

File tree

3 files changed

+0
-3
lines changed

3 files changed

+0
-3
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public void apply(Project project) {
6565
buildParams = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class);
6666
project.getPluginManager().apply(JvmTestSuitePlugin.class);
6767
TestingExtension testing = project.getExtensions().getByType(TestingExtension.class);
68-
testing.getSuites().withType(JvmTestSuite.class).configureEach(suite -> { suite.useJUnit(); });
6968
// common repositories setup
7069
project.getPluginManager().apply(RepositoriesSetupPlugin.class);
7170
project.getPluginManager().apply(ElasticsearchTestBasePlugin.class);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/InternalJavaRestTestPlugin.java

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public void apply(Project project) {
3030
TestingExtension testing = project.getExtensions().getByType(TestingExtension.class);
3131
testing.getSuites().registerBinding(JavaRestTestSuite.class, DefaultJavaRestTestSuite.class);
3232
testing.getSuites().register(SOURCE_SET_NAME, JavaRestTestSuite.class, suite -> {
33-
suite.useJUnit();
3433
configureJavaRestSources(project, suite.getSources());
3534
if (project.findProject(":test:test-clusters") != null) {
3635
suite.getDependencies().getImplementation().add(suite.getDependencies().project(":test:test-clusters"));

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/InternalYamlRestTestPlugin.java

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public void apply(Project project) {
3131
TestingExtension testing = project.getExtensions().getByType(TestingExtension.class);
3232
testing.getSuites().registerBinding(YamlRestTestSuite.class, DefaultYamlRestTestSuite.class);
3333
testing.getSuites().register(SOURCE_SET_NAME, YamlRestTestSuite.class, suite -> {
34-
suite.useJUnit();
3534
configureYamlSourceSet(project, suite.getSources());
3635
});
3736
}

0 commit comments

Comments
 (0)