Index: wp-testcase/test_includes_formatting.php
===================================================================
--- wp-testcase/test_includes_formatting.php	(revision 170)
+++ wp-testcase/test_includes_formatting.php	(working copy)
@@ -37,7 +37,52 @@
 		
 	}
 	
-		
+	// tests that make_clickable will not link trailing periods, commas and 
+	// (semi-)colons in URLs with protocol (i.e. http://wordpress.org)
+	function test_strip_trailing_with_protocol() {
+		$urls_before = array(
+			'http://wordpress.org/hello.html',
+			'There was a spoon named http://wordpress.org. Alice!',
+			'There was a spoon named http://wordpress.org, said Alice.',
+			'There was a spoon named http://wordpress.org; said Alice.',
+			'There was a spoon named http://wordpress.org: said Alice.'
+			);
+		$urls_expected = array(
+			'<a href="http://wordpress.org/hello.html" rel="nofollow">http://wordpress.org/hello.html</a>',
+			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>. Alice!',
+			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>, said Alice.',
+			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>; said Alice.',
+			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>: said Alice.'
+			);
+
+		foreach ($urls_before as $key => $url) {
+			$this->assertEquals($urls_expected[$key], make_clickable($url));
+		}
+	}
+
+	// tests that make_clickable will not link trailing periods, commas and 
+	// (semi-)colons in URLs without protocol (i.e. www.wordpress.org)
+	function test_strip_trailing_without_protocol() {
+		$urls_before = array(
+			'www.wordpress.org',
+			'There was a spoon named www.wordpress.org. Alice!',
+			'There was a spoon named www.wordpress.org, said Alice.',
+			'There was a spoon named www.wordpress.org; said Alice.',
+			'There was a spoon named www.wordpress.org: said Alice.'
+			);
+		$urls_expected = array(
+			'<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
+			'There was a spoon named <a href="http://www.wordpress.org." rel="nofollow">http://www.wordpress.org.</a> Alice!',
+			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>, said Alice.',
+			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>; said Alice.',
+			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>: said Alice.'
+			);
+
+		foreach ($urls_before as $key => $url) {
+			$this->assertEquals($urls_expected[$key], make_clickable($url));
+		}
+	}
+
 }
 
 class TestJSEscape extends WPTestCase {