Improve IP_PATTERN in DirectRTCClient in Android AppRTC Demo

webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java

Index: webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
index 26ad536adf51b4f5edad8e80ba66b09a1b925f47..f1073ae4b92e4b7e792ad08402972a88786771ed 100644
--- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
+++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java
@@ -18,6 +18,8 @@ import org.robolectric.annotation.Config;
 import org.webrtc.IceCandidate;
 import org.webrtc.SessionDescription;
 
+import java.util.regex.Matcher;
+
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.isNotNull;
@@ -58,6 +60,48 @@ public class DirectRTCClientTest {
   }
 
   @Test
+  public void testIpPattern() {

[magjed_webrtc, 2016/05/24 14:08:23]

Split up in two tests testValidIpPattern()/testInvalidIpPattern() and use
assertTrue(ip + " didn't match IP_PATTERN",
DirectRTCClient.IP_PATTERN.matcher(ip).matches()) instead of fail().

[sakal, 2016/05/24 14:17:48]

Done.

+    // Strings that should match the pattern.
+    final String[] ipAddresses = new String[] {
+        "0.0.0.0",
+        "127.0.0.1",
+        "192.168.0.1",
+        "0.0.0.0:8888",
+        "127.0.0.1:8888",
+        "192.168.0.1:8888",
+        "::",
+        "::1",
+        "2001:0db8:85a3:0000:0000:8a2e:0370:7946",
+        "[::]",
+        "[::1]",
+        "[2001:0db8:85a3:0000:0000:8a2e:0370:7946]",
+        "[::]:8888",
+        "[::1]:8888",
+        "[2001:0db8:85a3:0000:0000:8a2e:0370:7946]:8888"
+    };
+    // Strings that shouldn't match the pattern.
+    final String[] fakeIpAddresses = new String[] {
+        "Hello, World!",
+        "aaaa",
+        "1111",
+        "[hello world]",
+        "hello:world"
+    };
+
+    for (String ip : ipAddresses) {
+      if (!DirectRTCClient.IP_PATTERN.matcher(ip).matches()) {
+        fail(ip + " didn't match IP_PATTERN even though it should.");
+      }
+    }
+
+    for (String fakeIp : fakeIpAddresses) {
+      if (DirectRTCClient.IP_PATTERN.matcher(fakeIp).matches()) {
+        fail(fakeIp + " matched IP_PATTERN even though it shouldn't.");
+      }
+    }
+  }
+
+  @Test
   public void testDirectRTCClient() {
     server.connectToRoom(new AppRTCClient.RoomConnectionParameters(ROOM_URL, "0.0.0.0", LOOPBACK));
     try {