improve tests

simplify testing and improved output

CONTRIBUTING.md

@@ -0,0 +1,20 @@
+Pull Requests
+-------------
+
+Do create pull requests that:
+
+* resolve an issue
+* improve an existing feature or text
+
+Do not create pull requests that:
+
+* introduce a feature or text
+* change the interface
+* change the coding style
+
+If a pull request contains unrelated changes, they should be submitted as separate pull requests.
+
+License
+-------
+
+By contributing to the project, you grant the creator of the project a perpetual, worldwide, irrevocable license to use, reproduce and distribute your contributions and derivative works. You also warrant that you are the sole owner of your contributions and that they are your original works of authorship.

README.md

@@ -13,8 +13,8 @@ Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.
 * [fast](http://parsedown.org/speed)
 * [consistent](http://parsedown.org/consistency)
 * [GitHub Flavored](https://help.github.com/articles/github-flavored-markdown)
-* friendly to international input
 * [tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5 and [hhvm](http://www.hhvm.com/)
+* friendly to international input
 
 ### Installation
 
@@ -23,7 +23,7 @@ Include `Parsedown.php` or install [the composer package](https://packagist.org/
 ### Example
 
 ```php
-$text = 'Hello _Parsedown_!';
+$text = 'Hello *Parsedown*!';
 
 $result = Parsedown::instance()->parse($text);
 

tests/Test.php

@@ -9,8 +9,14 @@ class Test extends PHPUnit_Framework_TestCase
 	/**
 	 * @dataProvider provider
 	 */
-	function test_($markdown, $expected_markup)
+	function test_($filename)
 	{
+		$path = $this->get_data_path();
+		$markdown = file_get_contents($path . $filename . '.md');
+		$expected_markup = file_get_contents($path . $filename . '.html');
+		$expected_markup = str_replace("\r\n", "\n", $expected_markup);
+		$expected_markup = str_replace("\r", "\n", $expected_markup);
+
 		$actual_markup = Parsedown::instance()->parse($markdown);
 
 		$this->assertEquals($expected_markup, $actual_markup);
@@ -20,9 +26,8 @@ class Test extends PHPUnit_Framework_TestCase
 	{
 		$provider = array();
 
-		$path = dirname(__FILE__).'/';
-
-		$DirectoryIterator = new DirectoryIterator($path . '/' . self::provider_dir);
+		$path = $this->get_data_path();
+		$DirectoryIterator = new DirectoryIterator($path);
 
 		foreach ($DirectoryIterator as $Item)
 		{
@@ -36,20 +41,17 @@ class Test extends PHPUnit_Framework_TestCase
 					continue;
 
 				$basename = $Item->getBasename('.md');
-
-				$markdown = file_get_contents($path . '/' . self::provider_dir . $basename . '.md');
-
-				if (!$markdown)
-					continue;
-
-				$expected_markup = file_get_contents($path . '/' . self::provider_dir . $basename . '.html');
-				$expected_markup = str_replace("\r\n", "\n", $expected_markup);
-				$expected_markup = str_replace("\r", "\n", $expected_markup);
-
-				$provider [] = array($markdown, $expected_markup);
+				if (file_exists($path.$basename.'.html')) {
+					$provider [] = array($basename);
+				}
 			}
 		}
 
 		return $provider;
 	}
+
+	function get_data_path()
+	{
+		return dirname(__FILE__).'/'.self::provider_dir;
+	}
 }

tests/data/code_span.html

@@ -1 +1,5 @@
-<p>a <code>code span</code></p>
+<p>a <code>code span</code></p>
+<p><code>this is also a codespan</code> trailing text</p>
+<p><code>and look at this one!</code></p>
+<p>single backtick in a code span: <code>`</code></p>
+<p>backtick-delimited string in a code span: <code>`foo`</code></p>

tests/data/code_span.md

@@ -1 +1,9 @@
-a `code span`
+a `code span`
+
+`this is also a codespan` trailing text
+
+`and look at this one!`
+
+single backtick in a code span: `` ` ``
+
+backtick-delimited string in a code span: `` `foo` ``

tests/data/deeply_nested_list.html

@@ -0,0 +1,18 @@
+<ul>
+<li>li
+<ul>
+<li>li
+<ul>
+<li>li
+<ul>
+<li>li</li>
+</ul>
+</li>
+<li>li</li>
+</ul>
+</li>
+<li>li</li>
+</ul>
+</li>
+<li>li</li>
+</ul>

tests/data/deeply_nested_list.md

@@ -0,0 +1,7 @@
+- li
+  - li
+    - li
+      - li
+    - li
+  - li
+- li

tests/data/email.html

@@ -0,0 +1 @@
+<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>

tests/data/email.md

@@ -0,0 +1 @@
+my email is <me@example.com>

tests/data/image_title.html

@@ -0,0 +1 @@
+<p><img alt="alt" src="/md.png" title="title" /></p>

tests/data/image_title.md

@@ -0,0 +1 @@
+![alt](/md.png "title")

tests/data/inline_link_title.html

@@ -0,0 +1 @@
+<p><a href="http://example.com" title="Title">single quotes</a> and <a href="http://example.com" title="Title">double quotes</a></p>

tests/data/inline_link_title.md

@@ -0,0 +1 @@
+[single quotes](http://example.com 'Title') and [double quotes](http://example.com "Title")

tests/data/reference_title.html

@@ -1 +1,2 @@
-<p><a href="http://example.com" title="Title">single quotes</a> and <a href="http://example.com" title="Title">double quotes</a></p>
+<p><a href="http://example.com" title="example title">double quotes</a> and <a href="http://example.com" title="example title">single quotes</a> and <a href="http://example.com" title="example title">parentheses</a></p>
+<p>[invalid title]: <a href="http://example.com">http://example.com</a> example title</p>

tests/data/reference_title.md

@@ -1 +1,6 @@
-[single quotes](http://example.com 'Title') and [double quotes](http://example.com "Title")
+[double quotes] and [single quotes] and [parentheses]
+
+[double quotes]: http://example.com "example title"
+[single quotes]: http://example.com 'example title'
+[parentheses]: http://example.com (example title)
+[invalid title]: http://example.com example title

tests/data/sparse_dense_list.html

@@ -0,0 +1,7 @@
+<ul>
+<li>
+<p>li</p>
+</li>
+<li>li</li>
+<li>li</li>
+</ul>

tests/data/sparse_dense_list.md

@@ -0,0 +1,4 @@
+- li
+
+- li
+- li

tests/data/url_autolinking.html

@@ -1,2 +1,3 @@
 <p>an autolink <a href="http://example.com">http://example.com</a></p>
-<p>inside of brackets [<a href="http://example.com">http://example.com</a>], inside of braces {<a href="http://example.com">http://example.com</a>},  inside of parentheses (<a href="http://example.com">http://example.com</a>)</p>
+<p>inside of brackets [<a href="http://example.com">http://example.com</a>], inside of braces {<a href="http://example.com">http://example.com</a>},  inside of parentheses (<a href="http://example.com">http://example.com</a>)</p>
+<p>trailing slash <a href="http://example.com/">http://example.com/</a> and <a href="http://example.com/path/">http://example.com/path/</a></p>

tests/data/url_autolinking.md

@@ -1,3 +1,5 @@
 an autolink http://example.com
 
-inside of brackets [http://example.com], inside of braces {http://example.com},  inside of parentheses (http://example.com)
+inside of brackets [http://example.com], inside of braces {http://example.com},  inside of parentheses (http://example.com)
+
+trailing slash http://example.com/ and http://example.com/path/