adds more tests

leshi · leshi · commit d68f1f88b247 · 2016-02-03T15:33:44.000-08:00
diff --git a/u2f-ref-code/java/src/com/google/u2f/server/impl/U2FServerReferenceImpl.java b/u2f-ref-code/java/src/com/google/u2f/server/impl/U2FServerReferenceImpl.java
@@ -127,8 +127,8 @@ public SecurityKeyData processRegistrationResponse(RegistrationResponse registra
     List<Transports> transports = null;
     try {
       transports = U2fAttestation.Parse(attestationCertificate).getTransports();
-    } catch (CertificateParsingException e1) {
-      Log.warning("Could not parse transports extension " + e1.getMessage());
+    } catch (CertificateParsingException e) {
+      Log.warning("Could not parse transports extension " + e.getMessage());
     }
 
     Log.info("-- Parsed rawRegistrationResponse --");
diff --git a/u2f-ref-code/java/tests/com/google/u2f/server/impl/attestation/u2f/U2fAttestationTest.java b/u2f-ref-code/java/tests/com/google/u2f/server/impl/attestation/u2f/U2fAttestationTest.java
@@ -0,0 +1,53 @@
+package com.google.u2f.server.impl.attestation.u2f;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.u2f.TestVectors;
+import com.google.u2f.server.data.SecurityKeyData.Transports;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.security.cert.CertificateParsingException;
+import java.util.List;
+
+/**
+ * Unit tests for {@link U2fAttestation}
+ */
+@RunWith(JUnit4.class)
+public class U2fAttestationTest extends TestVectors {
+  @Test
+  public void testValidCertOneTransport() throws Exception {
+    U2fAttestation attestation = U2fAttestation.Parse(TRUSTED_CERTIFICATE_ONE_TRANSPORT);
+
+    assertNotNull(attestation);
+    List<Transports> transports = attestation.getTransports();
+    assertEquals(1, transports.size());
+    assertTrue(transports.contains(Transports.BLUETOOTH_BREDR));
+  }
+
+  @Test(expected = CertificateParsingException.class)
+  public void testMalformedCert() throws Exception {
+    U2fAttestation.Parse(TRUSTED_CERTIFICATE_MALFORMED_TRANSPORTS_EXTENSION);
+  }
+
+  @Test(expected = CertificateParsingException.class)
+  public void testValidCertNoTransports() throws Exception {
+    U2fAttestation.Parse(TRUSTED_CERTIFICATE_2);
+  }
+
+  @Test
+  public void testValidCertMultipleTransports() throws Exception {
+    U2fAttestation attestation = U2fAttestation.Parse(TRUSTED_CERTIFICATE_MULTIPLE_TRANSPORTS);
+
+    assertNotNull(attestation);
+    List<Transports> transports = attestation.getTransports();
+    assertEquals(3, transports.size());
+    assertTrue(transports.contains(Transports.BLUETOOTH_BREDR));
+    assertTrue(transports.contains(Transports.BLUETOOTH_LOW_ENERGY));
+    assertTrue(transports.contains(Transports.NFC));
+  }
+}
