Improve IP_PATTERN in DirectRTCClient in Android AppRTC Demo

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

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 package org.appspot.apprtc;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 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;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Test for DirectRTCClient. Test is very simple and only tests the overall sanity of the class
@@ skipping 20 matching lines @@
   @Before
   public void setUp() {
     clientEvents = mock(AppRTCClient.SignalingEvents.class);
     serverEvents = mock(AppRTCClient.SignalingEvents.class);
 
     client = new DirectRTCClient(clientEvents);
     server = new DirectRTCClient(serverEvents);
   }
 
   @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 {
       Thread.sleep(SERVER_WAIT);
     } catch (InterruptedException e) {
       fail(e.getMessage());
     }
     client.connectToRoom(
         new AppRTCClient.RoomConnectionParameters(ROOM_URL, "127.0.0.1", LOOPBACK));
     verify(serverEvents, timeout(NETWORK_TIMEOUT))
@@ skipping 20 matching lines @@
         .onRemoteIceCandidate(isNotNull(IceCandidate.class));
 
     client.disconnectFromRoom();
     verify(clientEvents, timeout(NETWORK_TIMEOUT)).onChannelClose();
     verify(serverEvents, timeout(NETWORK_TIMEOUT)).onChannelClose();
 
     verifyNoMoreInteractions(clientEvents);
     verifyNoMoreInteractions(serverEvents);
   }
 }