Skip to content

[testclusters] Rename clsuterformation -> testclusters [part 3] #34299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2018
Merged

[testclusters] Rename clsuterformation -> testclusters [part 3] #34299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...formation/ElasticsearchConfiguration.java → ...tclusters/ElasticsearchConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.gradle.clusterformation;
package org.elasticsearch.gradle.testclusters;

import org.elasticsearch.gradle.Distribution;
import org.elasticsearch.gradle.Version;
Expand Down
2 changes: 1 addition & 1 deletion ...e/clusterformation/ElasticsearchNode.java → ...radle/testclusters/ElasticsearchNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.gradle.clusterformation;
package org.elasticsearch.gradle.testclusters;

import org.elasticsearch.GradleServicesAdapter;
import org.elasticsearch.gradle.Distribution;
Expand Down
6 changes: 3 additions & 3 deletions ...sterformation/ClusterformationPlugin.java → ...adle/testclusters/TestClustersPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.gradle.clusterformation;
package org.elasticsearch.gradle.testclusters;

import groovy.lang.Closure;
import org.elasticsearch.GradleServicesAdapter;
Expand All @@ -37,12 +37,12 @@
import java.util.List;
import java.util.Map;

public class ClusterformationPlugin implements Plugin<Project> {
public class TestClustersPlugin implements Plugin<Project> {

public static final String LIST_TASK_NAME = "listElasticSearchClusters";
public static final String EXTENSION_NAME = "elasticSearchClusters";

private final Logger logger = Logging.getLogger(ClusterformationPlugin.class);
private final Logger logger = Logging.getLogger(TestClustersPlugin.class);

@Override
public void apply(Project project) {
Expand Down
1 change: 0 additions & 1 deletion ...dSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.clusterformation.properties
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.testclusters.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implementation-class=org.elasticsearch.gradle.testclusters.TestClustersPlugin
18 changes: 9 additions & 9 deletions ...erformation/ClusterformationPluginIT.java → ...le/testclusters/TestClustersPluginIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.gradle.clusterformation;
package org.elasticsearch.gradle.testclusters;

import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
import org.gradle.testkit.runner.BuildResult;
Expand All @@ -26,11 +26,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

public class ClusterformationPluginIT extends GradleIntegrationTestCase {
public class TestClustersPluginIT extends GradleIntegrationTestCase {

public void testListClusters() {
BuildResult result = GradleRunner.create()
.withProjectDir(getProjectDir("clusterformation"))
.withProjectDir(getProjectDir("testclusters"))
.withArguments("listElasticSearchClusters", "-s")
.withPluginClasspath()
.build();
Expand All @@ -45,7 +45,7 @@ public void testListClusters() {

public void testUseClusterByOne() {
BuildResult result = GradleRunner.create()
.withProjectDir(getProjectDir("clusterformation"))
.withProjectDir(getProjectDir("testclusters"))
.withArguments("user1", "-s")
.withPluginClasspath()
.build();
Expand All @@ -60,7 +60,7 @@ public void testUseClusterByOne() {

public void testUseClusterByOneWithDryRun() {
BuildResult result = GradleRunner.create()
.withProjectDir(getProjectDir("clusterformation"))
.withProjectDir(getProjectDir("testclusters"))
.withArguments("user1", "-s", "--dry-run")
.withPluginClasspath()
.build();
Expand All @@ -75,7 +75,7 @@ public void testUseClusterByOneWithDryRun() {

public void testUseClusterByTwo() {
BuildResult result = GradleRunner.create()
.withProjectDir(getProjectDir("clusterformation"))
.withProjectDir(getProjectDir("testclusters"))
.withArguments("user1", "user2", "-s")
.withPluginClasspath()
.build();
Expand All @@ -92,7 +92,7 @@ public void testUseClusterByTwo() {

public void testUseClusterByUpToDateTask() {
BuildResult result = GradleRunner.create()
.withProjectDir(getProjectDir("clusterformation"))
.withProjectDir(getProjectDir("testclusters"))
.withArguments("upToDate1", "upToDate2", "-s")
.withPluginClasspath()
.build();
Expand All @@ -109,7 +109,7 @@ public void testUseClusterByUpToDateTask() {

public void testUseClusterBySkippedTask() {
BuildResult result = GradleRunner.create()
.withProjectDir(getProjectDir("clusterformation"))
.withProjectDir(getProjectDir("testclusters"))
.withArguments("skipped1", "skipped2", "-s")
.withPluginClasspath()
.build();
Expand All @@ -126,7 +126,7 @@ public void testUseClusterBySkippedTask() {

public void tetUseClusterBySkippedAndWorkingTask() {
BuildResult result = GradleRunner.create()
.withProjectDir(getProjectDir("clusterformation"))
.withProjectDir(getProjectDir("testclusters"))
.withArguments("skipped1", "user1", "-s")
.withPluginClasspath()
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/testKit/clusterformation/build.gradle → ...Src/src/testKit/testclusters/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'elasticsearch.clusterformation'
id 'elasticsearch.testclusters'
}

elasticSearchClusters {
Expand Down