improve tests

simplify testing and improved output

.travis.yml

@@ -4,4 +4,5 @@ php:
   - 5.5
   - 5.4
   - 5.3
-  - 5.2
+  - 5.2
+  - hhvm

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,7 +13,7 @@ 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)
-* [tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4 and 5.5
+* [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,9 +23,9 @@ Include `Parsedown.php` or install [the composer package](https://packagist.org/
 ### Example
 
 ```php
-$text = 'Hello **Parsedown**!';
+$text = 'Hello *Parsedown*!';
 
 $result = Parsedown::instance()->parse($text);
 
-echo $result; # prints: <p>Hello <strong>Parsedown</strong>!</p>
+echo $result; # prints: <p>Hello <em>Parsedown</em>!</p>
 ```

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/atx_heading.html

@@ -4,4 +4,5 @@
 <h4>h4</h4>
 <h5>h5</h5>
 <h6>h6</h6>
-<h1>closed h1</h1>
+<h1>closed h1</h1>
+<p>#</p>

tests/data/atx_heading.md

@@ -10,4 +10,6 @@
 
 ###### h6
 
-# closed h1 #
+# closed h1 #
+
+#

tests/data/block-level_html.html

@@ -1,9 +1,5 @@
-<div>content</div>
-<hr style="background: #eaa;" />
-<p>nested elements:</p>
+<div>_content_</div>
+<p>sparse:</p>
 <div>
-parent
-<div>
-child
-</div>
+_content_
 </div>

tests/data/block-level_html.md

@@ -1,12 +1,7 @@
-<div>content</div>
+<div>_content_</div>
 
-<hr style="background: #eaa;" />
-
-nested elements:
+sparse:
 
 <div>
-parent
-<div>
-child
-</div>
+_content_
 </div>

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/compound_emphasis.html

@@ -0,0 +1,2 @@
+<p><em><code>code</code></em> <strong><code>code</code></strong></p>
+<p><em><code>code</code><strong><code>code</code></strong><code>code</code></em></p>

tests/data/compound_emphasis.md

@@ -0,0 +1,4 @@
+_`code`_ __`code`__
+
+*`code`**`code`**`code`*
+

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/em_strong.html

@@ -1,6 +1,8 @@
+<p><strong><em>em strong</em></strong></p>
 <p><strong><em>em strong</em> strong</strong></p>
 <p><strong>strong <em>em strong</em></strong></p>
 <p><strong>strong <em>em strong</em> strong</strong></p>
+<p><strong><em>em strong</em></strong></p>
 <p><strong><em>em strong</em> strong</strong></p>
 <p><strong>strong <em>em strong</em></strong></p>
 <p><strong>strong <em>em strong</em> strong</strong></p>

tests/data/em_strong.md

@@ -1,9 +1,13 @@
+___em strong___
+
 ___em strong_ strong__
 
 __strong _em strong___
 
 __strong _em strong_ strong__
 
+***em strong***
+
 ***em strong* strong**
 
 **strong *em strong***

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/emphasis.html

@@ -1,7 +1,8 @@
 <p><em>underscore</em>, <em>asterisk</em>, <em>one two</em>, <em>three four</em>, <em>a</em>, <em>b</em></p>
-<p><em>multiline
-emphasis</em></p>
-<p>_ this _ is not an emphasis, neither is _ this_, _this _, or _this*</p>
+<p><strong>strong</strong> and <em>em</em> and <strong>strong</strong> and <em>em</em></p>
+<p><em>line
+line
+line</em></p>
 <p>this_is_not_an_emphasis</p>
 <p>an empty emphasis __ ** is not an emphasis</p>
 <p>*mixed *<em>double and</em> single asterisk** spans</p>

tests/data/emphasis.md

@@ -1,9 +1,10 @@
 _underscore_, *asterisk*, _one two_, *three four*, _a_, *b*
 
-_multiline
-emphasis_
+**strong** and *em* and **strong** and *em*
 
-_ this _ is not an emphasis, neither is _ this_, _this _, or _this*
+_line
+line
+line_
 
 this_is_not_an_emphasis
 

tests/data/fenced_code_block.html

@@ -2,4 +2,5 @@
 
 $message = 'fenced code block';
 echo $message;</code></pre>
-<pre><code>tilde</code></pre>
+<pre><code>tilde</code></pre>
+<pre><code class="language-php">echo 'language identifier';</code></pre>

tests/data/fenced_code_block.md

@@ -7,4 +7,8 @@ echo $message;
 
 ~~~
 tilde
-~~~
+~~~
+
+```php
+echo 'language identifier';
+```

tests/data/html_entity.html

@@ -0,0 +1 @@
+<p>&amp; &copy; &#123;</p>

tests/data/html_entity.md

@@ -0,0 +1 @@
+& © {

tests/data/image_reference.html

@@ -1 +1 @@
-<p><img alt="Markdown Logo" src="/md.png"></p>
+<p><img alt="Markdown Logo" src="/md.png" /></p>

tests/data/image_reference.md

@@ -1,3 +1,3 @@
 ![Markdown Logo][image]
 
-[image]: /md.png
+[image]: /md.png

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.html

@@ -1,4 +1,4 @@
-<p><a href="http://example.com">link</a></p>
+<p><a href="http://example.com">link</a> and <a href="/tests/">another link</a></p>
 <p><a href="http://example.com"><code>link</code></a></p>
-<p><a href="http://example.com" title="Example">link with title</a></p>
-<p><a href="http://example.com"><img alt="MD Logo" src="http://parsedown.org/md.png"></a></p>
+<p><a href="http://example.com"><img alt="MD Logo" src="http://parsedown.org/md.png" /></a></p>
+<p><a href="http://example.com"><img alt="MD Logo" src="http://parsedown.org/md.png" /> and text</a></p>

tests/data/inline_link.md

@@ -1,7 +1,7 @@
-[link](http://example.com)
+[link](http://example.com) and [another link](/tests/)
 
 [`link`](http://example.com)
 
-[link with title](http://example.com "Example")
+[![MD Logo](http://parsedown.org/md.png)](http://example.com)
 
-[![MD Logo](http://parsedown.org/md.png)](http://example.com)
+[![MD Logo](http://parsedown.org/md.png) and text](http://example.com)

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/inline_title.html

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

tests/data/inline_title.md

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

tests/data/nested_block-level_html.html

@@ -0,0 +1,10 @@
+<div>
+_parent_
+<div>
+_child_
+</div>
+<pre>
+_adopted child_
+</pre>
+</div>
+<p><em>outside</em></p>

tests/data/nested_block-level_html.md

@@ -0,0 +1,11 @@
+<div>
+_parent_
+<div>
+_child_
+</div>
+<pre>
+_adopted child_
+</pre>
+</div>
+
+_outside_

tests/data/paragraph_list.html

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

tests/data/paragraph_list.md

@@ -0,0 +1,9 @@
+paragraph
+- li
+- li
+
+paragraph
+
+   * li
+   
+   * li

tests/data/reference_title.html

@@ -0,0 +1,2 @@
+<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

@@ -0,0 +1,6 @@
+[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/self-closing_block-level_html.html

@@ -0,0 +1,4 @@
+<hr />
+<p>attributes:</p>
+<hr style="background: #9bd;" />
+<p>...</p>

tests/data/self-closing_block-level_html.md

@@ -0,0 +1,7 @@
+<hr />
+
+attributes:
+
+<hr style="background: #9bd;" />
+
+...

tests/data/span-level_html.html

@@ -1,3 +1,4 @@
 <p>an <b>important</b> <a href=''>link</a></p>
 <p>broken<br/>
-line</p>
+line</p>
+<p><b>inline tag</b> at the beginning</p>

tests/data/span-level_html.md

@@ -1,4 +1,6 @@
 an <b>important</b> <a href=''>link</a>
 
 broken<br/>
-line
+line
+
+<b>inline tag</b> at the beginning

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/special_characters.html

@@ -1,7 +1,6 @@
 <p>AT&amp;T has an ampersand in their name</p>
-<p>AT&amp;T is another way to write it</p>
 <p>this &amp; that</p>
 <p>4 &lt; 5 and 6 > 5</p>
-<p><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a> </p>
+<p><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a></p>
 <p><a href="/script?a=1&amp;b=2">inline link</a></p>
 <p><a href="http://example.com/?a=1&amp;b=2">reference link</a></p>

tests/data/special_characters.md

@@ -1,12 +1,10 @@
 AT&T has an ampersand in their name
 
-AT&T is another way to write it
-
 this & that
 
 4 < 5 and 6 > 5
 
-<http://example.com/autolink?a=1&b=2> 
+<http://example.com/autolink?a=1&b=2>
 
 [inline link](/script?a=1&b=2)
 

tests/data/strikethrough.html

@@ -1,3 +1,3 @@
 <p><del>strikethrough</del></p>
-<p>in the <del>middle</del> of a sentence</p>
-<p>in the middle of a w<del>or</del>d</p>
+<p>here's <del>one</del> followed by <del>another one</del></p>
+<p>~~ this ~~ is not one neither is ~this~</p>

tests/data/strikethrough.md

@@ -1,5 +1,5 @@
 ~~strikethrough~~
 
-in the ~~middle~~ of a sentence
+here's ~~one~~ followed by ~~another one~~
 
-in the middle of a w~~or~~d
+~~ this ~~ is not one neither is ~this~

tests/data/strong_em.html

@@ -1,6 +1,6 @@
-<p><em><strong>strong em</strong></em> </p>
 <p><em>em <strong>strong em</strong></em></p>
 <p><em><strong>strong em</strong> em</em></p>
-<p><em><strong>strong em</strong></em></p>
+<p><em>em <strong>strong em</strong> em</em></p>
 <p><em>em <strong>strong em</strong></em></p>
-<p><em><strong>strong em</strong> em</em></p>
+<p><em><strong>strong em</strong> em</em></p>
+<p><em>em <strong>strong em</strong> em</em></p>

tests/data/strong_em.md

@@ -1,11 +1,11 @@
-***strong em*** 
-
 *em **strong em***
 
 ***strong em** em*
 
-___strong em___
+*em **strong em** em*
 
 _em __strong em___
 
-___strong em__ em_
+___strong em__ em_
+
+_em __strong em__ em_

tests/data/tab-indented_code_block.html

@@ -0,0 +1,6 @@
+<pre><code>&lt;?php
+
+$message = 'Hello World!'; 
+echo $message;
+
+echo "following a blank line";</code></pre>

tests/data/tab-indented_code_block.md

@@ -0,0 +1,6 @@
+	<?php
+	
+	$message = 'Hello World!'; 
+	echo $message;
+
+	echo "following a blank line";

tests/data/url_autolinking.html

@@ -1 +1,3 @@
-<p>Here's an autolink <a href="http://example.com">http://example.com</a>.</p>
+<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>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 +1,5 @@
-Here's an autolink http://example.com.
+an autolink 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/