Skip to content

Commit da5491c

Browse files
jdconradjdconrad
committed
update tests
1 parent 1b272b6 commit da5491c

File tree

7 files changed

+114
-17
lines changed

7 files changed

+114
-17
lines changed

‎server/src/main/java/org/elasticsearch/TransportVersion.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -248,18 +248,6 @@ public String toReleaseVersion() {
248248
return VersionsHolder.VERSION_LOOKUP_BY_RELEASE.apply(id);
249249
}
250250

251-
@Override
252-
public boolean equals(Object o) {
253-
if (o == null || getClass() != o.getClass()) return false;
254-
TransportVersion that = (TransportVersion) o;
255-
return id == that.id;
256-
}
257-
258-
@Override
259-
public int hashCode() {
260-
return id;
261-
}
262-
263251
@Override
264252
public String toString() {
265253
return Integer.toString(id);
@@ -329,11 +317,11 @@ private static Map<String, TransportVersion> loadTransportVersionsByName() {
329317
throw new UncheckedIOException("latest transport version file not found at [" + latestLocation + "]", ioe);
330318
}
331319

332-
String manifestLocation = "/transport/constant/constant-transport-versions-files-manifest.txt";
320+
String manifestLocation = "/transport/constant/manifest.txt";
333321
List<String> versionFileNames = null;
334322
if (latestId > -1) {
335323
try (InputStream inputStream = TransportVersion.class.getResourceAsStream(manifestLocation)) {
336-
if (inputStream == null) {
324+
if (inputStream != null) {
337325
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
338326
versionFileNames = reader.lines().filter(line -> line.isBlank() == false).toList();
339327
}

‎server/src/test/java/org/elasticsearch/TransportVersionTests.java‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,4 +220,112 @@ public void testDuplicateConstants() {
220220
previous = next;
221221
}
222222
}
223+
224+
public void testFromName() {
225+
assertThat(TransportVersion.fromName("test-0"), is(new TransportVersion("test-0", 3001000, null)));
226+
assertThat(TransportVersion.fromName("test-1"), is(new TransportVersion("test-1", 3002000, null)));
227+
assertThat(
228+
TransportVersion.fromName("test-2"),
229+
is(
230+
new TransportVersion(
231+
"test-2",
232+
3003000,
233+
new TransportVersion("test-2", 2001001, new TransportVersion("test-2", 1001001, null))
234+
)
235+
)
236+
);
237+
assertThat(
238+
TransportVersion.fromName("test-3"),
239+
is(new TransportVersion("test-3", 3003001, new TransportVersion("test-3", 2001002, null)))
240+
);
241+
assertThat(
242+
TransportVersion.fromName("test-4"),
243+
is(
244+
new TransportVersion(
245+
"test-4",
246+
3003002,
247+
new TransportVersion("test-4", 2001003, new TransportVersion("test-4", 1001002, null))
248+
)
249+
)
250+
);
251+
}
252+
253+
public void testSupports() {
254+
TransportVersion test0 = TransportVersion.fromName("test-0");
255+
assertThat(new TransportVersion(null, 2003000, null).supports(test0), is(false));
256+
assertThat(new TransportVersion(null, 3001000, null).supports(test0), is(true));
257+
assertThat(new TransportVersion(null, 4001001, null).supports(test0), is(true));
258+
259+
TransportVersion test1 = TransportVersion.fromName("test-1");
260+
assertThat(new TransportVersion(null, 2003000, null).supports(test1), is(false));
261+
assertThat(new TransportVersion(null, 3001000, null).supports(test1), is(false));
262+
assertThat(new TransportVersion(null, 3001001, null).supports(test1), is(false));
263+
assertThat(new TransportVersion(null, 3002000, null).supports(test1), is(true));
264+
assertThat(new TransportVersion(null, 4001000, null).supports(test1), is(true));
265+
assertThat(new TransportVersion(null, 4001001, null).supports(test1), is(true));
266+
267+
TransportVersion test2 = TransportVersion.fromName("test-2");
268+
assertThat(new TransportVersion(null, 1001000, null).supports(test2), is(false));
269+
assertThat(new TransportVersion(null, 1001001, null).supports(test2), is(true));
270+
assertThat(new TransportVersion(null, 1001002, null).supports(test2), is(true));
271+
assertThat(new TransportVersion(null, 1002000, null).supports(test2), is(false));
272+
assertThat(new TransportVersion(null, 1002001, null).supports(test2), is(false));
273+
assertThat(new TransportVersion(null, 2001000, null).supports(test2), is(false));
274+
assertThat(new TransportVersion(null, 2001001, null).supports(test2), is(true));
275+
assertThat(new TransportVersion(null, 2001002, null).supports(test2), is(true));
276+
assertThat(new TransportVersion(null, 2003000, null).supports(test2), is(false));
277+
assertThat(new TransportVersion(null, 2003001, null).supports(test2), is(false));
278+
assertThat(new TransportVersion(null, 3001000, null).supports(test2), is(false));
279+
assertThat(new TransportVersion(null, 3001001, null).supports(test2), is(false));
280+
assertThat(new TransportVersion(null, 3003000, null).supports(test2), is(true));
281+
assertThat(new TransportVersion(null, 3003001, null).supports(test2), is(true));
282+
assertThat(new TransportVersion(null, 3003002, null).supports(test2), is(true));
283+
assertThat(new TransportVersion(null, 3003003, null).supports(test2), is(true));
284+
assertThat(new TransportVersion(null, 4001000, null).supports(test2), is(true));
285+
assertThat(new TransportVersion(null, 4001001, null).supports(test2), is(true));
286+
287+
TransportVersion test3 = TransportVersion.fromName("test-3");
288+
assertThat(new TransportVersion(null, 1001001, null).supports(test3), is(false));
289+
assertThat(new TransportVersion(null, 1001002, null).supports(test3), is(false));
290+
assertThat(new TransportVersion(null, 1001003, null).supports(test3), is(false));
291+
assertThat(new TransportVersion(null, 1002001, null).supports(test3), is(false));
292+
assertThat(new TransportVersion(null, 1002002, null).supports(test3), is(false));
293+
assertThat(new TransportVersion(null, 2001001, null).supports(test3), is(false));
294+
assertThat(new TransportVersion(null, 2001002, null).supports(test3), is(true));
295+
assertThat(new TransportVersion(null, 2001003, null).supports(test3), is(true));
296+
assertThat(new TransportVersion(null, 2003000, null).supports(test3), is(false));
297+
assertThat(new TransportVersion(null, 2003001, null).supports(test3), is(false));
298+
assertThat(new TransportVersion(null, 3001000, null).supports(test3), is(false));
299+
assertThat(new TransportVersion(null, 3001001, null).supports(test3), is(false));
300+
assertThat(new TransportVersion(null, 3003000, null).supports(test3), is(false));
301+
assertThat(new TransportVersion(null, 3003001, null).supports(test3), is(true));
302+
assertThat(new TransportVersion(null, 3003002, null).supports(test3), is(true));
303+
assertThat(new TransportVersion(null, 3003003, null).supports(test3), is(true));
304+
assertThat(new TransportVersion(null, 3004000, null).supports(test3), is(true));
305+
assertThat(new TransportVersion(null, 4001000, null).supports(test3), is(true));
306+
assertThat(new TransportVersion(null, 4001001, null).supports(test3), is(true));
307+
308+
TransportVersion test4 = TransportVersion.fromName("test-4");
309+
assertThat(new TransportVersion(null, 1001001, null).supports(test4), is(false));
310+
assertThat(new TransportVersion(null, 1001002, null).supports(test4), is(true));
311+
assertThat(new TransportVersion(null, 1001003, null).supports(test4), is(true));
312+
assertThat(new TransportVersion(null, 1002001, null).supports(test4), is(false));
313+
assertThat(new TransportVersion(null, 1002002, null).supports(test4), is(false));
314+
assertThat(new TransportVersion(null, 1002003, null).supports(test3), is(false));
315+
assertThat(new TransportVersion(null, 2001002, null).supports(test4), is(false));
316+
assertThat(new TransportVersion(null, 2001003, null).supports(test4), is(true));
317+
assertThat(new TransportVersion(null, 2001004, null).supports(test4), is(true));
318+
assertThat(new TransportVersion(null, 2003000, null).supports(test4), is(false));
319+
assertThat(new TransportVersion(null, 2003001, null).supports(test4), is(false));
320+
assertThat(new TransportVersion(null, 3001000, null).supports(test4), is(false));
321+
assertThat(new TransportVersion(null, 3001001, null).supports(test4), is(false));
322+
assertThat(new TransportVersion(null, 3003000, null).supports(test4), is(false));
323+
assertThat(new TransportVersion(null, 3003001, null).supports(test4), is(false));
324+
assertThat(new TransportVersion(null, 3003002, null).supports(test4), is(true));
325+
assertThat(new TransportVersion(null, 3003003, null).supports(test4), is(true));
326+
assertThat(new TransportVersion(null, 3003004, null).supports(test4), is(true));
327+
assertThat(new TransportVersion(null, 3004000, null).supports(test4), is(true));
328+
assertThat(new TransportVersion(null, 4001000, null).supports(test4), is(true));
329+
assertThat(new TransportVersion(null, 4001001, null).supports(test4), is(true));
330+
}
223331
}

server/src/test/resources/transport/constant/constant-transport-versions-files-manifest.txt renamed to server/src/test/resources/transport/constant/manifest.txt

File renamed without changes.

‎server/src/test/resources/transport/constant/test-0.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "test-0",
33
"ids": [
4+
4001000,
45
3001000
56
]
67
}

‎server/src/test/resources/transport/constant/test-3.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "test-3",
33
"ids": [
4-
4001000,
4+
4002000,
55
3003001,
66
2001002
77
]

‎server/src/test/resources/transport/constant/test-4.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "test-4",
33
"ids": [
44
4002000,
5-
3003001,
5+
3003002,
66
2001003,
77
1001002
88
]

‎server/src/test/resources/transport/latest/9.2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "test-4",
33
"ids": [
4-
3003001
4+
3003002
55
]
66
}

0 commit comments

Comments
 (0)