Skip to content

Commit

Permalink
[7.7] Convert RestIntegTestTask to Java (elastic#54528) (elastic#54748)
Browse files Browse the repository at this point in the history
This commit migrates the RestIntegTestTask from groovy to Java.
No changes to logic should be included, however the following changes
are needed:

* Move Fixture interface to Java (Java can not depend on Groovy classes)
* Support lazy evaluation of non-input System parameters (can not use Groovy strings)
* Use constants for system property names
* Remove dead System property pass through code (the build plugin does this already)
  • Loading branch information
jakelandis authored Apr 3, 2020
1 parent 1ad9af5 commit ba17dd1
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 100 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@

import java.util.LinkedHashMap;
import java.util.Map;
import java.util.function.Supplier;
import java.util.stream.Collectors;

public class SystemPropertyCommandLineArgumentProvider implements CommandLineArgumentProvider {
private final Map<String, Object> systemProperties = new LinkedHashMap<>();

public void systemProperty(String key, Supplier<String> value) {
systemProperties.put(key, value);
}

public void systemProperty(String key, Object value) {
systemProperties.put(key, value);
}
Expand All @@ -18,7 +23,12 @@ public void systemProperty(String key, Object value) {
public Iterable<String> asArguments() {
return systemProperties.entrySet()
.stream()
.map(entry -> "-D" + entry.getKey() + "=" + entry.getValue())
.map(
entry -> "-D"
+ entry.getKey()
+ "="
+ (entry.getValue() instanceof Supplier ? ((Supplier) entry.getValue()).get() : entry.getValue())
)
.collect(Collectors.toList());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.gradle.test

package org.elasticsearch.gradle.test;

/**
* Any object that can produce an accompanying stop task, meant to tear down
Expand All @@ -25,6 +26,6 @@
public interface Fixture {

/** A task which will stop this fixture. This should be used as a finalizedBy for any tasks that use the fixture. */
public Object getStopTask()
Object getStopTask();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.elasticsearch.gradle.test;

import org.elasticsearch.gradle.SystemPropertyCommandLineArgumentProvider;
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster;
import org.elasticsearch.gradle.testclusters.RestTestRunnerTask;
import org.elasticsearch.gradle.testclusters.TestClustersPlugin;
import org.gradle.api.Action;
import org.gradle.api.DefaultTask;
import org.gradle.api.NamedDomainObjectContainer;
import org.gradle.api.Project;
import org.gradle.api.Task;

public class RestIntegTestTask extends DefaultTask {

protected RestTestRunnerTask runner;
private static final String TESTS_REST_CLUSTER = "tests.rest.cluster";
private static final String TESTS_CLUSTER = "tests.cluster";
private static final String TESTS_CLUSTER_NAME = "tests.clustername";

public RestIntegTestTask() {
Project project = getProject();
String name = getName();
runner = project.getTasks().create(name + "Runner", RestTestRunnerTask.class);
super.dependsOn(runner);
@SuppressWarnings("unchecked")
NamedDomainObjectContainer<ElasticsearchCluster> testClusters = (NamedDomainObjectContainer<ElasticsearchCluster>) project
.getExtensions()
.getByName(TestClustersPlugin.EXTENSION_NAME);
ElasticsearchCluster cluster = testClusters.create(name);
runner.useCluster(cluster);
runner.include("**/*IT.class");
runner.systemProperty("tests.rest.load_packaged", Boolean.FALSE.toString());
if (System.getProperty(TESTS_REST_CLUSTER) == null) {
if (System.getProperty(TESTS_CLUSTER) != null || System.getProperty(TESTS_CLUSTER_NAME) != null) {
throw new IllegalArgumentException(
String.format("%s, %s, and %s must all be null or non-null", TESTS_REST_CLUSTER, TESTS_CLUSTER, TESTS_CLUSTER_NAME)
);
}
SystemPropertyCommandLineArgumentProvider runnerNonInputProperties = (SystemPropertyCommandLineArgumentProvider) runner
.getExtensions()
.getByName("nonInputProperties");
runnerNonInputProperties.systemProperty(TESTS_REST_CLUSTER, () -> String.join(",", cluster.getAllHttpSocketURI()));
runnerNonInputProperties.systemProperty(TESTS_CLUSTER, () -> String.join(",", cluster.getAllTransportPortURI()));
runnerNonInputProperties.systemProperty(TESTS_CLUSTER_NAME, cluster::getName);
} else {
if (System.getProperty(TESTS_CLUSTER) == null || System.getProperty(TESTS_CLUSTER_NAME) == null) {
throw new IllegalArgumentException(
String.format("%s, %s, and %s must all be null or non-null", TESTS_REST_CLUSTER, TESTS_CLUSTER, TESTS_CLUSTER_NAME)
);
}
}
// this must run after all projects have been configured, so we know any project
// references can be accessed as a fully configured
project.getGradle().projectsEvaluated(x -> {
if (isEnabled() == false) {
runner.setEnabled(false);
}
});
}

@Override
public Task dependsOn(Object... dependencies) {
runner.dependsOn(dependencies);
for (Object dependency : dependencies) {
if (dependency instanceof Fixture) {
runner.finalizedBy(((Fixture) dependency).getStopTask());
}
}
return this;
}

@Override
public void setDependsOn(Iterable<?> dependencies) {
runner.setDependsOn(dependencies);
for (Object dependency : dependencies) {
if (dependency instanceof Fixture) {
runner.finalizedBy(((Fixture) dependency).getStopTask());
}
}
}

public void runner(Action<? super RestTestRunnerTask> configure) {
configure.execute(runner);
}
}

0 comments on commit ba17dd1

Please sign in to comment.