diff options
| author | Kenny Root <kroot@google.com> | 2013-05-03 21:54:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-03 21:54:10 +0000 |
| commit | 645c15629a8abdb9f3a6e428ccb393eacd933552 (patch) | |
| tree | 1d215dd2945af312d47213b3738dae79d8ef4ca6 | |
| parent | aed4814bb1d769e87bec04682489cc10b891518f (diff) | |
| parent | 70b79a2cc89dd2845582001cd3f2a8cf8301ce6c (diff) | |
| download | libcore-645c15629a8abdb9f3a6e428ccb393eacd933552.zip libcore-645c15629a8abdb9f3a6e428ccb393eacd933552.tar.gz libcore-645c15629a8abdb9f3a6e428ccb393eacd933552.tar.bz2 | |
Merge "Replace mentions of old JSSE package name"
4 files changed, 4 insertions, 4 deletions
diff --git a/benchmarks/regression/SignatureBenchmark.java b/benchmarks/regression/SignatureBenchmark.java index 383dcfd..373b876 100644 --- a/benchmarks/regression/SignatureBenchmark.java +++ b/benchmarks/regression/SignatureBenchmark.java @@ -16,6 +16,7 @@ package benchmarks.regression; +import com.android.org.conscrypt.OpenSSLSignature; import com.google.caliper.Param; import com.google.caliper.SimpleBenchmark; import java.security.KeyPair; @@ -25,7 +26,6 @@ import java.security.PublicKey; import java.security.Signature; import java.util.HashMap; import java.util.Map; -import org.apache.harmony.xnet.provider.jsse.OpenSSLSignature; /** * Tests RSA and DSA signature creation and verification. diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index 5d7f716..77e5c7f 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -952,7 +952,7 @@ name: "tests.api.javax.net.ssl.SSLEngineTest#testHandshake" }, { - description: "org.apache.harmony.xnet.provider.jsse.SSLEngineImpl#getDelegatedTask() throws NPE instead of + description: "com.android.org.conscrypt.SSLEngineImpl#getDelegatedTask() throws NPE instead of returning null", bug: 3403706, name: "tests.api.javax.net.ssl.SSLEngineTest#test_getDelegatedTask" diff --git a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java index 7a1465e..de12967 100644 --- a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java +++ b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java @@ -1215,7 +1215,7 @@ public class SSLSocketTest extends TestCase { client.startHandshake(); // Reflection is used so this can compile on the RI - String expectedClassName = "org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl"; + String expectedClassName = "com.android.org.conscrypt.OpenSSLSocketImpl"; Class actualClass = client.getClass(); assertEquals(expectedClassName, actualClass.getName()); Method setSoWriteTimeout = actualClass.getMethod("setSoWriteTimeout", diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java index 31d0a12..30a1a9c 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java @@ -368,7 +368,7 @@ public class SSLEngineTest extends TestCase { * @throws NoSuchAlgorithmException * javax.net.ssl.SSLEngine#getDelegatedTask() */ - @KnownFailure("org.apache.harmony.xnet.provider.jsse.SSLEngineImpl#getDelegatedTask() throws NPE instead of returning null") + @KnownFailure("com.android.org.conscrypt.SSLEngineImpl#getDelegatedTask() throws NPE instead of returning null") public void test_getDelegatedTask() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { |