commit 8ccf76192ade429da560e9b077eaca33183a670a
author Alex Klyubin <klyubin@google.com> Mon Jan 05 21:00:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 05 21:00:40 2015 +0000
tree 1d6565c297fb9fc3d0ab7133a9c57110288c3247
parent ca727d2f03b2b3ba19b7d43f20305aab3825eb1d
parent d0f39dbb37a6c6d32b481067517daae95b360555

am d0f39dbb: Merge "Fix Harmony\'s HostnameVerifierTest breakage."

* commit 'd0f39dbb37a6c6d32b481067517daae95b360555':
  Fix Harmony's HostnameVerifierTest breakage.

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java

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 @@
         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 @@
         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 @@
         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));