| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.net; | 5 package org.chromium.net; |
| 6 | 6 |
| 7 import static org.chromium.net.test.util.CertTestUtil.CERTS_DIRECTORY; | 7 import static org.chromium.net.test.util.CertTestUtil.CERTS_DIRECTORY; |
| 8 | 8 |
| 9 import android.support.test.filters.MediumTest; |
| 9 import android.test.InstrumentationTestCase; | 10 import android.test.InstrumentationTestCase; |
| 10 import android.test.suitebuilder.annotation.MediumTest; | |
| 11 | 11 |
| 12 import org.chromium.net.test.util.CertTestUtil; | 12 import org.chromium.net.test.util.CertTestUtil; |
| 13 | 13 |
| 14 import java.io.IOException; | 14 import java.io.IOException; |
| 15 import java.io.RandomAccessFile; | 15 import java.io.RandomAccessFile; |
| 16 import java.security.GeneralSecurityException; | 16 import java.security.GeneralSecurityException; |
| 17 import java.util.Arrays; | 17 import java.util.Arrays; |
| 18 | 18 |
| 19 /** | 19 /** |
| 20 * Tests for org.chromium.net.X509Util. | 20 * Tests for org.chromium.net.X509Util. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 CertTestUtil.pemToDer(CERTS_DIRECTORY + OK_CERT)))); | 62 CertTestUtil.pemToDer(CERTS_DIRECTORY + OK_CERT)))); |
| 63 | 63 |
| 64 try { | 64 try { |
| 65 X509Util.clearTestRootCertificates(); | 65 X509Util.clearTestRootCertificates(); |
| 66 } catch (Exception e) { | 66 } catch (Exception e) { |
| 67 fail("Could not clear test root certificates: " + e.toString()); | 67 fail("Could not clear test root certificates: " + e.toString()); |
| 68 } | 68 } |
| 69 } | 69 } |
| 70 } | 70 } |
| 71 | 71 |
| OLD | NEW |