Skip to content

Commit 13f9f95

Browse files
committed
nullable numbers unit test fix
1 parent a724806 commit 13f9f95

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

java-client/src/test/java/co/elastic/clients/elasticsearch/model/BuiltinTypesTest.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -218,40 +218,42 @@ public void testNullableDouble() {
218218
assertEquals(2.0, stats.max(), 0.01);
219219
assertEquals(5.0, stats.sum(), 0.01);
220220

221-
// Missing values (JSON null, Java infinite)
222-
String json = "{\"count\":0,\"min\":null,\"max\":null,\"avg\":null,\"sum\":0.0}";
221+
// Missing values (Java mapping same as json)
222+
String json = "{\"count\":0,\"min\":null,\"max\":null,\"avg\":0.0,\"sum\":0.0}";
223223
stats = fromJson(json, StatsAggregate.class);
224224

225225
assertEquals(0, stats.count());
226-
assertTrue(Double.isInfinite(stats.min()));
226+
assertEquals(null, stats.min());
227227
assertEquals(0.0, stats.avg(), 0.01);
228-
assertTrue(Double.isInfinite(stats.max()));
228+
assertEquals(null, stats.max());
229229
assertEquals(0.0, stats.sum(), 0.01);
230230

231-
// We don't serialize finite default values as null
232-
assertEquals("{\"count\":0,\"min\":null,\"max\":null,\"avg\":0.0,\"sum\":0.0}", toJson(stats));
231+
// We don't serialize null
232+
assertEquals("{\"count\":0,\"avg\":0.0,\"sum\":0.0}", toJson(stats));
233233
}
234234

235235
@Test
236236
public void testNullableInt() {
237237
StringStatsAggregate stats = StringStatsAggregate.of(b -> b
238238
.count(1)
239239
.minLength(2)
240-
.avgLength(3)
240+
.avgLength(3D)
241241
.maxLength(4)
242-
.entropy(0)
242+
.entropy(0D)
243243
);
244244

245245
stats = checkJsonRoundtrip(stats, "{\"count\":1,\"min_length\":2,\"max_length\":4,\"avg_length\":3.0,\"entropy\":0.0}");
246246
assertEquals(2, stats.minLength());
247247
assertEquals(4, stats.maxLength());
248+
assertEquals(0, stats.entropy());
248249

249250
// Missing values
250251
String json = "{\"count\":1,\"min_length\":null,\"max_length\":null,\"avg_length\":null,\"entropy\":null}";
251252
stats = fromJson(json, StringStatsAggregate.class);
252-
assertEquals(0, stats.minLength());
253-
assertEquals(0, stats.maxLength());
254-
assertEquals(0.0, stats.entropy(), 0.01);
253+
assertEquals(1, stats.count());
254+
assertEquals(null, stats.minLength());
255+
assertEquals(null, stats.maxLength());
256+
assertEquals(null, stats.entropy());
255257
}
256258

257259
@Test

0 commit comments

Comments
 (0)