commit fc3d4de60de1465b8826cbdf2fc4b894bb3054d7
author Alex Klyubin <klyubin@google.com> Tue Nov 18 10:24:31 2014 -0800
committer Alex Klyubin <klyubin@google.com> Tue Nov 18 10:24:31 2014 -0800
tree 9bc750cf02ab5c7be05c985b00fcc31de3f405e4
parent 5a32ef575b3657168a1a53e7bc8c2cd2481dd3ec

Fix DefaultHostnameVerifierTest failure.

The failure was caused by me forgetting to update the tests when
merging in 14d4830f4048657722cbec1c4aaa8747a07c9495 which makes
DefaultHostnameVerifier reject wildcard domain name patterns
consisting of fewer than two labels (excluding root).

Bug: 17552202
Change-Id: Ibd1928621dbffb43830ff9d014eb1e3c50232172

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.*"));
     }