Fixes HEX conversion for secret.

* Corrects the handling of uppercase letters by adding the necessary
offset.
* Handles lowercase letters as well
* Adds tests for both cases.

Author: crepricg

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);