File tree Expand file tree Collapse file tree 2 files changed +0
-21
lines changed
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest Expand file tree Collapse file tree 2 files changed +0
-21
lines changed Original file line number Diff line number Diff line change 1010package org .elasticsearch .gradle .internal .test .rest ;
1111
1212import org .elasticsearch .gradle .util .GradleUtils ;
13- import org .gradle .api .Action ;
1413import org .gradle .api .Plugin ;
1514import org .gradle .api .Project ;
16- import org .gradle .api .plugins .JavaBasePlugin ;
17- import org .gradle .api .plugins .jvm .JvmTestSuiteTarget ;
1815import org .gradle .api .tasks .SourceSet ;
1916import org .gradle .testing .base .TestingExtension ;
2017
@@ -30,7 +27,6 @@ public class InternalJavaRestTestPlugin implements Plugin<Project> {
3027 @ Override
3128 public void apply (Project project ) {
3229 project .getPluginManager ().apply (RestTestBasePlugin .class );
33-
3430 TestingExtension testing = project .getExtensions ().getByType (TestingExtension .class );
3531 testing .getSuites ().registerBinding (JavaRestTestSuite .class , DefaultJavaRestTestSuite .class );
3632 testing .getSuites ().register (SOURCE_SET_NAME , JavaRestTestSuite .class , suite -> {
@@ -39,13 +35,6 @@ public void apply(Project project) {
3935 if (project .findProject (":test:test-clusters" ) != null ) {
4036 suite .getDependencies ().getImplementation ().add (suite .getDependencies ().project (":test:test-clusters" ));
4137 }
42- suite .getTargets ()
43- .all (
44- (Action <JvmTestSuiteTarget >) jvmTestSuiteTarget -> jvmTestSuiteTarget .getTestTask ()
45- .configure (
46- test -> project .getTasks ().named (JavaBasePlugin .CHECK_TASK_NAME ).configure (check -> check .dependsOn (test ))
47- )
48- );
4938 });
5039
5140 }
Original file line number Diff line number Diff line change 1010package org .elasticsearch .gradle .internal .test .rest ;
1111
1212import org .elasticsearch .gradle .util .GradleUtils ;
13- import org .gradle .api .Action ;
1413import org .gradle .api .Plugin ;
1514import org .gradle .api .Project ;
16- import org .gradle .api .plugins .JavaBasePlugin ;
17- import org .gradle .api .plugins .jvm .JvmTestSuiteTarget ;
1815import org .gradle .api .tasks .SourceSet ;
1916import org .gradle .testing .base .TestingExtension ;
2017
@@ -36,13 +33,6 @@ public void apply(Project project) {
3633 testing .getSuites ().register (SOURCE_SET_NAME , YamlRestTestSuite .class , suite -> {
3734 suite .useJUnit ();
3835 configureYamlSourceSet (project , suite .getSources ());
39- suite .getTargets ()
40- .all (
41- (Action <JvmTestSuiteTarget >) jvmTestSuiteTarget -> jvmTestSuiteTarget .getTestTask ()
42- .configure (
43- test -> project .getTasks ().named (JavaBasePlugin .CHECK_TASK_NAME ).configure (check -> check .dependsOn (test ))
44- )
45- );
4636 });
4737 }
4838
You can’t perform that action at this time.
0 commit comments