Merge branch 'master' into relay-responding

Author: vaage

README.md

@@ -37,15 +37,34 @@ JAVA 7 when working with this project.
      the following two commands in separate shells:
 
        ```
-       $ sh run_server.sh
-       $ sh run_client.sh
+       $ sh run_server.sh <team_id> <team_secret> <port>
+       $ sh run_client.sh <host> <port>
        ```
 
-     The `run_server` and `run_client` scripts have hard-coded addresses for
-     your local machine. If you are running the server on a different machine
-     than the client, you will need to change the host portion of the address
-     in `run_client.sh` to the name of the host where your server is running.
-     Make sure the client and server are using the same port number.
+     You must specify the following startup arguments for `run_server.sh:
+     + `<team_id>` and `<team_secret>`: a numeric id for your team, and a secret
+       code, which are used to authenticate your server with the Relay server.
+       You can specify any integer value for `<team_id>`, and a value expressed
+       in hexadecimal format (using numbers `0-9` and letters in the range
+       `A-F`) for `<team_secret>` when you launch the server in your local setup
+       since it will not connect to the Relay server.
+     + `<port>`: the TCP port that your Server will listen on for connections
+       from the Client. You can use any value between 1024 and 65535, as long as
+       there is no other service currently listening on that port in your
+       system. The server will return an error:
+
+         ```
+         java.net.BindException: Address already in use (Bind failed)
+         ```
+
+       if the port is already in use.
+
+     The startup arguments for `run_client.sh` are the following:
+     + `<host>`: the hostname or IP address of the computer on which the server
+       is listening. If you are running server and client on the same computer,
+       you can use `localhost` here.
+     + `<port>`: the port on which your server is listening. Must be the same
+       port number you have specified when you launched `run_server.sh`.
 
 All running images write informational and exceptional events to log files.
 The default setting for log messages is "INFO". You may change this to get
@@ -66,12 +85,13 @@ All the source files (except test-related source files) are in
 use the supplied scripts to build the project, the `.class` files will be placed
 in `./bin`. There is a `./third_party` directory that holds the jar files for
 JUnit (a Java testing framework). Your environment may or may not already have
-this installed. The supplied scripts use the version in ./third_party.
+this installed. The supplied scripts use the version in `./third_party`.
 
 Finally, there are some high-level design documents in the project Wiki. Please
 review them as they can help you find your way around the sources.
 
 
+
 ## Source Directories
 
 The major project components have been separated into their own packages. The

src/codeu/chat/common/Secret.java

@@ -30,13 +30,13 @@ public static byte[] parse(String stringSecret) {
     final int offset = stringSecret.length() % 2;
 
     for (int i = 0; i < stringSecret.length(); i++) {
-      expanded[offset + i] = (byte)toHex(stringSecret.charAt(i));
+      expanded[offset + i] = (byte) toHex(stringSecret.charAt(i));
     }
 
     final byte[] compressed = new byte[expanded.length / 2];
 
     for (int i = 0; i < compressed.length; i++) {
-      compressed[i] = (byte)((expanded[2 * i] << 4) | expanded[2 * i + 1]);
+      compressed[i] = (byte) ((expanded[2 * i] << 4) | expanded[2 * i + 1]);
     }
 
     return compressed;
@@ -46,7 +46,7 @@ private static final int toHex(char c) {
 
     // If an invalid value was given, it will be treated as 0.
 
-    switch(c) {
+    switch (c) {
       case '0':
       case '1':
       case '2':
@@ -59,13 +59,21 @@ private static final int toHex(char c) {
       case '9':
         return c - '0';
 
+      case 'a':
+      case 'b':
+      case 'c':
+      case 'd':
+      case 'e':
+      case 'f':
+        return c - 'a' + 10;
+
       case 'A':
       case 'B':
       case 'C':
       case 'D':
       case 'E':
       case 'F':
-        return c - 'A';
+        return c - 'A' + 10;
 
       default:
         return 0;

test/codeu/chat/common/SecretTest.java

@@ -14,33 +14,54 @@
 
 package codeu.chat.common;
 
-import java.util.Arrays;
-
 import static org.junit.Assert.*;
+
+import java.util.Arrays;
 import org.junit.Test;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
 
 public final class SecretTest {
 
   @Test
   public void testParseEvenLength() {
 
     final String input = "2345";
-    final byte[] expected = { 0x23, 0x45 };
+    final byte[] expected = {0x23, 0x45};
 
     final byte[] actual = Secret.parse(input);
 
     assertNotNull(actual);
     assertTrue(Arrays.equals(expected, actual));
+  }
 
+  @Test
+  public void testParseEvenLengthWithUppercaseLetters() {
+
+    final String input = "ABCDEF";
+    final byte[] expected = {(byte) 0xAB, (byte) 0xCD, (byte) 0xEF};
+
+    final byte[] actual = Secret.parse(input);
+
+    assertNotNull(actual);
+    assertTrue(Arrays.equals(expected, actual));
+  }
+
+  @Test
+  public void testParseEvenLengthWithLowercaseLetters() {
+
+    final String input = "abcdef";
+    final byte[] expected = {(byte) 0xAB, (byte) 0xCD, (byte) 0xEF};
+
+    final byte[] actual = Secret.parse(input);
+
+    assertNotNull(actual);
+    assertTrue(Arrays.equals(expected, actual));
   }
 
   @Test
   public void testParseEvenLengthWithLeadingZero() {
 
     final String input = "012345";
-    final byte[] expected = { 0x01, 0x23, 0x45 };
+    final byte[] expected = {0x01, 0x23, 0x45};
 
     final byte[] actual = Secret.parse(input);
 
@@ -52,7 +73,7 @@ public void testParseEvenLengthWithLeadingZero() {
   public void testParseEvenLengthWithLeadingDoubleZero() {
 
     final String input = "00123456";
-    final byte[] expected = { 0x00, 0x12, 0x34, 0x56 };
+    final byte[] expected = {0x00, 0x12, 0x34, 0x56};
 
     final byte[] actual = Secret.parse(input);
 
@@ -64,7 +85,7 @@ public void testParseEvenLengthWithLeadingDoubleZero() {
   public void testParseOddLength() {
 
     final String input = "12345";
-    final byte[] expected = { 0x01, 0x23, 0x45 };
+    final byte[] expected = {0x01, 0x23, 0x45};
 
     final byte[] actual = Secret.parse(input);
 
@@ -76,7 +97,7 @@ public void testParseOddLength() {
   public void testParseOddLengthWithLeadingZero() {
 
     final String input = "0123456";
-    final byte[] expected = { 0x00, 0x12, 0x34, 0x56 };
+    final byte[] expected = {0x00, 0x12, 0x34, 0x56};
 
     final byte[] actual = Secret.parse(input);
 
@@ -88,7 +109,7 @@ public void testParseOddLengthWithLeadingZero() {
   public void testParseOddLengthWithLeadingDoubleZero() {
 
     final String input = "001234567";
-    final byte[] expected = { 0x00, 0x01, 0x23, 0x45, 0x67 };
+    final byte[] expected = {0x00, 0x01, 0x23, 0x45, 0x67};
 
     final byte[] actual = Secret.parse(input);