From a37f5ff31ecbdef0c012be5f6effb5b98c644aae Mon Sep 17 00:00:00 2001 From: Emanuil Rusev Date: Sun, 10 Nov 2013 10:44:52 +0200 Subject: [PATCH] improve tests --- ...heading.html => atx_heading_-_closed.html} | 10 +++---- ...atx_heading.md => atx_heading_-_closed.md} | 20 ++++++------- tests/data/blockquote.html | 6 +--- tests/data/blockquote.md | 6 +--- ...kquote.html => blockquote_-_compound.html} | 30 +++++++++---------- ...blockquote.md => blockquote_-_compound.md} | 26 ++++++++-------- tests/data/blockquote_-_lazy.html | 11 +++++++ tests/data/blockquote_-_lazy.md | 10 +++++++ tests/data/blockquote_-_whitespace.html | 12 ++++++++ tests/data/blockquote_-_whitespace.md | 10 +++++++ tests/data/code_block.html | 5 +--- tests/data/code_block.md | 8 +---- tests/data/dense_list.html | 24 --------------- tests/data/dense_list.md | 27 ----------------- tests/data/emphasis.html | 10 +++---- tests/data/emphasis.md | 10 +++---- tests/data/escaping.html | 8 ++--- tests/data/escaping.md | 12 ++------ tests/data/horizontal_rule.html | 10 ++----- tests/data/horizontal_rule.md | 17 ++--------- tests/data/html.html | 10 +++---- tests/data/html.md | 10 +++---- tests/data/inline_link.html | 4 +-- tests/data/inline_link.md | 4 +-- tests/data/lazy_blockquote.html | 4 --- tests/data/lazy_blockquote.md | 2 -- tests/data/list.html | 5 ++++ tests/data/list.md | 4 +++ ...ompound_list.html => list_-_compound.html} | 0 .../{compound_list.md => list_-_compound.md} | 3 +- .../{lazy_list_item.html => list_-_lazy.html} | 6 ++-- .../{lazy_list_item.md => list_-_lazy.md} | 2 +- ...{ordered_list.html => list_-_ordered.html} | 2 -- .../{ordered_list.md => list_-_ordered.md} | 5 +--- .../{sparse_list.html => list_-_sparse.html} | 30 +++++++++---------- .../data/{sparse_list.md => list_-_sparse.md} | 20 ++++++------- tests/data/list_-_unordered.html | 11 +++++++ tests/data/list_-_unordered.md | 10 +++++++ tests/data/list_-_whitespace.html | 5 ++++ tests/data/list_-_whitespace.md | 4 +++ tests/data/paragraph_blockquote.html | 4 --- tests/data/paragraph_blockquote.md | 2 -- tests/data/paragraph_list.html | 5 ---- tests/data/paragraph_list.md | 4 --- tests/data/quote_block.html | 20 ------------- tests/data/quote_block.md | 19 ------------ tests/data/reference_link.html | 15 ++++------ tests/data/reference_link.md | 23 ++------------ tests/data/reference_link_-_image.html | 1 + tests/data/reference_link_-_image.md | 3 ++ tests/data/reference_link_-_implicit.html | 2 ++ tests/data/reference_link_-_implicit.md | 5 ++++ tests/data/reference_link_-_whitespace.html | 1 + tests/data/reference_link_-_whitespace.md | 2 ++ tests/data/setext_heading.html | 6 ---- tests/data/setext_heading.md | 16 ---------- tests/data/special_characters.html | 8 ++--- tests/data/special_characters.md | 14 ++++----- tests/data/unordered_list.html | 20 ------------- tests/data/unordered_list.md | 21 ------------- 60 files changed, 222 insertions(+), 382 deletions(-) rename tests/data/{closed_atx_heading.html => atx_heading_-_closed.html} (93%) rename tests/data/{closed_atx_heading.md => atx_heading_-_closed.md} (88%) rename tests/data/{compound_blockquote.html => blockquote_-_compound.html} (96%) rename tests/data/{compound_blockquote.md => blockquote_-_compound.md} (95%) create mode 100644 tests/data/blockquote_-_lazy.html create mode 100644 tests/data/blockquote_-_lazy.md create mode 100644 tests/data/blockquote_-_whitespace.html create mode 100644 tests/data/blockquote_-_whitespace.md delete mode 100644 tests/data/dense_list.html delete mode 100644 tests/data/dense_list.md delete mode 100644 tests/data/lazy_blockquote.html delete mode 100644 tests/data/lazy_blockquote.md create mode 100644 tests/data/list.html create mode 100644 tests/data/list.md rename tests/data/{compound_list.html => list_-_compound.html} (100%) rename tests/data/{compound_list.md => list_-_compound.md} (73%) rename tests/data/{lazy_list_item.html => list_-_lazy.html} (91%) rename tests/data/{lazy_list_item.md => list_-_lazy.md} (93%) rename tests/data/{ordered_list.html => list_-_ordered.html} (88%) rename tests/data/{ordered_list.md => list_-_ordered.md} (82%) rename tests/data/{sparse_list.html => list_-_sparse.html} (92%) rename tests/data/{sparse_list.md => list_-_sparse.md} (91%) create mode 100644 tests/data/list_-_unordered.html create mode 100644 tests/data/list_-_unordered.md create mode 100644 tests/data/list_-_whitespace.html create mode 100644 tests/data/list_-_whitespace.md delete mode 100644 tests/data/paragraph_blockquote.html delete mode 100644 tests/data/paragraph_blockquote.md delete mode 100644 tests/data/paragraph_list.html delete mode 100644 tests/data/paragraph_list.md delete mode 100644 tests/data/quote_block.html delete mode 100644 tests/data/quote_block.md create mode 100644 tests/data/reference_link_-_image.html create mode 100644 tests/data/reference_link_-_image.md create mode 100644 tests/data/reference_link_-_implicit.html create mode 100644 tests/data/reference_link_-_implicit.md create mode 100644 tests/data/reference_link_-_whitespace.html create mode 100644 tests/data/reference_link_-_whitespace.md delete mode 100644 tests/data/setext_heading.html delete mode 100644 tests/data/setext_heading.md delete mode 100644 tests/data/unordered_list.html delete mode 100644 tests/data/unordered_list.md diff --git a/tests/data/closed_atx_heading.html b/tests/data/atx_heading_-_closed.html similarity index 93% rename from tests/data/closed_atx_heading.html rename to tests/data/atx_heading_-_closed.html index aae65da..6a5c4fa 100644 --- a/tests/data/closed_atx_heading.html +++ b/tests/data/atx_heading_-_closed.html @@ -1,6 +1,6 @@ -

h1

-

h2

-

h3

-

h4

-
h5
+

h1

+

h2

+

h3

+

h4

+
h5
h6
\ No newline at end of file diff --git a/tests/data/closed_atx_heading.md b/tests/data/atx_heading_-_closed.md similarity index 88% rename from tests/data/closed_atx_heading.md rename to tests/data/atx_heading_-_closed.md index 95668a1..ed66c59 100644 --- a/tests/data/closed_atx_heading.md +++ b/tests/data/atx_heading_-_closed.md @@ -1,11 +1,11 @@ -# h1 # - -## h2 ## - -### h3 ### - -#### h4 #### - -##### h5 ##### - +# h1 # + +## h2 ## + +### h3 ### + +#### h4 #### + +##### h5 ##### + ###### h6 ###### \ No newline at end of file diff --git a/tests/data/blockquote.html b/tests/data/blockquote.html index 4e84ed9..de5d652 100644 --- a/tests/data/blockquote.html +++ b/tests/data/blockquote.html @@ -1,8 +1,4 @@ -

Here's a regular blockquote:

-
-

blockquote

-
-

Here's one with no space after the ">":

+

Here's a blockquote:

blockquote

diff --git a/tests/data/blockquote.md b/tests/data/blockquote.md index 8e508a8..65f71cc 100644 --- a/tests/data/blockquote.md +++ b/tests/data/blockquote.md @@ -1,11 +1,7 @@ -Here's a regular blockquote: +Here's a blockquote: > blockquote -Here's one with no space after the ">": - ->blockquote - Here's one on multiple lines: > line 1 diff --git a/tests/data/compound_blockquote.html b/tests/data/blockquote_-_compound.html similarity index 96% rename from tests/data/compound_blockquote.html rename to tests/data/blockquote_-_compound.html index 512c113..d81bfb4 100644 --- a/tests/data/compound_blockquote.html +++ b/tests/data/blockquote_-_compound.html @@ -1,16 +1,16 @@ -

Here's one with multiple paragraphs:

-
-

This is line one.

-

This is line two.

-
-

Here's one with multiple types of blocks:

-
-

This is a quoted paragraph.

- -
-

This is a nested quote block.

-
+

Here's one with multiple paragraphs:

+
+

This is line one.

+

This is line two.

+
+

Here's one with multiple types of blocks:

+
+

This is a quoted paragraph.

+
    +
  • This is a list item of a quoted list.
    • +
  • This is another list item.
    • +
+
+

This is a nested quote block.

+
\ No newline at end of file diff --git a/tests/data/compound_blockquote.md b/tests/data/blockquote_-_compound.md similarity index 95% rename from tests/data/compound_blockquote.md rename to tests/data/blockquote_-_compound.md index dd2c690..a4c9c00 100644 --- a/tests/data/compound_blockquote.md +++ b/tests/data/blockquote_-_compound.md @@ -1,14 +1,14 @@ -Here's one with multiple paragraphs: - -> This is line one. -> -> This is line two. - -Here's one with multiple types of blocks: - -> This is a quoted paragraph. -> -> - This is a list item of a quoted list. -> - This is another list item. -> +Here's one with multiple paragraphs: + +> This is line one. +> +> This is line two. + +Here's one with multiple types of blocks: + +> This is a quoted paragraph. +> +> - This is a list item of a quoted list. +> - This is another list item. +> > > This is a nested quote block. \ No newline at end of file diff --git a/tests/data/blockquote_-_lazy.html b/tests/data/blockquote_-_lazy.html new file mode 100644 index 0000000..e356a57 --- /dev/null +++ b/tests/data/blockquote_-_lazy.html @@ -0,0 +1,11 @@ +

Here's a lazy blockquote:

+
+

line +line

+
+

Here's one with multiple lines:

+
+

line +line +line

+
\ No newline at end of file diff --git a/tests/data/blockquote_-_lazy.md b/tests/data/blockquote_-_lazy.md new file mode 100644 index 0000000..18bbad6 --- /dev/null +++ b/tests/data/blockquote_-_lazy.md @@ -0,0 +1,10 @@ +Here's a lazy blockquote: + +> line +line + +Here's one with multiple lines: + +> line +line +line \ No newline at end of file diff --git a/tests/data/blockquote_-_whitespace.html b/tests/data/blockquote_-_whitespace.html new file mode 100644 index 0000000..1e89a03 --- /dev/null +++ b/tests/data/blockquote_-_whitespace.html @@ -0,0 +1,12 @@ +

Here's a blockquote with no space after the ">":

+
+

blockquote

+
+

Here's a blockquote with leading space:

+
+

blockquote

+
+

Here's a blockquote on the next line:

+
+

blockquote

+
\ No newline at end of file diff --git a/tests/data/blockquote_-_whitespace.md b/tests/data/blockquote_-_whitespace.md new file mode 100644 index 0000000..35707c1 --- /dev/null +++ b/tests/data/blockquote_-_whitespace.md @@ -0,0 +1,10 @@ +Here's a blockquote with no space after the ">": + +>blockquote + +Here's a blockquote with leading space: + + > blockquote + +Here's a blockquote on the next line: +> blockquote \ No newline at end of file diff --git a/tests/data/code_block.html b/tests/data/code_block.html index 8ced802..5ca8c2a 100644 --- a/tests/data/code_block.html +++ b/tests/data/code_block.html @@ -2,7 +2,4 @@ 
<?php
 
 $message = 'Hello World!'; 
-echo $message;
-

Here's one that holds a list:

-
- list item
-- another list item
\ No newline at end of file +echo $message; \ No newline at end of file diff --git a/tests/data/code_block.md b/tests/data/code_block.md index 324b86a..1c24118 100644 --- a/tests/data/code_block.md +++ b/tests/data/code_block.md @@ -3,10 +3,4 @@ Here's a code block: Here's a regular list:

- -

Here's one with white space around items:

- -

Here's one with too much space before items:

-
- list item
-- another list item
-

Here's one with no space after markers:

-

-list item --another list item

-

Here's one where items contain line breaks:

- \ No newline at end of file diff --git a/tests/data/dense_list.md b/tests/data/dense_list.md deleted file mode 100644 index bf9357e..0000000 --- a/tests/data/dense_list.md +++ /dev/null @@ -1,27 +0,0 @@ -Here's a regular list: - -- list item -- another list item -- 3rd list item - -Here's one with white space around items: - - - list item - - another list item - -Here's one with too much space before items: - - - list item - - another list item - -Here's one with no space after markers: - --list item --another list item - -Here's one where items contain line breaks: - -- list -item -- another -list item \ No newline at end of file diff --git a/tests/data/emphasis.html b/tests/data/emphasis.html index ab7d4d3..4fd23e5 100644 --- a/tests/data/emphasis.html +++ b/tests/data/emphasis.html @@ -1,7 +1,7 @@

Here's an emphasis.

-

A short emphasis a b .

+

A short one a b .

Here's a strong one.

-

Here's an emphasis that uses underscores.

-

Here's a strong emphasis that uses underscores.

-

This is not _ an emphasis _ neither is * this * neither is _ this_ neither is _this _.

-

Empty emphasis ** is not __ an emphasis.

\ No newline at end of file +

Here's one that uses underscores.

+

Here's a strong one that uses underscores.

+

This is not _ one _ neither is * this * neither is _ this_ neither is _this _.

+

An empty emphasis ** is not __ an emphasis.

\ No newline at end of file diff --git a/tests/data/emphasis.md b/tests/data/emphasis.md index d4b357a..1122723 100644 --- a/tests/data/emphasis.md +++ b/tests/data/emphasis.md @@ -1,13 +1,13 @@ Here's *an emphasis*. -A short emphasis _a_ *b* . +A short one _a_ *b* . Here's **a strong one**. -Here's _an emphasis that uses underscores_. +Here's _one that uses underscores_. -Here's __a strong emphasis that uses underscores__. +Here's __a strong one that uses underscores__. -This is not _ an emphasis _ neither is * this * neither is _ this_ neither is _this _. +This is not _ one _ neither is * this * neither is _ this_ neither is _this _. -Empty emphasis ** is not __ an emphasis. \ No newline at end of file +An empty emphasis ** is not __ an emphasis. \ No newline at end of file diff --git a/tests/data/escaping.html b/tests/data/escaping.html index bcb44b4..f75f6f6 100644 --- a/tests/data/escaping.html +++ b/tests/data/escaping.html @@ -1,6 +1,2 @@ -

Here's an emphasis and here's an escaped *emphasis*. Here are also an escaped `code span`, escaped [inline link](http://example.com).

-

Here's an escaped \*emphasis\* inside of a code span.

-

Here's one inside of a code block:

-
An escaped \*emphasis\*.
-

Finally, an escaped reference:

-

[1]: http://example.com

\ No newline at end of file +

Here's an emphasis and here's an escaped *emphasis*. Here are also an escaped `code span`, an escaped [inline link](http://example.com) and an escaped \*emphasis\* inside of a code span.

+
An escaped \*emphasis\* inside of a code block.
\ No newline at end of file diff --git a/tests/data/escaping.md b/tests/data/escaping.md index 8bca463..c17e086 100644 --- a/tests/data/escaping.md +++ b/tests/data/escaping.md @@ -1,11 +1,3 @@ -Here's an *emphasis* and here's an escaped \*emphasis\*. Here are also an escaped \`code span\`, escaped \[inline link](http://example.com). +Here's an *emphasis* and here's an escaped \*emphasis\*. Here are also an escaped \`code span\`, an escaped \[inline link](http://example.com) and an escaped `\*emphasis\*` inside of a code span. -Here's `an escaped \*emphasis\* inside of a code span`. - -Here's one inside of a code block: - - An escaped \*emphasis\*. - -Finally, an escaped reference: - -\[1]: http://example.com \ No newline at end of file + An escaped \*emphasis\* inside of a code block. \ No newline at end of file diff --git a/tests/data/horizontal_rule.html b/tests/data/horizontal_rule.html index ed951c8..6bdebe8 100644 --- a/tests/data/horizontal_rule.html +++ b/tests/data/horizontal_rule.html @@ -2,15 +2,9 @@
-
-
---
-
-
-
-
-
- - -

Asterisks:

Underscores:

-

Based on the original test suite.

\ No newline at end of file +

On the next line:

+
\ No newline at end of file diff --git a/tests/data/horizontal_rule.md b/tests/data/horizontal_rule.md index 6e5549c..59ec201 100644 --- a/tests/data/horizontal_rule.md +++ b/tests/data/horizontal_rule.md @@ -2,24 +2,10 @@ Dashes: --- - --- - - --- - - --- - - --- - - - - - - - - - - - - - - - - - - - - - - Asterisks: *** @@ -28,4 +14,5 @@ Underscores: ___ -Based on [the original](http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip) test suite. \ No newline at end of file +On the next line: +___ \ No newline at end of file diff --git a/tests/data/html.html b/tests/data/html.html index 2e0bf1b..9f5b6b7 100644 --- a/tests/data/html.html +++ b/tests/data/html.html @@ -1,11 +1,11 @@ -

Self-closing tag:

+

A self-closing tag:

-

Self-closing tag with attributes:

+

One with attributes:

-

Bare element:

+

A bare element:

content
-

Element with attributes:

-link +

One with attributes:

+link

Nested elements:

parent diff --git a/tests/data/html.md b/tests/data/html.md index f0f01cb..b2b1266 100644 --- a/tests/data/html.md +++ b/tests/data/html.md @@ -1,18 +1,18 @@ -Self-closing tag: +A self-closing tag:
-Self-closing tag with attributes: +One with attributes:
-Bare element: +A bare element:
content
-Element with attributes: +One with attributes: -link +link Nested elements: diff --git a/tests/data/inline_link.html b/tests/data/inline_link.html index 4ad6eb7..7ff07da 100644 --- a/tests/data/inline_link.html +++ b/tests/data/inline_link.html @@ -1,2 +1,2 @@ -

Here's a link.

-

Here's an image link: MD Logo.

\ No newline at end of file +

Here's a link.

+

Here's one that is based on an image: MD Logo.

\ No newline at end of file diff --git a/tests/data/inline_link.md b/tests/data/inline_link.md index 52979f4..acdc409 100644 --- a/tests/data/inline_link.md +++ b/tests/data/inline_link.md @@ -1,3 +1,3 @@ -Here's a [link](http://parsedown.org). +Here's a [link](http://example.com). -Here's an image link: [![MD Logo](http://parsedown.org/md.png)](http://daringfireball.net/projects/markdown/). \ No newline at end of file +Here's one that is based on an image: [![MD Logo](http://parsedown.org/md.png)](http://daringfireball.net/projects/markdown/). \ No newline at end of file diff --git a/tests/data/lazy_blockquote.html b/tests/data/lazy_blockquote.html deleted file mode 100644 index 9571bc0..0000000 --- a/tests/data/lazy_blockquote.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

line 1 -line 2

-
\ No newline at end of file diff --git a/tests/data/lazy_blockquote.md b/tests/data/lazy_blockquote.md deleted file mode 100644 index 78a9bdd..0000000 --- a/tests/data/lazy_blockquote.md +++ /dev/null @@ -1,2 +0,0 @@ -> line 1 -line 2 \ No newline at end of file diff --git a/tests/data/list.html b/tests/data/list.html new file mode 100644 index 0000000..b3fc7d4 --- /dev/null +++ b/tests/data/list.html @@ -0,0 +1,5 @@ +

Here's a list:

+
    +
  • li
    • +
  • li
    • +
\ No newline at end of file diff --git a/tests/data/list.md b/tests/data/list.md new file mode 100644 index 0000000..adf7d64 --- /dev/null +++ b/tests/data/list.md @@ -0,0 +1,4 @@ +Here's a list: + +- li +- li \ No newline at end of file diff --git a/tests/data/compound_list.html b/tests/data/list_-_compound.html similarity index 100% rename from tests/data/compound_list.html rename to tests/data/list_-_compound.html diff --git a/tests/data/compound_list.md b/tests/data/list_-_compound.md similarity index 73% rename from tests/data/compound_list.md rename to tests/data/list_-_compound.md index cf556d3..1491dcd 100644 --- a/tests/data/compound_list.md +++ b/tests/data/list_-_compound.md @@ -6,5 +6,4 @@ Here's a compound list: - This is another list item. - > This is a quote block that belongs to it. - + > This is a quote block that belongs to it. \ No newline at end of file diff --git a/tests/data/lazy_list_item.html b/tests/data/list_-_lazy.html similarity index 91% rename from tests/data/lazy_list_item.html rename to tests/data/list_-_lazy.html index 1658470..9eabfc6 100644 --- a/tests/data/lazy_list_item.html +++ b/tests/data/list_-_lazy.html @@ -1,4 +1,4 @@ -
    -
  • li -more text
    • +
      +
    • li +more text
    \ No newline at end of file diff --git a/tests/data/lazy_list_item.md b/tests/data/list_-_lazy.md similarity index 93% rename from tests/data/lazy_list_item.md rename to tests/data/list_-_lazy.md index 35bfbb8..55541d9 100644 --- a/tests/data/lazy_list_item.md +++ b/tests/data/list_-_lazy.md @@ -1,2 +1,2 @@ -- li +- li more text \ No newline at end of file diff --git a/tests/data/ordered_list.html b/tests/data/list_-_ordered.html similarity index 88% rename from tests/data/ordered_list.html rename to tests/data/list_-_ordered.html index 81652ac..f37f62a 100644 --- a/tests/data/ordered_list.html +++ b/tests/data/list_-_ordered.html @@ -2,7 +2,6 @@
    1. one
    2. two
      3. -
    3. three

    Here's one with repeating numbers:

      @@ -12,5 +11,4 @@

      Here's one with large numbers:

      1. one
        2. -
      2. two
      \ No newline at end of file diff --git a/tests/data/ordered_list.md b/tests/data/list_-_ordered.md similarity index 82% rename from tests/data/ordered_list.md rename to tests/data/list_-_ordered.md index e63af9a..1eb0dbd 100644 --- a/tests/data/ordered_list.md +++ b/tests/data/list_-_ordered.md @@ -2,7 +2,6 @@ Here's a regular ordered list: 1. one 2. two -3. three Here's one with repeating numbers: @@ -11,6 +10,4 @@ Here's one with repeating numbers: Here's one with large numbers: -123. one -123. two - +123. one \ No newline at end of file diff --git a/tests/data/sparse_list.html b/tests/data/list_-_sparse.html similarity index 92% rename from tests/data/sparse_list.html rename to tests/data/list_-_sparse.html index 2b6bf1d..c03710b 100644 --- a/tests/data/sparse_list.html +++ b/tests/data/list_-_sparse.html @@ -1,16 +1,16 @@ -

      Here's a sparse list:

      -
        -
      • -

        list item

        -
        • -
      • another list item
        • -
      -

      Here's one with an indented list item:

      -
        -
      • -

        li

        -
          -
        • li
          • -
        -
        • +

        Here's a sparse list:

        +
          +
        • +

          list item

          +
          • +
        • another list item
          • +
        +

        Here's one with an indented list item:

        +
          +
        • +

          li

          +
            +
          • li
            • +
          +
        \ No newline at end of file diff --git a/tests/data/sparse_list.md b/tests/data/list_-_sparse.md similarity index 91% rename from tests/data/sparse_list.md rename to tests/data/list_-_sparse.md index 5bad1bd..14aaf5d 100644 --- a/tests/data/sparse_list.md +++ b/tests/data/list_-_sparse.md @@ -1,11 +1,11 @@ -Here's a sparse list: - -- list item - -- another list item - -Here's one with an indented list item: - -- li - +Here's a sparse list: + +- list item + +- another list item + +Here's one with an indented list item: + +- li + - li \ No newline at end of file diff --git a/tests/data/list_-_unordered.html b/tests/data/list_-_unordered.html new file mode 100644 index 0000000..b419ec4 --- /dev/null +++ b/tests/data/list_-_unordered.html @@ -0,0 +1,11 @@ +

        Here's an unordered list:

        +
          +
        • li
          • +
        • li
          • +
        +

        Here's one with mixed markers:

        +
          +
        • li
          • +
        • li
          • +
        • li
          • +
        \ No newline at end of file diff --git a/tests/data/list_-_unordered.md b/tests/data/list_-_unordered.md new file mode 100644 index 0000000..c69ba63 --- /dev/null +++ b/tests/data/list_-_unordered.md @@ -0,0 +1,10 @@ +Here's an unordered list: + +- li +- li + +Here's one with mixed markers: + +- li ++ li +* li \ No newline at end of file diff --git a/tests/data/list_-_whitespace.html b/tests/data/list_-_whitespace.html new file mode 100644 index 0000000..c793fa1 --- /dev/null +++ b/tests/data/list_-_whitespace.html @@ -0,0 +1,5 @@ +

        Here's one with white space around items:

        +
          +
        • li
          • +
        • li
          • +
        \ No newline at end of file diff --git a/tests/data/list_-_whitespace.md b/tests/data/list_-_whitespace.md new file mode 100644 index 0000000..260bafc --- /dev/null +++ b/tests/data/list_-_whitespace.md @@ -0,0 +1,4 @@ +Here's one with white space around items: + + - li + - li \ No newline at end of file diff --git a/tests/data/paragraph_blockquote.html b/tests/data/paragraph_blockquote.html deleted file mode 100644 index 53750b5..0000000 --- a/tests/data/paragraph_blockquote.html +++ /dev/null @@ -1,4 +0,0 @@ -

        Here's a paragraph.

        -
        -

        a block quote that belongs to it.

        -
        \ No newline at end of file diff --git a/tests/data/paragraph_blockquote.md b/tests/data/paragraph_blockquote.md deleted file mode 100644 index c83dccb..0000000 --- a/tests/data/paragraph_blockquote.md +++ /dev/null @@ -1,2 +0,0 @@ -Here's a paragraph. -> a block quote that belongs to it. \ No newline at end of file diff --git a/tests/data/paragraph_list.html b/tests/data/paragraph_list.html deleted file mode 100644 index 53a09dc..0000000 --- a/tests/data/paragraph_list.html +++ /dev/null @@ -1,5 +0,0 @@ -

        Here's a list that's "inside" a paragraph:

        -
          -
        • list item
          • -
        • another list item
          • -
        \ No newline at end of file diff --git a/tests/data/paragraph_list.md b/tests/data/paragraph_list.md deleted file mode 100644 index 341aec3..0000000 --- a/tests/data/paragraph_list.md +++ /dev/null @@ -1,4 +0,0 @@ -Here's a list that's "inside" a paragraph: -- list item -- another list item - diff --git a/tests/data/quote_block.html b/tests/data/quote_block.html deleted file mode 100644 index 48d240b..0000000 --- a/tests/data/quote_block.html +++ /dev/null @@ -1,20 +0,0 @@ -

        Here's a regular quote block:

        -
        -

        Some quoted text. -Here goes some more.

        -
        -

        Here's one with space before lines:

        -
        -

        Some quoted text. -Here goes some more.

        -
        -

        Here's one with no space after >:

        -
        -

        Some quoted text. -Here goes some more.

        -
        -

        Here's one with no > on the second line:

        -
        -

        Some quoted text. -Here goes some more.

        -
        \ No newline at end of file diff --git a/tests/data/quote_block.md b/tests/data/quote_block.md deleted file mode 100644 index f01f6ec..0000000 --- a/tests/data/quote_block.md +++ /dev/null @@ -1,19 +0,0 @@ -Here's a regular quote block: - -> Some quoted text. -> Here goes some more. - -Here's one with space before lines: - - > Some quoted text. - > Here goes some more. - -Here's one with no space after >: - ->Some quoted text. ->Here goes some more. - -Here's one with no > on the second line: - -> Some quoted text. -Here goes some more. \ No newline at end of file diff --git a/tests/data/reference_link.html b/tests/data/reference_link.html index 71965ff..8cb7da3 100644 --- a/tests/data/reference_link.html +++ b/tests/data/reference_link.html @@ -1,12 +1,7 @@ -

        Here's a reference link.

        -

        Here's one on the next line.

        -

        Here's one with a different URL.

        -

        Here's one with a semantic name.

        -

        Here's one with an upper case label definition.

        -

        Here's one with definition name on the next line.

        +

        Here's a reference link.

        +

        Here's one with a semantic name.

        +

        Here's one with an upper case label definition.

        +

        Here's one with definition name on the next line.

        Here's [one][404] with no definition.

        -

        Here's an image: Markdown Logo

        -

        Here's an implicit one.

        -

        Here's an implicit one with an empty link definition.

        -

        Here's a multiline +

        Here's a multiline one defined on 2 lines.

        \ No newline at end of file diff --git a/tests/data/reference_link.md b/tests/data/reference_link.md index 0985bfd..98f9f49 100644 --- a/tests/data/reference_link.md +++ b/tests/data/reference_link.md @@ -1,36 +1,19 @@ Here's a [reference link][1]. -[1]: http://parsedown.org - -Here's [one][2] on the next line. -[2]: http://parsedown.org - -Here's [one][3] with a different URL. - -[3]: http://parsedown.org/tests/ +[1]: http://example.com Here's [one][website] with a semantic name. -[website]: http://parsedown.org +[website]: http://example.com Here's [one][case] with an upper case label definition. -[CASE]: http://parsedown.org +[CASE]: http://example.com Here's [one] [website] with definition name on the next line. Here's [one][404] with no definition. -Here's an image: ![Markdown Logo][image] - -[image]: /md.png - -Here's an [implicit one]. - -[implicit one]: http://google.com - -Here's an [implicit one][] with an empty link definition. - Here's a [multiline one][website] defined on 2 lines. \ No newline at end of file diff --git a/tests/data/reference_link_-_image.html b/tests/data/reference_link_-_image.html new file mode 100644 index 0000000..d920916 --- /dev/null +++ b/tests/data/reference_link_-_image.html @@ -0,0 +1 @@ +

        Here's an image: Markdown Logo

        \ No newline at end of file diff --git a/tests/data/reference_link_-_image.md b/tests/data/reference_link_-_image.md new file mode 100644 index 0000000..dcd6823 --- /dev/null +++ b/tests/data/reference_link_-_image.md @@ -0,0 +1,3 @@ +Here's an image: ![Markdown Logo][image] + +[image]: /md.png \ No newline at end of file diff --git a/tests/data/reference_link_-_implicit.html b/tests/data/reference_link_-_implicit.html new file mode 100644 index 0000000..3f22b8f --- /dev/null +++ b/tests/data/reference_link_-_implicit.html @@ -0,0 +1,2 @@ +

        Here's an implicit reference link.

        +

        Here's an implicit one with an empty link definition.

        \ No newline at end of file diff --git a/tests/data/reference_link_-_implicit.md b/tests/data/reference_link_-_implicit.md new file mode 100644 index 0000000..5f31d16 --- /dev/null +++ b/tests/data/reference_link_-_implicit.md @@ -0,0 +1,5 @@ +Here's an [implicit] reference link. + +[implicit]: http://example.com + +Here's an [implicit][] one with an empty link definition. \ No newline at end of file diff --git a/tests/data/reference_link_-_whitespace.html b/tests/data/reference_link_-_whitespace.html new file mode 100644 index 0000000..5f1d3c9 --- /dev/null +++ b/tests/data/reference_link_-_whitespace.html @@ -0,0 +1 @@ +

        Here's a reference link with a definition on the next line.

        \ No newline at end of file diff --git a/tests/data/reference_link_-_whitespace.md b/tests/data/reference_link_-_whitespace.md new file mode 100644 index 0000000..14d8803 --- /dev/null +++ b/tests/data/reference_link_-_whitespace.md @@ -0,0 +1,2 @@ +Here's a [reference link][2] with a definition on the next line. +[2]: http://example.com \ No newline at end of file diff --git a/tests/data/setext_heading.html b/tests/data/setext_heading.html deleted file mode 100644 index 7692278..0000000 --- a/tests/data/setext_heading.html +++ /dev/null @@ -1,6 +0,0 @@ -

        Heading 1

        -

        Heading 2

        -

        Block Heading

        -

        This is the rest of the block.

        -

        Single "="

        -

        Single "-"

        \ No newline at end of file diff --git a/tests/data/setext_heading.md b/tests/data/setext_heading.md deleted file mode 100644 index 3ccd511..0000000 --- a/tests/data/setext_heading.md +++ /dev/null @@ -1,16 +0,0 @@ -Heading 1 -========= - -Heading 2 ---------- - -Block Heading -------------- -This is the rest of the block. - -Single "=" -= - -Single "-" -- - diff --git a/tests/data/special_characters.html b/tests/data/special_characters.html index 69fb133..b9ccabd 100644 --- a/tests/data/special_characters.html +++ b/tests/data/special_characters.html @@ -2,8 +2,6 @@

        AT&T is another way to write it.

        This & that.

        4 < 5 and 6 > 5.

        -

        Here's a link with an ampersand in the URL.

        -

        Here's an inline link.

        -

        http://example.com/autolink?a=1&b=2

        -
        -

        Based on the original test suite.

        \ No newline at end of file +

        Here's an autolink http://example.com/autolink?a=1&b=2

        +

        Here's an inline link.

        +

        Here's a reference link with an ampersand in the URL.

        \ No newline at end of file diff --git a/tests/data/special_characters.md b/tests/data/special_characters.md index d997cb6..c82b165 100644 --- a/tests/data/special_characters.md +++ b/tests/data/special_characters.md @@ -1,19 +1,15 @@ AT&T has an ampersand in their name. -AT&T is another way to write it. +AT&T is another way to write it. This & that. 4 < 5 and 6 > 5. -Here's a [link] [1] with an ampersand in the URL. +Here's an autolink -Here's an inline [link](/script?foo=1&bar=2). +Here's an inline [link](/script?a=1&b=2). -[1]: http://example.com/?foo=1&bar=2 +Here's a reference [link] [1] with an ampersand in the URL. - - ---- - -Based on [the original](http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip) test suite. \ No newline at end of file +[1]: http://example.com/?a=1&b=2 \ No newline at end of file diff --git a/tests/data/unordered_list.html b/tests/data/unordered_list.html deleted file mode 100644 index 286feb0..0000000 --- a/tests/data/unordered_list.html +++ /dev/null @@ -1,20 +0,0 @@ -

        Here's a regular unordered list:

        -
          -
        • list item
          • -
        • another list item
          • -
        • 3rd list item
          • -
        -

        Here's one with a variety of markers:

        -
          -
        • hyphen
          • -
        • plus
          • -
        • asterisk
          • -
        -

        Here's one with white space around items:

        -
          -
        • list item
          • -
        • another list item
          • -
        -

        Here's one with no space after markers:

        -

        -list item --another list item

        \ No newline at end of file diff --git a/tests/data/unordered_list.md b/tests/data/unordered_list.md deleted file mode 100644 index 0e1717d..0000000 --- a/tests/data/unordered_list.md +++ /dev/null @@ -1,21 +0,0 @@ -Here's a regular unordered list: - -- list item -- another list item -- 3rd list item - -Here's one with a variety of markers: - -- hyphen -+ plus -* asterisk - -Here's one with white space around items: - - - list item - - another list item - -Here's one with no space after markers: - --list item --another list item \ No newline at end of file