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

[TEST] Fixed ActionNamesTests to not use random action names that conflict with existing ones 

ActionNamesTests#testIncomingAction rarely uses a random action name to make sure that actions registered via plugins work properly. In some cases the random action would conflict with existing one (e.g. tv) and make the test fail. Fixed also testOutgoingAction although the probability of conflict there is way lower due to longer action names used from 1.4 on.
This commit is contained in:
javanna 2014-09-16 10:22:16 +02:00 committed by Luca Cavanna
parent fbf2c3f9f7
commit 38f5aa2248
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/java/org/elasticsearch/transport/ActionNamesTests.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.transport;
import com.google.common.collect.Lists;
import org.elasticsearch.Version;
import org.elasticsearch.action.admin.indices.get.GetIndexAction;
import org.elasticsearch.action.bench.AbortBenchmarkAction;
@ -29,8 +30,7 @@ import org.elasticsearch.action.exists.ExistsAction;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.HashSet;
import java.util.Set;
import java.util.*;
import static org.hamcrest.CoreMatchers.*;
@ -66,14 +66,17 @@ public class ActionNamesTests extends ElasticsearchIntegrationTest {
@Test
public void testOutgoingAction() {
TransportService transportService = internalCluster().getInstance(TransportService.class);
String[] actions = transportService.serverHandlers.keySet().toArray(new String[transportService.serverHandlers.keySet().size()]);
List<String> actions = Lists.newArrayList(transportService.serverHandlers.keySet());
int iters = iterations(10, 100);
for (int i = 0; i < iters; i++) {
//we rarely use a custom action since plugins might inject their own actions
boolean customAction = rarely();
String action;
if (customAction) {
action = randomAsciiOfLength(randomInt(30));
do {
action = randomAsciiOfLength(randomInt(30));
} while(actions.contains(action));
} else {
action = randomFrom(actions);
}
@ -91,17 +94,20 @@ public class ActionNamesTests extends ElasticsearchIntegrationTest {
@Test
public void testIncomingAction() {
String[] pre_1_4_names = ActionNames.ACTION_NAMES.inverse().keySet().toArray(new String[ActionNames.ACTION_NAMES.inverse().keySet().size()]);
List<String> pre_1_4_names = Lists.newArrayList(ActionNames.ACTION_NAMES.inverse().keySet());
TransportService transportService = internalCluster().getInstance(TransportService.class);
String[] actions = transportService.serverHandlers.keySet().toArray(new String[transportService.serverHandlers.keySet().size()]);
List<String> actions = Lists.newArrayList(transportService.serverHandlers.keySet());
Version version = randomVersion();
int iters = iterations(10, 100);
for (int i = 0; i < iters; i++) {
//we rarely use a custom action since plugins might inject their own actions
boolean customAction = rarely();
String action;
if (customAction) {
action = randomAsciiOfLength(randomInt(30));
do {
action = randomAsciiOfLength(randomInt(30));
} while(pre_1_4_names.contains(action));
} else {
if (version.before(Version.V_1_4_0_Beta)) {
action = randomFrom(pre_1_4_names);