Author: ltheussl
Date: Sun May 29 05:45:24 2011
New Revision: 1128829
URL: http://svn.apache.org/viewvc?rev=1128829&view=rev
Log:
[DOXIA-426] Markdown module: apply doxia-module-markdown-3.patch
Submitted by: Julien Nicoulaud
Added:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/
maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt
Modified:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/test.md
Added: maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt?rev=1128829&view=auto
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt
(added)
+++ maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt Sun
May 29 05:45:24 2011
@@ -0,0 +1,40 @@
+ -----
+ doxia-module-markdown
+ -----
+ Julien Nicoulaud <julien.nicoul...@gmail.com>
+ ------
+ 2011-05-28
+ ------
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+doxia-module-markdown
+
+ Markdown is a popular lightweight markup language, easy to read and easy to
write.
+ It is supported by a large panel of websites, text editors/IDEs and
converter tools.
+
+ <<References>>
+
+ * {{{http://daringfireball.net/projects/markdown}Markdown project website}}
+
+ * {{{http://en.wikipedia.org/wiki/Markdown}Markdown Wikipedia page}}
+
+ * {{{http://xbeta.org/wiki/show/Markdown}Markdown wiki}}
Modified:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java?rev=1128829&r1=1128828&r2=1128829&view=diff
==============================================================================
---
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
Sun May 29 05:45:24 2011
@@ -83,11 +83,11 @@ public class MarkdownParserTest
{
Iterator<SinkEventElement> it = parseFileToEventTestingSink(
"paragraph" ).getEventList().iterator();
- assertEquals( "body", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
- assertEquals( "body_", ( it.next() ).getName() );
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -101,13 +101,13 @@ public class MarkdownParserTest
{
Iterator<SinkEventElement> it = parseFileToEventTestingSink( "bold"
).getEventList().iterator();
- assertEquals( "body", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "bold", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "bold_", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
- assertEquals( "body_", ( it.next() ).getName() );
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "bold", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "bold_", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -121,13 +121,13 @@ public class MarkdownParserTest
{
Iterator<SinkEventElement> it = parseFileToEventTestingSink( "italic"
).getEventList().iterator();
- assertEquals( "body", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "italic", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "italic_", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
- assertEquals( "body_", ( it.next() ).getName() );
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "italic", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "italic_", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -141,17 +141,17 @@ public class MarkdownParserTest
{
Iterator<SinkEventElement> it = parseFileToEventTestingSink( "code"
).getEventList().iterator();
- assertEquals( "body", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "verbatim", ( it.next() ).getName() );
- assertEquals( "monospaced", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "monospaced_", ( it.next() ).getName() );
- assertEquals( "verbatim_", ( it.next() ).getName() );
- assertEquals( "body_", ( it.next() ).getName() );
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "verbatim", it.next().getName() );
+ assertEquals( "monospaced", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "monospaced_", it.next().getName() );
+ assertEquals( "verbatim_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -165,13 +165,13 @@ public class MarkdownParserTest
{
Iterator<SinkEventElement> it = parseFileToEventTestingSink( "image"
).getEventList().iterator();
- assertEquals( "body", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "figureGraphics", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
- assertEquals( "body_", ( it.next() ).getName() );
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "figureGraphics", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -185,15 +185,41 @@ public class MarkdownParserTest
{
Iterator<SinkEventElement> it = parseFileToEventTestingSink( "link"
).getEventList().iterator();
- assertEquals( "body", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "link", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "link_", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
- assertEquals( "body_", ( it.next() ).getName() );
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "link", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "link_", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
+
+ assertFalse( it.hasNext() );
+ }
+
+ /**
+ * Assert the list sink event is fired when parsing "list.md".
+ *
+ * @throws Exception if the event list is not correct when parsing the
document.
+ */
+ public void testListSinkEvent() throws Exception
+ {
+ Iterator<SinkEventElement> it = parseFileToEventTestingSink( "list"
).getEventList().iterator();
+
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "list", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "listItem", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "listItem_", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "listItem", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "listItem_", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "list_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -207,19 +233,19 @@ public class MarkdownParserTest
{
Iterator<SinkEventElement> it = parseFileToEventTestingSink(
"numbered-list" ).getEventList().iterator();
- assertEquals( "body", ( it.next() ).getName() );
- assertEquals( "numberedList", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "numberedListItem", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "numberedListItem_", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "numberedListItem", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "numberedListItem_", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "numberedList_", ( it.next() ).getName() );
- assertEquals( "body_", ( it.next() ).getName() );
+ assertEquals( "body", it.next().getName() );
+ assertEquals( "numberedList", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "numberedListItem", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "numberedListItem_", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "numberedListItem", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "numberedListItem_", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "numberedList_", it.next().getName() );
+ assertEquals( "body_", it.next().getName() );
assertFalse( it.hasNext() );
}
