summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-01-05 20:49:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-05 20:49:30 +0000
commitd0f39dbb37a6c6d32b481067517daae95b360555 (patch)
tree0202f942bf047f928aa93d9941b78eea57a809a9
parent880bf04a93307044ea608982b92a33c0995abf3a (diff)
parentcf26d521c0606e37dc4346522b635de411517860 (diff)
downloadlibcore-d0f39dbb37a6c6d32b481067517daae95b360555.zip
libcore-d0f39dbb37a6c6d32b481067517daae95b360555.tar.gz
libcore-d0f39dbb37a6c6d32b481067517daae95b360555.tar.bz2
Merge "Fix Harmony's HostnameVerifierTest breakage."
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java6
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));