commit 617c23db850070173422757164d2dc88b35c27a1
author Alex Klyubin <klyubin@google.com> Wed Nov 19 02:51:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 19 02:51:05 2014 +0000
tree cf4bbf882ce8ea97275718d78b55307faf4bbf7b
parent f706f4be3db564ab3c1110f9da291c9aaf5bef10
parent d910cf339d61153d66f9a3d835eff027791ad78c

am d910cf33: Merge "Fix DefaultHostnameVerifierTest failure."

* commit 'd910cf339d61153d66f9a3d835eff027791ad78c':
  Fix DefaultHostnameVerifierTest failure.

luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java

diff --git a/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java b/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
index 71ccea4..e890355 100644
--- a/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
+++ b/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
@@ -154,9 +154,11 @@
         assertFalse(verifier.verifyHostName("imap.google.com", "ix*.google.com"));
         assertTrue(verifier.verifyHostName("imap.google.com", "iMap.Google.Com"));
         assertTrue(verifier.verifyHostName("weird", "weird"));
+        assertFalse(verifier.verifyHostName("weird", "weird."));
+
+        // Wildcards rejected for domain names consisting of fewer than two labels (excluding root).
         assertFalse(verifier.verifyHostName("weird", "weird*"));
         assertFalse(verifier.verifyHostName("weird", "*weird"));
-        assertFalse(verifier.verifyHostName("weird", "weird."));
         assertFalse(verifier.verifyHostName("weird", "weird*."));
         assertFalse(verifier.verifyHostName("weird", "weird.*"));
     }
@@ -175,10 +177,12 @@
         assertFalse(verifier.verifyHostName("imap.google.com.", "ix*.google.com"));
         assertTrue(verifier.verifyHostName("imap.google.com.", "iMap.Google.Com"));
         assertTrue(verifier.verifyHostName("weird.", "weird"));
-        assertTrue(verifier.verifyHostName("weird.", "weird*"));
-        assertTrue(verifier.verifyHostName("weird.", "*weird"));
         assertTrue(verifier.verifyHostName("weird.", "weird."));
-        assertTrue(verifier.verifyHostName("weird.", "weird*."));
+
+        // Wildcards rejected for domain names consisting of fewer than two labels (excluding root).
+        assertFalse(verifier.verifyHostName("weird.", "*weird"));
+        assertFalse(verifier.verifyHostName("weird.", "weird*"));
+        assertFalse(verifier.verifyHostName("weird.", "weird*."));
         assertFalse(verifier.verifyHostName("weird.", "weird.*"));
     }