diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-01-05 11:43:59 -0800 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-01-05 11:47:54 -0800 |
| commit | cf26d521c0606e37dc4346522b635de411517860 (patch) | |
| tree | 05b472cb7705ba1c1d7568fedd9984c253139565 /harmony-tests/src/test/java | |
| parent | f1f0b00a702658f7bdf950374b3878baa3703d65 (diff) | |
| download | libcore-cf26d521c0606e37dc4346522b635de411517860.zip libcore-cf26d521c0606e37dc4346522b635de411517860.tar.gz libcore-cf26d521c0606e37dc4346522b635de411517860.tar.bz2 | |
Fix Harmony's HostnameVerifierTest breakage.
These tests got broken by recent changes to the platform-default
HostnameVerifier which no longer matches *.domain.com to domain.com.
This CL fixes the affected tests by changing their expectaions.
Bug: 18869757
Change-Id: I293b5f97f603a26a13cfd272a6175ef217ed4de3
Diffstat (limited to 'harmony-tests/src/test/java')
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java index 7e0a59f..013c49b 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java @@ -107,7 +107,7 @@ public class HostnameVerifierTest extends TestCase implements in = new ByteArrayInputStream(X509_WILD_FOO); x509 = (X509Certificate) cf.generateCertificate(in); session = new mySSLSession(new X509Certificate[] {x509}); - assertTrue(verifier.verify("foo.com", session)); + assertFalse(verifier.verify("foo.com", session)); assertTrue(verifier.verify("www.foo.com", session)); assertTrue(verifier.verify("\u82b1\u5b50.foo.com", session)); assertFalse(verifier.verify("a.b.foo.com", session)); @@ -122,7 +122,7 @@ public class HostnameVerifierTest extends TestCase implements x509 = (X509Certificate) cf.generateCertificate(in); session = new mySSLSession(new X509Certificate[] {x509}); // try the foo.com variations - assertTrue(verifier.verify("foo.com", session)); + assertFalse(verifier.verify("foo.com", session)); assertTrue(verifier.verify("www.foo.com", session)); assertTrue(verifier.verify("\u82b1\u5b50.foo.com", session)); assertFalse(verifier.verify("a.b.foo.com", session)); @@ -282,7 +282,7 @@ public class HostnameVerifierTest extends TestCase implements assertFalse(verifier.verify("foo.com", session)); assertTrue(verifier.verify("bar.com", session)); assertTrue(verifier.verify("a.baz.com", session)); - assertTrue(verifier.verify("baz.com", session)); + assertFalse(verifier.verify("baz.com", session)); assertFalse(verifier.verify("a.foo.com", session)); assertFalse(verifier.verify("a.bar.com", session)); assertFalse(verifier.verify("quux.com", session)); |