|
19 | 19 |
|
20 | 20 | package org.elasticsearch.common.network;
|
21 | 21 |
|
| 22 | +import org.elasticsearch.common.transport.PortsRange; |
22 | 23 | import org.elasticsearch.test.ESTestCase;
|
23 | 24 |
|
24 | 25 | import java.io.IOException;
|
@@ -52,12 +53,36 @@ public void testFormatPortV6() throws Exception {
|
52 | 53 | assertEquals("[::1]:1234", NetworkAddress.format(new InetSocketAddress(forge(null, "::1"), 1234)));
|
53 | 54 | }
|
54 | 55 |
|
| 56 | + public void testFormatPortsRangeV4() throws Exception { |
| 57 | + assertEquals("127.0.0.1", NetworkAddress.format(forge("localhost", "127.0.0.1"), new PortsRange(""))); |
| 58 | + assertEquals("127.0.0.1", NetworkAddress.format(forge(null, "127.0.0.1"), new PortsRange(""))); |
| 59 | + |
| 60 | + assertEquals("127.0.0.1:9300", NetworkAddress.format(forge("localhost", "127.0.0.1"), new PortsRange("9300"))); |
| 61 | + assertEquals("127.0.0.1:9300", NetworkAddress.format(forge(null, "127.0.0.1"), new PortsRange("9300"))); |
| 62 | + |
| 63 | + assertEquals("127.0.0.1:[9300-9400]", NetworkAddress.format(forge("localhost", "127.0.0.1"), new PortsRange("9300-9400"))); |
| 64 | + assertEquals("127.0.0.1:[9300-9400]", NetworkAddress.format(forge(null, "127.0.0.1"), new PortsRange("9300-9400"))); |
| 65 | + } |
| 66 | + |
| 67 | + public void testFormatPortsRangeV6() throws Exception { |
| 68 | + assertEquals("::1", NetworkAddress.format(forge("localhost", "::1"), new PortsRange(""))); |
| 69 | + assertEquals("::1", NetworkAddress.format(forge(null, "::1"), new PortsRange(""))); |
| 70 | + |
| 71 | + assertEquals("[::1]:9300", NetworkAddress.format(forge("localhost", "::1"), new PortsRange("9300"))); |
| 72 | + assertEquals("[::1]:9300", NetworkAddress.format(forge(null, "::1"), new PortsRange("9300"))); |
| 73 | + |
| 74 | + assertEquals("[::1]:[9300-9400]", NetworkAddress.format(forge("localhost", "::1"), new PortsRange("9300-9400"))); |
| 75 | + assertEquals("[::1]:[9300-9400]", NetworkAddress.format(forge(null, "::1"), new PortsRange("9300-9400"))); |
| 76 | + } |
| 77 | + |
55 | 78 | public void testNoScopeID() throws Exception {
|
56 | 79 | assertEquals("::1", NetworkAddress.format(forgeScoped(null, "::1", 5)));
|
57 | 80 | assertEquals("::1", NetworkAddress.format(forgeScoped("localhost", "::1", 5)));
|
| 81 | + assertEquals("::1", NetworkAddress.format(forgeScoped("localhost", "::1", 5), new PortsRange(""))); |
58 | 82 |
|
59 | 83 | assertEquals("[::1]:1234", NetworkAddress.format(new InetSocketAddress(forgeScoped(null, "::1", 5), 1234)));
|
60 | 84 | assertEquals("[::1]:1234", NetworkAddress.format(new InetSocketAddress(forgeScoped("localhost", "::1", 5), 1234)));
|
| 85 | + assertEquals("[::1]:[9300-9400]", NetworkAddress.format(forgeScoped("localhost", "::1", 5), new PortsRange("9300-9400"))); |
61 | 86 | }
|
62 | 87 |
|
63 | 88 | /** Test that ipv4 address formatting round trips */
|
|
0 commit comments