Merge in these tests: http://github.com/mzsanford/twitter-text-conformance/commit/51f774ed796a64cd3b486fbf04ca5e5dd6c2ee43

BonsaiDen · BonsaiDen · commit 9d4157a1f67c · 2010-04-20T21:29:19.000+02:00
diff --git a/tests.py b/tests.py
@@ -141,6 +141,11 @@ def test_url_one_letter_iana(self):
         self.assertEqual(result.html, u'text <a href="http://X.org/">http://X.org/</a>')
         self.assertEqual(result.urls, [u'http://X.org/'])
     
+    def test_url_long_hypens(self):
+        result = self.parser.parse(u'text http://word-and-a-number-8-ftw.domain.tld/')
+        self.assertEqual(result.html, u'text <a href="http://word-and-a-number-8-ftw.domain.tld/">http://word-and-a-number-8-...</a>')
+        self.assertEqual(result.urls, [u'http://word-and-a-number-8-ftw.domain.tld/'])
+    
     
     # URL not tests ------------------------------------------------------------
     def test_not_url_dotdotdot(self):
@@ -230,6 +235,11 @@ def test_url_followed_semicolon(self):
         self.assertEqual(result.html, u'text <a href="http://example.com">http://example.com</a>;')
         self.assertEqual(result.urls, [u'http://example.com'])
     
+    def test_url_followed_hypen(self):
+        result = self.parser.parse(u'text http://domain.tld-that-you-should-have-put-a-space-after')
+        self.assertEqual(result.html, u'text <a href="http://domain.tld">http://domain.tld</a>-that-you-should-have-put-a-space-after')
+        self.assertEqual(result.urls, [u'http://domain.tld'])
+    
     
     # URL preceeded Tests -------------------------------------------------------
     def test_url_preceeded_colon(self):
