malva: Fix NetworkInterface#isLoopback test

penberg · penberg · commit c57111bcb52f · 2010-10-14T15:56:29.000+03:00
Signed-off-by: Pekka Enberg &lt;penberg@kernel.org&gt;
diff --git a/Makefile b/Makefile
@@ -24,6 +24,7 @@ CLASSES	+= src/malva/java/lang/StringTest.class
 CLASSES += src/malva/java/lang/RuntimeTest.class
 CLASSES += src/malva/java/lang/SystemTest.class
 CLASSES += src/malva/java/lang/ThrowableTest.class
+CLASSES += src/malva/java/net/InetAddressTest.class
 CLASSES += src/malva/java/net/NetworkInterfaceTest.class
 
 SRC	:= $(patsubst %.class,%.java,$(CLASSES))
diff --git a/src/malva/java/net/InetAddressTest.java b/src/malva/java/net/InetAddressTest.java
@@ -0,0 +1,15 @@
+package malva.java.net;
+
+import java.net.InetAddress;
+import malva.TestCase;
+
+public class InetAddressTest extends TestCase {
+  public static void testIsLoopback() throws Exception {
+    assertTrue (InetAddress.getByName("127.0.0.1").isLoopbackAddress());
+    assertFalse(InetAddress.getByName("192.168.0.1").isLoopbackAddress());
+  }
+
+  public static void main(String[] args) throws Exception {
+    testIsLoopback();
+  }
+}
diff --git a/src/malva/java/net/NetworkInterfaceTest.java b/src/malva/java/net/NetworkInterfaceTest.java
@@ -68,13 +68,8 @@ public static void testGetMTU() throws Exception {
   }
 
   public static void testIsLoopback() throws Exception {
-    for (NetworkInterface iface : getNetworkInterfaces()) {
-      if (iface.isLoopback()) {
-        for (InetAddress addr : getInetAddresses(iface)) {
-          assertTrue(addr.isLoopbackAddress());
-        }
-      }
-    }
+    assertTrue (NetworkInterface.getByName("127.0.0.1").isLoopback());
+    assertFalse(NetworkInterface.getByName("192.168.0.1").isLoopback());
   }
 
   public static void testToString() throws Exception {
@@ -116,8 +111,6 @@ public static void main(String[] args) throws Exception {
     testGetByName();
     testGetByInetAddress();
     testGetMTU();
-    // FIXME: BROKEN
-    // testIsLoopback();
     testToString();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,8 @@ public static void testGetMTU() throws Exception {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public static void testIsLoopback() throws Exception {`
`71`		`- for (NetworkInterface iface : getNetworkInterfaces()) {`
`72`		`- if (iface.isLoopback()) {`
`73`		`- for (InetAddress addr : getInetAddresses(iface)) {`
`74`		`- assertTrue(addr.isLoopbackAddress());`
`75`		`- }`
`76`		`- }`
`77`		`- }`
	`71`	`+ assertTrue (NetworkInterface.getByName("127.0.0.1").isLoopback());`
	`72`	`+ assertFalse(NetworkInterface.getByName("192.168.0.1").isLoopback());`
`78`	`73`	`}`
`79`	`74`
`80`	`75`	`public static void testToString() throws Exception {`
`@@ -116,8 +111,6 @@ public static void main(String[] args) throws Exception {`
`116`	`111`	`testGetByName();`
`117`	`112`	`testGetByInetAddress();`
`118`	`113`	`testGetMTU();`
`119`		`- // FIXME: BROKEN`
`120`		`- // testIsLoopback();`
`121`	`114`	`testToString();`
`122`	`115`	`}`
`123`	`116`	`}`