Fix ipv4 tests for non-Arch Linux

See #4
jnr · Sep 10, 2020 · 615c4b8 · 615c4b8
1 parent 57465f7
commit 615c4b8
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 24 deletions.
diff --git a/src/test/java/jnr/netdb/FileProtocolDBTest.java b/src/test/java/jnr/netdb/FileProtocolDBTest.java
@@ -34,17 +34,32 @@ public void tearDown() {
 
     @Test public void canLookupIpProtocolByName() {
         ProtocolsDB db = FileProtocolsDB.getInstance();
-        Protocol p = db.getProtocolByName("ipv4");
-        assertNotNull("could not lookup ipv4 protocol", p);
-        assertEquals("incorrect proto number", 4, p.getProto());
-        assertEquals("incorrect name", "ipv4", p.getName());
+        // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+        Protocol p = Protocol.getProtocolByName("ip");
+        if (p != null) {
+            assertEquals("incorrect proto number", 0, p.getProto());
+            assertEquals("incorrect name", "ip", p.getName());
+        } else {
+            p = Protocol.getProtocolByName("ipv4");
+            assertNotNull("could not lookup ipv4 protocol", p);
+            assertEquals("incorrect proto number", 4, p.getProto());
+            assertEquals("incorrect name", "ipv4", p.getName());
+        }
     }
 
     @Test public void canLookupIpProtocolByNumber() {
         ProtocolsDB db = FileProtocolsDB.getInstance();
-        Protocol p = db.getProtocolByNumber(4);
-        assertNotNull("could not lookup ipv4 protocol", p);
-        assertEquals("incorrect proto number", 4, p.getProto());
-        assertEquals("incorrect name", "ipv4", p.getName());
+        // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+        Protocol p = Protocol.getProtocolByName("ip");
+        if (p != null) {
+            p = Protocol.getProtocolByNumber(0);
+            assertEquals("incorrect proto number", 0, p.getProto());
+            assertEquals("incorrect name", "ip", p.getName());
+        } else {
+            p = Protocol.getProtocolByNumber(4);
+            assertNotNull("could not lookup ip protocol", p);
+            assertEquals("incorrect proto number", 4, p.getProto());
+            assertEquals("incorrect name", "ipv4", p.getName());
+        }
     }
 }
diff --git a/src/test/java/jnr/netdb/NativeProtocolsDBTest.java b/src/test/java/jnr/netdb/NativeProtocolsDBTest.java
@@ -34,18 +34,33 @@ public void tearDown() {
 
     @Test public void canLookupIpProtocolByName() {
         ProtocolsDB db = NativeProtocolsDB.getInstance();
-        Protocol p = db.getProtocolByName("ipv4");
-        assertNotNull("could not lookup ipv4 protocol", p);
-        assertEquals("incorrect proto number", 4, p.getProto());
-        assertEquals("incorrect name", "ipv4", p.getName());
+        // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+        Protocol p = Protocol.getProtocolByName("ip");
+        if (p != null) {
+            assertEquals("incorrect proto number", 0, p.getProto());
+            assertEquals("incorrect name", "ip", p.getName());
+        } else {
+            p = Protocol.getProtocolByName("ipv4");
+            assertNotNull("could not lookup ipv4 protocol", p);
+            assertEquals("incorrect proto number", 4, p.getProto());
+            assertEquals("incorrect name", "ipv4", p.getName());
+        }
     }
 
     @Test public void canLookupIpProtocolByNumber() {
         ProtocolsDB db = NativeProtocolsDB.getInstance();
-        Protocol p = db.getProtocolByNumber(4);
-        assertNotNull("could not lookup ipv4 protocol", p);
-        assertEquals("incorrect proto number", 4, p.getProto());
-        assertEquals("incorrect name", "ipv4", p.getName());
+        // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+        Protocol p = Protocol.getProtocolByName("ip");
+        if (p != null) {
+            p = Protocol.getProtocolByNumber(0);
+            assertEquals("incorrect proto number", 0, p.getProto());
+            assertEquals("incorrect name", "ip", p.getName());
+        } else {
+            p = Protocol.getProtocolByNumber(4);
+            assertNotNull("could not lookup ip protocol", p);
+            assertEquals("incorrect proto number", 4, p.getProto());
+            assertEquals("incorrect name", "ipv4", p.getName());
+        }
     }
 
     @Test public void canLookupTcpProtocolByName() {

diff --git a/src/test/java/jnr/netdb/ProtocolTest.java b/src/test/java/jnr/netdb/ProtocolTest.java
@@ -33,10 +33,17 @@ public void tearDown() {
     }
 
     @Test public void canLookupIpProtocolByName() {
-        Protocol p = Protocol.getProtocolByName("ipv4");
-        assertNotNull("could not lookup ipv4 protocol", p);
-        assertEquals("incorrect proto number", 4, p.getProto());
-        assertEquals("incorrect name", "ipv4", p.getName());
+        // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+        Protocol p = Protocol.getProtocolByName("ip");
+        if (p != null) {
+            assertEquals("incorrect proto number", 0, p.getProto());
+            assertEquals("incorrect name", "ip", p.getName());
+        } else {
+            p = Protocol.getProtocolByName("ipv4");
+            assertNotNull("could not lookup ipv4 protocol", p);
+            assertEquals("incorrect proto number", 4, p.getProto());
+            assertEquals("incorrect name", "ipv4", p.getName());
+        }
     }
 
     @Test public void returnsNullOnUnknownProtocol() {
@@ -45,10 +52,18 @@ public void tearDown() {
     }
 
     @Test public void canLookupIpProtocolByNumber() {
-        Protocol p = Protocol.getProtocolByNumber(4);
-        assertNotNull("could not lookup ip protocol", p);
-        assertEquals("incorrect proto number", 4, p.getProto());
-        assertEquals("incorrect name", "ipv4", p.getName());
+        // we try ip first and then ipv4 due to jnr/jnr-netdb#4
+        Protocol p = Protocol.getProtocolByName("ip");
+        if (p != null) {
+            p = Protocol.getProtocolByNumber(0);
+            assertEquals("incorrect proto number", 0, p.getProto());
+            assertEquals("incorrect name", "ip", p.getName());
+        } else {
+            p = Protocol.getProtocolByNumber(4);
+            assertNotNull("could not lookup ip protocol", p);
+            assertEquals("incorrect proto number", 4, p.getProto());
+            assertEquals("incorrect name", "ipv4", p.getName());
+        }
     }
 
     @Test public void returnsNullOnInvalidNumber() {