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

Get rid of duplicated random ascii generation

This commit is contained in:
Isabel Drost-Fromm 2016-04-28 15:07:55 +02:00
parent 47fefdd273
commit 8dc0610eaa
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java
View File

@ -48,7 +48,9 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder
} }
if (randomBoolean()) { if (randomBoolean()) {
builder.unmappedType(RandomSortDataGenerator.randomAscii(builder.unmappedType())); builder.unmappedType(ESTestCase.randomValueOtherThan(
builder.unmappedType(),
() -> ESTestCase.randomAsciiOfLengthBetween(1, 10)));
} }
if (randomBoolean()) { if (randomBoolean()) {
@ -60,7 +62,9 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder
} }
if (randomBoolean()) { if (randomBoolean()) {
builder.setNestedPath(RandomSortDataGenerator.randomAscii(builder.getNestedPath())); builder.setNestedPath(ESTestCase.randomValueOtherThan(
builder.getNestedPath(),
() -> ESTestCase.randomAsciiOfLengthBetween(1, 10)));
} }
return builder; return builder;
@ -72,7 +76,9 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder
int parameter = randomIntBetween(0, 5); int parameter = randomIntBetween(0, 5);
switch (parameter) { switch (parameter) {
case 0: case 0:
mutated.setNestedPath(RandomSortDataGenerator.randomAscii(mutated.getNestedPath())); mutated.setNestedPath(ESTestCase.randomValueOtherThan(
mutated.getNestedPath(),
() -> ESTestCase.randomAsciiOfLengthBetween(1, 10)));
break; break;
case 1: case 1:
mutated.setNestedFilter(RandomSortDataGenerator.nestedFilter(mutated.getNestedFilter())); mutated.setNestedFilter(RandomSortDataGenerator.nestedFilter(mutated.getNestedFilter()));
@ -81,7 +87,9 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder
mutated.sortMode(ESTestCase.randomValueOtherThan(mutated.sortMode(), () -> randomFrom(SortMode.values()))); mutated.sortMode(ESTestCase.randomValueOtherThan(mutated.sortMode(), () -> randomFrom(SortMode.values())));
break; break;
case 3: case 3:
mutated.unmappedType(RandomSortDataGenerator.randomAscii(mutated.unmappedType())); mutated.unmappedType(ESTestCase.randomValueOtherThan(
mutated.unmappedType(),
() -> ESTestCase.randomAsciiOfLengthBetween(1, 10)));
break; break;
case 4: case 4:
mutated.missing(RandomSortDataGenerator.missing(mutated.missing())); mutated.missing(RandomSortDataGenerator.missing(mutated.missing()));

10
core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java
View File

@ -35,6 +35,7 @@ import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper; import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.query.QueryParseContext;
import org.elasticsearch.indices.query.IndicesQueriesRegistry; import org.elasticsearch.indices.query.IndicesQueriesRegistry;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.geo.RandomGeoGenerator; import org.elasticsearch.test.geo.RandomGeoGenerator;
import java.io.IOException; import java.io.IOException;
@ -91,7 +92,10 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc
result.setNestedFilter(RandomSortDataGenerator.nestedFilter(result.getNestedFilter())); result.setNestedFilter(RandomSortDataGenerator.nestedFilter(result.getNestedFilter()));
} }
if (randomBoolean()) { if (randomBoolean()) {
result.setNestedPath(RandomSortDataGenerator.randomAscii(result.getNestedPath())); result.setNestedPath(
ESTestCase.randomValueOtherThan(
result.getNestedPath(),
() -> ESTestCase.randomAsciiOfLengthBetween(1, 10)));
} }
if (randomBoolean()) { if (randomBoolean()) {
result.coerce(! result.coerce()); result.coerce(! result.coerce());
@ -176,7 +180,9 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc
result.setNestedFilter(RandomSortDataGenerator.nestedFilter(original.getNestedFilter())); result.setNestedFilter(RandomSortDataGenerator.nestedFilter(original.getNestedFilter()));
break; break;
case 7: case 7:
result.setNestedPath(RandomSortDataGenerator.randomAscii(original.getNestedPath())); result.setNestedPath(ESTestCase.randomValueOtherThan(
result.getNestedPath(),
() -> ESTestCase.randomAsciiOfLengthBetween(1, 10)));
break; break;
case 8: case 8:
result.coerce(! original.coerce()); result.coerce(! original.coerce());

8
core/src/test/java/org/elasticsearch/search/sort/RandomSortDataGenerator.java
View File

@ -55,14 +55,6 @@ public class RandomSortDataGenerator {
return nested; return nested;
} }
public static String randomAscii(String original) {
String nestedPath = ESTestCase.randomAsciiOfLengthBetween(1, 10);
while (nestedPath.equals(original)) {
nestedPath = ESTestCase.randomAsciiOfLengthBetween(1, 10);
}
return nestedPath;
}
public static Object missing(Object original) { public static Object missing(Object original) {
Object missing = null; Object missing = null;
Object otherMissing = original; Object otherMissing = original;

4
core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java
View File

@ -66,7 +66,9 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild
builder.setNestedFilter(RandomSortDataGenerator.nestedFilter(builder.getNestedFilter())); builder.setNestedFilter(RandomSortDataGenerator.nestedFilter(builder.getNestedFilter()));
} }
if (randomBoolean()) { if (randomBoolean()) {
builder.setNestedPath(RandomSortDataGenerator.randomAscii(builder.getNestedPath())); builder.setNestedPath(ESTestCase.randomValueOtherThan(
builder.getNestedPath(),
() -> ESTestCase.randomAsciiOfLengthBetween(1, 10)));
} }
return builder; return builder;
} }