Skip to content

Fix incorrect switch cases in AggregationTests #88757

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
Jul 25, 2022
Merged

Fix incorrect switch cases in AggregationTests #88757

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 ...rg/elasticsearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ protected InternalAutoDateHistogram mutateInstance(InternalAutoDateHistogram ins
BucketInfo bucketInfo = instance.getBucketInfo();
Map<String, Object> metadata = instance.getMetadata();
long interval = instance.getBucketInnerInterval();
switch (between(0, 3)) {
switch (between(0, 4)) {
case 0 -> name += randomAlphaOfLength(5);
case 1 -> {
buckets = new ArrayList<>(buckets);
Expand Down
4 changes: 2 additions & 2 deletions ...st/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected Class<ParsedSignificantLongTerms> implementationClass() {
List<SignificantLongTerms.Bucket> buckets = longTerms.getBuckets();
SignificanceHeuristic significanceHeuristic = longTerms.significanceHeuristic;
Map<String, Object> metadata = longTerms.getMetadata();
switch (between(0, 5)) {
switch (between(0, 6)) {
case 0 -> name += randomAlphaOfLength(5);
case 1 -> requiredSize += between(1, 100);
case 2 -> minDocCount += between(1, 100);
Expand All @@ -102,7 +102,7 @@ protected Class<ParsedSignificantLongTerms> implementationClass() {
)
);
}
case 8 -> {
case 6 -> {
if (metadata == null) {
metadata = Maps.newMapWithExpectedSize(1);
} else {
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected Class<ParsedSignificantStringTerms> implementationClass() {
List<SignificantStringTerms.Bucket> buckets = stringTerms.getBuckets();
SignificanceHeuristic significanceHeuristic = stringTerms.significanceHeuristic;
Map<String, Object> metadata = stringTerms.getMetadata();
switch (between(0, 5)) {
switch (between(0, 6)) {
case 0 -> name += randomAlphaOfLength(5);
case 1 -> requiredSize += between(1, 100);
case 2 -> minDocCount += between(1, 100);
Expand All @@ -105,7 +105,7 @@ protected Class<ParsedSignificantStringTerms> implementationClass() {
)
);
}
case 8 -> {
case 6 -> {
if (metadata == null) {
metadata = Maps.newMapWithExpectedSize(1);
} else {
Expand Down
21 changes: 9 additions & 12 deletions server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalAvgTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,34 +108,31 @@ protected InternalAvg mutateInstance(InternalAvg instance) {
long count = instance.getCount();
DocValueFormat formatter = instance.getFormatter();
Map<String, Object> metadata = instance.getMetadata();
switch (between(0, 2)) {
case 0:
name += randomAlphaOfLength(5);
break;
case 1:
switch (between(0, 3)) {
case 0 -> name += randomAlphaOfLength(5);
case 1 -> {
if (Double.isFinite(sum)) {
sum += between(1, 100);
} else {
sum = between(1, 100);
}
break;
case 2:
}
case 2 -> {
if (Double.isFinite(count)) {
count += between(1, 100);
} else {
count = between(1, 100);
}
break;
case 3:
}
case 3 -> {
if (metadata == null) {
metadata = Maps.newMapWithExpectedSize(1);
} else {
metadata = new HashMap<>(instance.getMetadata());
}
metadata.put(randomAlphaOfLength(15), randomInt());
break;
default:
throw new AssertionError("Illegal randomisation branch");
}
default -> throw new AssertionError("Illegal randomisation branch");
}
return new InternalAvg(name, sum, count, formatter, metadata);
}
Expand Down
21 changes: 9 additions & 12 deletions ...src/test/java/org/elasticsearch/search/aggregations/metrics/InternalGeoCentroidTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,17 @@ protected InternalGeoCentroid mutateInstance(InternalGeoCentroid instance) {
GeoPoint centroid = instance.centroid();
long count = instance.count();
Map<String, Object> metadata = instance.getMetadata();
switch (between(0, 2)) {
case 0:
name += randomAlphaOfLength(5);
break;
case 1:
switch (between(0, 3)) {
case 0 -> name += randomAlphaOfLength(5);
case 1 -> {
count += between(1, 100);
if (centroid == null) {
// if the new count is > 0 then we need to make sure there is a
// centroid or the constructor will throw an exception
centroid = new GeoPoint(randomDoubleBetween(-90, 90, false), randomDoubleBetween(-180, 180, false));
}
break;
case 2:
}
case 2 -> {
if (centroid == null) {
centroid = new GeoPoint(randomDoubleBetween(-90, 90, false), randomDoubleBetween(-180, 180, false));
count = between(1, 100);
Expand All @@ -123,17 +121,16 @@ protected InternalGeoCentroid mutateInstance(InternalGeoCentroid instance) {
}
centroid = newCentroid;
}
break;
case 3:
}
case 3 -> {
if (metadata == null) {
metadata = Maps.newMapWithExpectedSize(1);
} else {
metadata = new HashMap<>(instance.getMetadata());
}
metadata.put(randomAlphaOfLength(15), randomInt());
break;
default:
throw new AssertionError("Illegal randomisation branch");
}
default -> throw new AssertionError("Illegal randomisation branch");
}
return new InternalGeoCentroid(name, centroid, count, metadata);
}
Expand Down
21 changes: 9 additions & 12 deletions ...src/test/java/org/elasticsearch/search/aggregations/metrics/InternalWeightedAvgTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,34 +74,31 @@ protected InternalWeightedAvg mutateInstance(InternalWeightedAvg instance) {
double weight = instance.getWeight();
DocValueFormat formatter = instance.getFormatter();
Map<String, Object> metadata = instance.getMetadata();
switch (between(0, 2)) {
case 0:
name += randomAlphaOfLength(5);
break;
case 1:
switch (between(0, 3)) {
case 0 -> name += randomAlphaOfLength(5);
case 1 -> {
if (Double.isFinite(sum)) {
sum += between(1, 100);
} else {
sum = between(1, 100);
}
break;
case 2:
}
case 2 -> {
if (Double.isFinite(weight)) {
weight += between(1, 100);
} else {
weight = between(1, 100);
}
break;
case 3:
}
case 3 -> {
if (metadata == null) {
metadata = Maps.newMapWithExpectedSize(1);
} else {
metadata = new HashMap<>(instance.getMetadata());
}
metadata.put(randomAlphaOfLength(15), randomInt());
break;
default:
throw new AssertionError("Illegal randomisation branch");
}
default -> throw new AssertionError("Illegal randomisation branch");
}
return new InternalWeightedAvg(name, sum, weight, formatter, metadata);
}
Expand Down
21 changes: 8 additions & 13 deletions ...src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalDerivativeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,25 @@ protected InternalDerivative mutateInstance(InternalDerivative instance) {
double normalizationFactor = instance.getNormalizationFactor();
DocValueFormat formatter = instance.formatter();
Map<String, Object> metadata = instance.getMetadata();
switch (between(0, 2)) {
case 0:
name += randomAlphaOfLength(5);
break;
case 1:
switch (between(0, 3)) {
case 0 -> name += randomAlphaOfLength(5);
case 1 -> {
if (Double.isFinite(value)) {
value += between(1, 100);
} else {
value = randomDoubleBetween(0, 100000, true);
}
break;
case 2:
normalizationFactor += between(1, 100);
break;
case 3:
}
case 2 -> normalizationFactor += between(1, 100);
case 3 -> {
if (metadata == null) {
metadata = Maps.newMapWithExpectedSize(1);
} else {
metadata = new HashMap<>(instance.getMetadata());
}
metadata.put(randomAlphaOfLength(15), randomInt());
break;
default:
throw new AssertionError("Illegal randomisation branch");
}
default -> throw new AssertionError("Illegal randomisation branch");
}
return new InternalDerivative(name, value, normalizationFactor, formatter, metadata);
}
Expand Down