Author: vsiveton
Date: Mon Oct 20 05:40:53 2008
New Revision: 706265
URL: http://svn.apache.org/viewvc?rev=706265&view=rev
Log:
o added test case for the sink
o removed unused code
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
(with props)
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java?rev=706265&r1=706264&r2=706265&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java
Mon Oct 20 05:40:53 2008
@@ -64,10 +64,10 @@
/** Syntax for the bold monospaced markup: "==" */
String BOLD_MONOSPACED_START_MARKUP = "==";
- /** Syntax for the definition list item: " " */
- String DEFINITION_LIST_ITEM_MARKUP = THREE_SPACES_MARKUP + "$";
+ /** Syntax for the definition list item: " $ " */
+ String DEFINITION_LIST_ITEM_MARKUP = THREE_SPACES_MARKUP + "$ ";
- /** Syntax for the definition list definition: " " */
+ /** Syntax for the definition list definition: ": " */
String DEFINITION_LIST_DEFINITION_MARKUP = ": ";
/** Syntax for the horizontal rule markup: "---" */
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java?rev=706265&r1=706264&r2=706265&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
Mon Oct 20 05:40:53 2008
@@ -189,10 +189,11 @@
// nop
}
- /** [EMAIL PROTECTED] */
+ /** Not used.
+ * [EMAIL PROTECTED] */
public void definedTerm()
{
- write( " " );
+ // nop
}
/** [EMAIL PROTECTED] */
@@ -223,7 +224,7 @@
/** [EMAIL PROTECTED] */
public void definition_()
{
- writeEOL( true );
+ writeEOL();
}
/** Not used.
@@ -249,8 +250,6 @@
/** [EMAIL PROTECTED] */
public void definitionListItem()
{
- writeEOL( true );
- writeEOL();
write( DEFINITION_LIST_ITEM_MARKUP );
}
@@ -283,14 +282,14 @@
* [EMAIL PROTECTED] */
public void figure_()
{
- // nop
+ write( SLASH + String.valueOf( GREATER_THAN ) );
}
/** Not used.
* [EMAIL PROTECTED] */
public void figureCaption()
{
- // nop
+ write( Attribute.ALT.toString() + EQUAL + QUOTE );
}
/** [EMAIL PROTECTED] */
@@ -303,13 +302,13 @@
* [EMAIL PROTECTED] */
public void figureCaption_()
{
- // nop;
+ write( QUOTE + String.valueOf( SPACE ) );
}
/** [EMAIL PROTECTED] */
public void figureGraphics( String name )
{
- write( String.valueOf( SPACE ) + Attribute.SRC + EQUAL + QUOTE + name
+ QUOTE );
+ write( Attribute.SRC.toString() + EQUAL + QUOTE + name + QUOTE +
String.valueOf( SPACE ) );
}
/** [EMAIL PROTECTED] */
@@ -503,12 +502,6 @@
public void numberedList( int numbering )
{
levelList++;
- }
-
- /** [EMAIL PROTECTED] */
- public void numberedList( int numbering, SinkEventAttributes attributes )
- {
- numberedList( numbering );
String style;
switch ( numbering )
@@ -534,6 +527,12 @@
}
/** [EMAIL PROTECTED] */
+ public void numberedList( int numbering, SinkEventAttributes attributes )
+ {
+ numberedList( numbering );
+ }
+
+ /** [EMAIL PROTECTED] */
public void numberedList_()
{
levelList--;
@@ -1160,39 +1159,6 @@
}
/**
- * Starts a simple Tag. For instance:
- * <pre>
- * <tag />
- * </pre>
- * <br/>
- * <b>Note</b>: Copy from [EMAIL PROTECTED]
AbstractXmlSink#writeSimpleTag(javax.swing.text.html.HTML.Tag)}
- *
- * @param t a non null tag
- * @see #writeSimpleTag(javax.swing.text.html.HTML.Tag,
javax.swing.text.MutableAttributeSet)
- */
- private void writeSimpleTag( Tag t )
- {
- writeSimpleTag( t, null );
- }
-
- /**
- * Starts a simple Tag with attributes. For instance:
- * <pre>
- * <tag attName="attValue" />
- * </pre>
- * <br/>
- * <b>Note</b>: Copy from [EMAIL PROTECTED]
AbstractXmlSink#writeSimpleTag(javax.swing.text.html.HTML.Tag,
javax.swing.text.MutableAttributeSet)}
- *
- * @param t a non null tag
- * @param att a set of attributes
- * @see #writeStartTag(javax.swing.text.html.HTML.Tag,
javax.swing.text.MutableAttributeSet, boolean)
- */
- private void writeSimpleTag( Tag t, MutableAttributeSet att )
- {
- writeStartTag( t, att, true );
- }
-
- /**
* Write HTML escaped text to output.
*
* @param text The text to write.
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java?rev=706265&view=auto
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
Mon Oct 20 05:40:53 2008
@@ -0,0 +1,270 @@
+package org.apache.maven.doxia.module.twiki;
+
+/*
+ * 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.
+ */
+
+import java.io.Writer;
+
+import org.apache.maven.doxia.sink.AbstractSinkTest;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.util.HtmlTools;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * Test the TWiki Sink
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Siveton</a>
+ * @version $Id$
+ * @see TWikiSink
+ */
+public class TWikiSinkTest
+ extends AbstractSinkTest
+{
+ /** [EMAIL PROTECTED] */
+ protected Sink createSink( Writer writer )
+ {
+ return new TWikiSink( writer );
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getAnchorBlock( String anchor )
+ {
+ return EOL + "#" + anchor + anchor;
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ protected String getAuthorBlock( String author )
+ {
+ return null;
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ protected String getBodyBlock()
+ {
+ return null;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getBoldBlock( String text )
+ {
+ return TWikiMarkup.BOLD_START_MARKUP + text +
TWikiMarkup.BOLD_END_MARKUP;
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ protected String getDateBlock( String date )
+ {
+ return null;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getDefinitionListBlock( String definum, String definition
)
+ {
+ return TWikiMarkup.DEFINITION_LIST_ITEM_MARKUP + definum +
TWikiMarkup.DEFINITION_LIST_DEFINITION_MARKUP
+ + definition + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getFigureBlock( String source, String caption )
+ {
+ return "<img src=\"" + source + "\" alt=\"" + caption + "\" />";
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ protected String getHeadBlock()
+ {
+ return null;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getHorizontalRuleBlock()
+ {
+ return TWikiMarkup.HORIZONTAL_RULE_MARKUP + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getItalicBlock( String text )
+ {
+ return TWikiMarkup.ITALIC_START_MARKUP + text +
TWikiMarkup.ITALIC_END_MARKUP;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getLineBreakBlock()
+ {
+ return "";
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getLinkBlock( String link, String text )
+ {
+ return TWikiMarkup.LINK_START_MARKUP + link +
TWikiMarkup.LINK_MIDDLE_MARKUP + text
+ + TWikiMarkup.LINK_END_MARKUP;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getListBlock( String item )
+ {
+ return TWikiMarkup.LIST_ITEM_MARKUP + item + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getMonospacedBlock( String text )
+ {
+ return TWikiMarkup.MONOSPACED_START_MARKUP + text +
TWikiMarkup.MONOSPACED_END_MARKUP;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getNonBreakingSpaceBlock()
+ {
+ return "";
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getNumberedListBlock( String item )
+ {
+ return TWikiMarkup.NUMBERING_LOWER_ROMAN_MARKUP + " " + item + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getPageBreakBlock()
+ {
+ return "";
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getParagraphBlock( String text )
+ {
+ return text + EOL + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getRawTextBlock( String text )
+ {
+ return "";
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getSection1Block( String title )
+ {
+ return StringUtils.repeat( "-", 3 ) + StringUtils.repeat( "+", 1 ) +
title + EOL + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getSection2Block( String title )
+ {
+ return StringUtils.repeat( "-", 3 ) + StringUtils.repeat( "+", 2 ) +
title + EOL + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getSection3Block( String title )
+ {
+ return StringUtils.repeat( "-", 3 ) + StringUtils.repeat( "+", 3 ) +
title + EOL + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getSection4Block( String title )
+ {
+ return StringUtils.repeat( "-", 3 ) + StringUtils.repeat( "+", 4 ) +
title + EOL + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getSection5Block( String title )
+ {
+ return StringUtils.repeat( "-", 3 ) + StringUtils.repeat( "+", 5 ) +
title + EOL + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getSectionTitleBlock( String title )
+ {
+ return title;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getTableBlock( String cell, String caption )
+ {
+ return "| " + cell + " |" + EOL + "Table_caption";
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getTextBlock( String text )
+ {
+ return HtmlTools.escapeHTML( text );
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ protected String getTitleBlock( String title )
+ {
+ return null;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String getVerbatimBlock( String text )
+ {
+ return "<div class=\"source\">" + EOL + "<verbatim>" + text +
"</verbatim>" + EOL + "</div>" + EOL;
+ }
+
+ /** [EMAIL PROTECTED] */
+ protected String outputExtension()
+ {
+ return "twiki";
+ }
+
+ // ----------------------------------------------------------------------
+ // Override unused tests
+ // ----------------------------------------------------------------------
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ public void testAuthor()
+ {
+ // nop
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ public void testDate()
+ {
+ // nop
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ public void testHead()
+ {
+ // nop
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ public void testBody()
+ {
+ // nop
+ }
+
+ /** Not used.
+ * [EMAIL PROTECTED] */
+ public void testTitle()
+ {
+ // nop
+ }
+}
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
