honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use our standard xlint with standalone-test 

We were not changing the xlint settings there at all. Also cleans up some
generic array warnings that this found by switching them to an ArrayList.
This commit is contained in:
Nik Everett 2016-01-19 17:54:47 -05:00
parent 2249a640bb
commit 2cb7e8ce76
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/StandaloneTestPlugin.groovy
View File

@ -41,6 +41,7 @@ public class StandaloneTestPlugin implements Plugin<Project> {
] ]
RandomizedTestingTask test = project.tasks.create(testOptions) RandomizedTestingTask test = project.tasks.create(testOptions)
test.configure(BuildPlugin.commonTestConfig(project)) test.configure(BuildPlugin.commonTestConfig(project))
BuildPlugin.configureCompile(project)
test.classpath = project.sourceSets.test.runtimeClasspath test.classpath = project.sourceSets.test.runtimeClasspath
test.testClassesDir project.sourceSets.test.output.classesDir test.testClassesDir project.sourceSets.test.output.classesDir
test.mustRunAfter(project.precommit) test.mustRunAfter(project.precommit)

26
qa/evil-tests/src/test/java/org/elasticsearch/common/cli/CliToolTests.java
View File

@ -28,7 +28,9 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.node.internal.InternalSettingsPreparer; import org.elasticsearch.node.internal.InternalSettingsPreparer;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@ -115,9 +117,9 @@ public class CliToolTests extends CliToolTestCase {
public void testMultiCommand() { public void testMultiCommand() {
Terminal terminal = new MockTerminal(); Terminal terminal = new MockTerminal();
int count = randomIntBetween(2, 7); int count = randomIntBetween(2, 7);
final AtomicReference<Boolean>[] executed = new AtomicReference[count]; List<AtomicReference<Boolean>> executed = new ArrayList<>(count);
for (int i = 0; i < executed.length; i++) { for (int i = 0; i < executed.size(); i++) {
executed[i] = new AtomicReference<>(false); executed.add(new AtomicReference<>(false));
} }
NamedCommand[] cmds = new NamedCommand[count]; NamedCommand[] cmds = new NamedCommand[count];
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
@ -125,7 +127,7 @@ public class CliToolTests extends CliToolTestCase {
cmds[i] = new NamedCommand("cmd" + index, terminal) { cmds[i] = new NamedCommand("cmd" + index, terminal) {
@Override @Override
public CliTool.ExitStatus execute(Settings settings, Environment env) throws Exception { public CliTool.ExitStatus execute(Settings settings, Environment env) throws Exception {
executed[index].set(true); executed.get(index).set(true);
return OK; return OK;
} }
}; };
@ -134,17 +136,17 @@ public class CliToolTests extends CliToolTestCase {
int cmdIndex = randomIntBetween(0, count-1); int cmdIndex = randomIntBetween(0, count-1);
CliTool.ExitStatus status = tool.execute("cmd" + cmdIndex); CliTool.ExitStatus status = tool.execute("cmd" + cmdIndex);
assertThat(status, is(OK)); assertThat(status, is(OK));
for (int i = 0; i < executed.length; i++) { for (int i = 0; i < executed.size(); i++) {
assertThat(executed[i].get(), is(i == cmdIndex)); assertThat(executed.get(i).get(), is(i == cmdIndex));
} }
} }
public void testMultiCommandUnknownCommand() { public void testMultiCommandUnknownCommand() {
Terminal terminal = new MockTerminal(); Terminal terminal = new MockTerminal();
int count = randomIntBetween(2, 7); int count = randomIntBetween(2, 7);
final AtomicReference<Boolean>[] executed = new AtomicReference[count]; List<AtomicReference<Boolean>> executed = new ArrayList<>(count);
for (int i = 0; i < executed.length; i++) { for (int i = 0; i < executed.size(); i++) {
executed[i] = new AtomicReference<>(false); executed.add(new AtomicReference<>(false));
} }
NamedCommand[] cmds = new NamedCommand[count]; NamedCommand[] cmds = new NamedCommand[count];
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
@ -152,7 +154,7 @@ public class CliToolTests extends CliToolTestCase {
cmds[i] = new NamedCommand("cmd" + index, terminal) { cmds[i] = new NamedCommand("cmd" + index, terminal) {
@Override @Override
public CliTool.ExitStatus execute(Settings settings, Environment env) throws Exception { public CliTool.ExitStatus execute(Settings settings, Environment env) throws Exception {
executed[index].set(true); executed.get(index).set(true);
return OK; return OK;
} }
}; };
@ -160,8 +162,8 @@ public class CliToolTests extends CliToolTestCase {
MultiCmdTool tool = new MultiCmdTool("tool", terminal, cmds); MultiCmdTool tool = new MultiCmdTool("tool", terminal, cmds);
CliTool.ExitStatus status = tool.execute("cmd" + count); // "cmd" + count doesn't exist CliTool.ExitStatus status = tool.execute("cmd" + count); // "cmd" + count doesn't exist
assertThat(status, is(CliTool.ExitStatus.USAGE)); assertThat(status, is(CliTool.ExitStatus.USAGE));
for (int i = 0; i < executed.length; i++) { for (int i = 0; i < executed.size(); i++) {
assertThat(executed[i].get(), is(false)); assertThat(executed.get(i).get(), is(false));
} }
} }