Skip to content

Commit 213f5df

Browse files
committed
Simplify TestConfigPasses
1 parent 3470281 commit 213f5df

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ private void add(TestConfig config) {
458458
}
459459

460460
private void addPasses(DataType mainType, DataType lookupType) {
461-
add(new TestConfigPasses(mainType, lookupType, true));
461+
add(new TestConfigPasses(mainType, lookupType));
462462
}
463463

464464
private void addFails(DataType mainType, DataType lookupType) {
@@ -614,19 +614,15 @@ private static void validateIndex(String indexName, String fieldName, Object exp
614614
}
615615
}
616616

617-
private record TestConfigPasses(DataType mainType, DataType lookupType, boolean hasResults) implements TestConfig {
617+
private record TestConfigPasses(DataType mainType, DataType lookupType) implements TestConfig {
618618
@Override
619619
public void doTest() {
620620
String query = testQuery();
621621
try (var response = EsqlQueryRequestBuilder.newRequestBuilder(client()).query(query).get()) {
622622
Iterator<Object> results = response.response().column(0).iterator();
623623
assertTrue("Expected at least one result for query: " + query, results.hasNext());
624624
Object indexedResult = response.response().column(0).iterator().next();
625-
if (hasResults) {
626-
assertThat("Expected valid result: " + query, indexedResult, equalTo("value"));
627-
} else {
628-
assertThat("Expected empty results for query: " + query, indexedResult, is(nullValue()));
629-
}
625+
assertThat("Expected valid result: " + query, indexedResult, equalTo("value"));
630626
}
631627
}
632628
}

0 commit comments

Comments
 (0)