Bug 779845 - Update the PSL test to catch up with the .jp PSL update and fix test's bug about unlisted TLD. r=gerv.
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Fri, 24 Aug 2012 14:56:38 +0100
changeset 105337 1ec081fd2580188b9f48c53ded10615d708ac1ac
parent 105336 1bd1a16af051592e2ee4d1206502c82c62ee21bb
child 105338 3e1fa8a59f8db1cc34e2942b556c4ef32d320776
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersgerv
bugs779845
milestone17.0a1
Bug 779845 - Update the PSL test to catch up with the .jp PSL update and fix test's bug about unlisted TLD. r=gerv.
netwerk/test/unit/data/test_psl.txt
--- a/netwerk/test/unit/data/test_psl.txt
+++ b/netwerk/test/unit/data/test_psl.txt
@@ -9,19 +9,19 @@ checkPublicSuffix('example.COM', 'exampl
 checkPublicSuffix('WwW.example.COM', 'example.com');
 # Leading dot.
 checkPublicSuffix('.com', NULL);
 checkPublicSuffix('.example', NULL);
 checkPublicSuffix('.example.com', NULL);
 checkPublicSuffix('.example.example', NULL);
 # Unlisted TLD.
 checkPublicSuffix('example', NULL);
-checkPublicSuffix('example.example', NULL);
-checkPublicSuffix('b.example.example', NULL);
-checkPublicSuffix('a.b.example.example', NULL);
+checkPublicSuffix('example.example', 'example.example');
+checkPublicSuffix('b.example.example', 'example.example');
+checkPublicSuffix('a.b.example.example', 'example.example');
 # Listed, but non-Internet, TLD.
 #checkPublicSuffix('local', NULL);
 #checkPublicSuffix('example.local', NULL);
 #checkPublicSuffix('b.example.local', NULL);
 #checkPublicSuffix('a.b.example.local', NULL);
 # TLD with only 1 rule.
 checkPublicSuffix('biz', NULL);
 checkPublicSuffix('domain.biz', 'domain.biz');
@@ -45,23 +45,25 @@ checkPublicSuffix('a.b.c.cy', 'b.c.cy');
 # More complex TLD.
 checkPublicSuffix('jp', NULL);
 checkPublicSuffix('test.jp', 'test.jp');
 checkPublicSuffix('www.test.jp', 'test.jp');
 checkPublicSuffix('ac.jp', NULL);
 checkPublicSuffix('test.ac.jp', 'test.ac.jp');
 checkPublicSuffix('www.test.ac.jp', 'test.ac.jp');
 checkPublicSuffix('kyoto.jp', NULL);
-checkPublicSuffix('c.kyoto.jp', NULL);
-checkPublicSuffix('b.c.kyoto.jp', 'b.c.kyoto.jp');
-checkPublicSuffix('a.b.c.kyoto.jp', 'b.c.kyoto.jp');
-checkPublicSuffix('pref.kyoto.jp', 'pref.kyoto.jp');	# Exception rule.
-checkPublicSuffix('www.pref.kyoto.jp', 'pref.kyoto.jp');	# Exception rule.
-checkPublicSuffix('city.kyoto.jp', 'city.kyoto.jp');	# Exception rule.
-checkPublicSuffix('www.city.kyoto.jp', 'city.kyoto.jp');	# Exception rule.
+checkPublicSuffix('test.kyoto.jp', 'test.kyoto.jp');
+checkPublicSuffix('ide.kyoto.jp', NULL);
+checkPublicSuffix('b.ide.kyoto.jp', 'b.ide.kyoto.jp');
+checkPublicSuffix('a.b.ide.kyoto.jp', 'b.ide.kyoto.jp');
+checkPublicSuffix('c.kobe.jp', NULL);
+checkPublicSuffix('b.c.kobe.jp', 'b.c.kobe.jp');
+checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp');
+checkPublicSuffix('city.kobe.jp', 'city.kobe.jp');
+checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp');
 # TLD with a wildcard rule and exceptions.
 checkPublicSuffix('om', NULL);
 checkPublicSuffix('test.om', NULL);
 checkPublicSuffix('b.test.om', 'b.test.om');
 checkPublicSuffix('a.b.test.om', 'b.test.om');
 checkPublicSuffix('songfest.om', 'songfest.om');
 checkPublicSuffix('www.songfest.om', 'songfest.om');
 # US K12.