| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 android.test.suitebuilder.annotation.SmallTest; | 7 import android.support.test.filters.SmallTest; |
| 8 | 8 |
| 9 import org.json.JSONObject; | 9 import org.json.JSONObject; |
| 10 | 10 |
| 11 import org.chromium.base.test.util.Feature; | 11 import org.chromium.base.test.util.Feature; |
| 12 import org.chromium.net.test.util.CertTestUtil; | 12 import org.chromium.net.test.util.CertTestUtil; |
| 13 | 13 |
| 14 import java.io.ByteArrayInputStream; | 14 import java.io.ByteArrayInputStream; |
| 15 import java.security.cert.CertificateFactory; | 15 import java.security.cert.CertificateFactory; |
| 16 import java.security.cert.X509Certificate; | 16 import java.security.cert.X509Certificate; |
| 17 import java.util.Arrays; | 17 import java.util.Arrays; |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 if (!shouldThrowNpe) { | 482 if (!shouldThrowNpe) { |
| 483 fail("Null pointer exception was not expected: " + ex.toString()
); | 483 fail("Null pointer exception was not expected: " + ex.toString()
); |
| 484 } | 484 } |
| 485 return; | 485 return; |
| 486 } | 486 } |
| 487 if (shouldThrowNpe) { | 487 if (shouldThrowNpe) { |
| 488 fail("NullPointerException was expected"); | 488 fail("NullPointerException was expected"); |
| 489 } | 489 } |
| 490 } | 490 } |
| 491 } | 491 } |
| OLD | NEW |