[7.x] Convert most OSS plugins from integTest to [yaml | java]RestTest or internalClusterTest (#59444)

buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestApiTask.java

@@ -198,7 +198,7 @@ private File getTestSourceResourceDir() {
             Set<File> resourceDir = testSources.getResources()
                 .getSrcDirs()
                 .stream()
-                .filter(f -> f.isDirectory() && f.getParentFile().getName().equals("test") && f.getName().equals("resources"))
+                .filter(f -> f.isDirectory() && f.getParentFile().getName().equals(getSourceSetName()) && f.getName().equals("resources"))
                 .collect(Collectors.toSet());
             assert resourceDir.size() <= 1;
             if (resourceDir.size() == 0) {

plugins/analysis-icu/build.gradle

@@ -18,15 +18,16 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   description 'The ICU Analysis plugin integrates the Lucene ICU module into Elasticsearch, adding ICU-related analysis components.'
   classname 'org.elasticsearch.plugin.analysis.icu.AnalysisICUPlugin'
   hasClientJar = true
 }
 
-tasks.withType(CheckForbiddenApis).configureEach {
+forbiddenApisMain {
   signatures += [
     "com.ibm.icu.text.Collator#getInstance() @ Don't use default locale, use getInstance(ULocale) instead"
   ]

plugins/analysis-kuromoji/build.gradle

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   description 'The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch.'
@@ -32,7 +32,6 @@ restResources {
     includeCore '_common', 'indices', 'index', 'search'
   }
 }
-
 tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }

plugins/analysis-nori/build.gradle

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   description 'The Korean (nori) Analysis plugin integrates Lucene nori analysis module into elasticsearch.'
@@ -32,6 +32,7 @@ restResources {
     includeCore '_common', 'indices', 'index', 'search'
   }
 }
+
 tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }

plugins/analysis-phonetic/build.gradle

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   description 'The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch.'

plugins/analysis-smartcn/build.gradle

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   description 'Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.'

plugins/analysis-stempel/build.gradle

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   description 'The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch.'

plugins/analysis-ukrainian/build.gradle

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   description 'The Ukrainian Analysis plugin integrates the Lucene UkrainianMorfologikAnalyzer into elasticsearch.'

plugins/examples/custom-settings/build.gradle

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   name 'custom-settings'
@@ -28,7 +27,8 @@ esplugin {
   noticeFile rootProject.file('NOTICE.txt')
 }
 
-testClusters.integTest {
+testClusters.all {
   // Adds a setting in the Elasticsearch keystore before running the integration tests
   keystore 'custom.secured', 'password'
 }
+

plugins/examples/custom-settings/src/test/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsClientYamlTestSuiteIT.java → plugins/examples/custom-settings/src/yamlRestTest/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsClientYamlTestSuiteIT.java

@@ -7,7 +7,7 @@
  * not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -26,11 +26,11 @@
 /**
  * {@link ExampleCustomSettingsClientYamlTestSuiteIT} executes the plugin's REST API integration tests.
  * <p>
- * The tests can be executed using the command: ./gradlew :example-plugins:custom-settings:check
+ * The tests can be executed using the command: ./gradlew :example-plugins:custom-settings:yamlRestTest
  * <p>
  * This class extends {@link ESClientYamlSuiteTestCase}, which takes care of parsing the YAML files
- * located in the src/test/resources/rest-api-spec/test/ directory and validates them against the
- * custom REST API definition files located in src/test/resources/rest-api-spec/api/.
+ * located in the src/yamlRestTest/resources/rest-api-spec/test/ directory and validates them against the
+ * custom REST API definition files located in src/yamlRestTest/resources/rest-api-spec/api/.
  * <p>
  * Once validated, {@link ESClientYamlSuiteTestCase} executes the REST tests against a single node
  * integration cluster which has the plugin already installed by the Gradle build script.

plugins/examples/custom-significance-heuristic/build.gradle

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   name 'custom-significance-heuristic'

plugins/examples/custom-suggester/build.gradle

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   name 'custom-suggester'
@@ -28,7 +27,7 @@ esplugin {
   noticeFile rootProject.file('NOTICE.txt')
 }
 
-testClusters.integTest {
+testClusters.all {
   numberOfNodes = 2
 }
 

plugins/examples/painless-whitelist/build.gradle

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   name 'painless-whitelist'
@@ -33,7 +32,7 @@ dependencies {
   compileOnly "org.elasticsearch.plugin:elasticsearch-scripting-painless-spi:${versions.elasticsearch}"
 }
 
-testClusters.integTest {
+testClusters.all {
   testDistribution = 'oss'
 }
 

plugins/examples/rescore/build.gradle

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   name 'example-rescore'
@@ -27,4 +26,3 @@ esplugin {
   licenseFile rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
   noticeFile rootProject.file('NOTICE.txt')
 }
-

plugins/examples/rest-handler/build.gradle

@@ -18,9 +18,9 @@ import org.elasticsearch.gradle.info.BuildParams
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
+apply plugin: 'elasticsearch.java-rest-test'
 
 esplugin {
   name 'rest-handler'
@@ -34,21 +34,16 @@ esplugin {
 test.enabled = false
 
 tasks.register("exampleFixture", org.elasticsearch.gradle.test.AntFixture) {
-  dependsOn testClasses
-  env 'CLASSPATH', "${-> project.sourceSets.test.runtimeClasspath.asPath}"
+  dependsOn sourceSets.javaRestTest.runtimeClasspath
+  env 'CLASSPATH', "${-> project.sourceSets.javaRestTest.runtimeClasspath.asPath}"
   executable = "${BuildParams.runtimeJavaHome}/bin/java"
   args 'org.elasticsearch.example.resthandler.ExampleFixture', baseDir, 'TEST'
 }
 
-integTest {
+javaRestTest {
   dependsOn exampleFixture
   runner {
     nonInputProperties.systemProperty 'external.address', "${-> exampleFixture.addressAndPort}"
   }
 }
 
-testingConventions.naming {
-  IT {
-    baseClass 'org.elasticsearch.test.ESTestCase'
-  }
-}

plugins/examples/rest-handler/src/test/java/org/elasticsearch/example/resthandler/ExampleRestHandlerClientYamlTestSuiteIT.java → plugins/examples/rest-handler/src/yamlRestTest/java/org/elasticsearch/example/resthandler/ExampleRestHandlerClientYamlTestSuiteIT.java

@@ -26,11 +26,11 @@
 /**
  * {@link ExampleRestHandlerClientYamlTestSuiteIT} executes the plugin's REST API integration tests.
  * <p>
- * The tests can be executed using the command: ./gradlew :example-plugins:rest-handler:check
+ * The tests can be executed using the command: ./gradlew :example-plugins:rest-handler:yamlRestTest
  * <p>
  * This class extends {@link ESClientYamlSuiteTestCase}, which takes care of parsing the YAML files
- * located in the src/test/resources/rest-api-spec/test/ directory and validates them against the
- * custom REST API definition files located in src/test/resources/rest-api-spec/api/.
+ * located in the src/yamlRestTest/resources/rest-api-spec/test/ directory and validates them against the
+ * custom REST API definition files located in src/yamlRestTest/resources/rest-api-spec/api/.
  * <p>
  * Once validated, {@link ESClientYamlSuiteTestCase} executes the REST tests against a single node
  * integration cluster which has the plugin already installed by the Gradle build script.

plugins/examples/script-expert-scoring/build.gradle

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   name 'script-expert-scoring'

plugins/examples/security-authorization-engine/build.gradle

@@ -1,6 +1,5 @@
-apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.java-rest-test'
 
 esplugin {
   name 'security-authorization-engine'
@@ -13,17 +12,21 @@ esplugin {
 
 dependencies {
   compileOnly "org.elasticsearch.plugin:x-pack-core:${versions.elasticsearch}"
-  testImplementation "org.elasticsearch.client:x-pack-transport:${versions.elasticsearch}"
+  javaRestTestImplementation "org.elasticsearch.client:x-pack-transport:${versions.elasticsearch}"
+  javaRestTestImplementation "org.elasticsearch.plugin:x-pack-core:${versions.elasticsearch}"
+  // let the javaRestTest see the classpath of main
+  javaRestTestImplementation project.sourceSets.main.runtimeClasspath
 }
-
-integTest {
+//no unit tests
+test.enabled = false
+javaRestTest {
   dependsOn buildZip
   runner {
     systemProperty 'tests.security.manager', 'false'
   }
 }
 
-testClusters.integTest {
+testClusters.javaRestTest {
   setting 'xpack.security.enabled', 'true'
   setting 'xpack.ml.enabled', 'false'
   setting 'xpack.license.self_generated.type', 'trial'
@@ -36,4 +39,3 @@ testClusters.integTest {
   user role: 'custom_superuser'
 }
 
-check.dependsOn integTest

plugins/ingest-attachment/build.gradle

@@ -18,7 +18,7 @@ import org.elasticsearch.gradle.info.BuildParams
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
 
 esplugin {
   description 'Ingest processor that uses Apache Tika to extract contents'

plugins/mapper-annotated-text/build.gradle

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   description 'The Mapper Annotated_text plugin adds support for text fields with markup used to inject annotation tokens into the index.'

plugins/mapper-murmur3/build.gradle

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   description 'The Mapper Murmur3 plugin allows to compute hashes of a field\'s values at index-time and to store them in the index.'
@@ -28,3 +29,5 @@ restResources {
     includeCore '_common', 'indices', 'index', 'search'
   }
 }
+// no unit tests
+test.enabled = false

plugins/mapper-size/build.gradle

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   description 'The Mapper Size plugin allows document to record their uncompressed size at index time.'
@@ -28,3 +29,5 @@ restResources {
     includeCore '_common', 'indices', 'index', 'get'
   }
 }
+// no unit tests
+test.enabled = false

plugins/store-smb/build.gradle

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.yaml-rest-test'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   description 'The Store SMB plugin adds support for SMB stores.'

plugins/transport-nio/build.gradle

@@ -19,13 +19,16 @@ import org.elasticsearch.gradle.info.BuildParams
  * under the License.
  */
 apply plugin: "elasticsearch.publish"
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   description 'The nio transport.'
   classname 'org.elasticsearch.transport.nio.NioTransportPlugin'
   hasClientJar = true
 }
 
+// integTest have been converted to internalClusterTest 
+integTest.enabled = false
 dependencies {
   api project(':libs:elasticsearch-nio')