Skip to content

Commit

Permalink
Update references to renamed Gradle task (#1508)
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-vieira committed Aug 6, 2020
1 parent 81362fc commit 12316b8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import org.elasticsearch.gradle.info.BuildParams
import org.elasticsearch.gradle.precommit.DependencyLicensesTask
import org.elasticsearch.gradle.precommit.LicenseHeadersTask
import org.elasticsearch.gradle.precommit.UpdateShasTask
import org.elasticsearch.gradle.testclusters.RestTestRunnerTask
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.Task
Expand Down Expand Up @@ -493,7 +493,7 @@ class BuildPlugin implements Plugin<Project> {
itestJar.from(project.sourceSets.itest.output)
}

Test integrationTest = project.tasks.create('integrationTest', RestTestRunnerTask.class)
Test integrationTest = project.tasks.create('integrationTest', StandaloneRestIntegTestTask.class)
integrationTest.dependsOn(itestJar)

itestJar.configure { Jar jar ->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.elasticsearch.hadoop.gradle.fixture

import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
import org.elasticsearch.gradle.testclusters.RestTestRunnerTask
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
import org.elasticsearch.gradle.testclusters.TestClustersPlugin
import org.elasticsearch.gradle.testclusters.TestDistribution
import org.gradle.api.NamedDomainObjectContainer
Expand Down Expand Up @@ -30,7 +30,7 @@ class ElasticsearchFixturePlugin implements Plugin<Project> {
def hasLocalRepo = project.hasProperty("localRepo")
def useFixture = !hasLocalRepo && Boolean.parseBoolean(project.findProperty("tests.fixture.es.enable") ?: "true")

def integrationTestTask = project.tasks.getByName("integrationTest") as RestTestRunnerTask
def integrationTestTask = project.tasks.getByName("integrationTest") as StandaloneRestIntegTestTask
if (useFixture) {
// Depends on project already containing an "integrationTest"
// task, as well as javaHome+runtimeJavaHome configured
Expand All @@ -40,7 +40,7 @@ class ElasticsearchFixturePlugin implements Plugin<Project> {
}
}

private static void createClusterFor(RestTestRunnerTask integrationTest, Project project, String version) {
private static void createClusterFor(StandaloneRestIntegTestTask integrationTest, Project project, String version) {
def clustersContainer = project.extensions.getByName(TestClustersPlugin.EXTENSION_NAME) as NamedDomainObjectContainer<ElasticsearchCluster>
def integTestCluster = clustersContainer.create("integTest") { ElasticsearchCluster cluster ->
cluster.version = version
Expand Down

0 comments on commit 12316b8

Please sign in to comment.