You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/04/13 06:48:02 UTC

svn commit: r528353 [1/2] - in /maven/sandbox/trunk/doxia/doxia-module-mediawiki: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java/org/apache/maven/doxia/ src/main/java/org/apac...

Author: jdcasey
Date: Thu Apr 12 21:48:00 2007
New Revision: 528353

URL: http://svn.apache.org/viewvc?view=rev&rev=528353
Log:
Beginnings of a mediawiki parser, based on their published formatting help.

Added:
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/pom.xml   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/DefaultParserOptions.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/MediaWikiParser.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/ParsingContext.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParser.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/NoSuchStateException.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateFactory.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateParser.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/BoldFormatParser.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParser.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParser.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParser.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtils.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParserTCK.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParserTest.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParserTest.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParserTest.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockAndControl.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockManager.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/ParserOptionsMockAndControl.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/SinkMockAndControl.java   (with props)
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/util/
    maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtilsTest.java   (with props)

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/pom.xml?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/pom.xml (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/pom.xml Thu Apr 12 21:48:00 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0"?><project>
+  <parent>
+    <artifactId>doxia-sandbox</artifactId>
+    <groupId>org.apache.maven.doxia</groupId>
+    <version>1.0-alpha-9-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.doxia</groupId>
+  <artifactId>doxia-module-mediawiki</artifactId>
+  <name>doxia-module-mediawiki</name>
+  <version>1.0-SNAPSHOT</version>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-core</artifactId>
+      <version>1.0-alpha-9-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+      <version>1.0-alpha-9-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-22</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-api</artifactId>
+      <version>1.0-alpha-22</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>1.2_Java1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/DefaultParserOptions.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/DefaultParserOptions.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/DefaultParserOptions.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/DefaultParserOptions.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,43 @@
+package org.apache.maven.doxia.module.mediawiki.parser;
+
+public class DefaultParserOptions
+    implements ParsingContext
+{
+    
+    private String baseUrl;
+    private String urlSpaceToken;
+    private int line = 0;
+    
+    public DefaultParserOptions setBaseUrl( String baseUrl )
+    {
+        this.baseUrl = baseUrl;
+        return this;
+    }
+
+    public DefaultParserOptions setUrlSpaceToken( String urlSpaceToken )
+    {
+        this.urlSpaceToken = urlSpaceToken;
+        return this;
+    }
+    
+    public void incrementLine()
+    {
+        line++;
+    }
+    
+    public int getLine()
+    {
+        return line;
+    }
+
+    public String getBaseUrl()
+    {
+        return baseUrl;
+    }
+
+    public String getUrlSpaceToken()
+    {
+        return urlSpaceToken;
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/DefaultParserOptions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/DefaultParserOptions.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/MediaWikiParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/MediaWikiParser.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/MediaWikiParser.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/MediaWikiParser.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,125 @@
+package org.apache.maven.doxia.module.mediawiki.parser;
+
+import org.apache.maven.doxia.module.common.ByLineReaderSource;
+import org.apache.maven.doxia.module.mediawiki.parser.state.StateFactory;
+import org.apache.maven.doxia.module.mediawiki.parser.state.StateParser;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
+import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
+
+import java.io.Reader;
+import java.util.Stack;
+
+public class MediaWikiParser
+    implements Parser, LogEnabled
+{
+
+    private Logger logger;
+
+    // NOTE: set this to the longest start-marker in the grammar!
+    private static final int LOOKAHEAD_LEN = 2;
+
+    private Stack states = new Stack();
+
+    private StateParser currentState;
+
+    private StateFactory stateFactory;
+
+    public void reset()
+    {
+        currentState = null;
+        states.clear();
+    }
+
+    public void parse( Reader reader, Sink sink )
+        throws ParseException
+    {
+        // punt on the options.
+        parse( reader, sink, new DefaultParserOptions() );
+    }
+
+    public void parse( Reader reader, Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        // if null, punt.
+        if ( options == null )
+        {
+            options = new DefaultParserOptions();
+        }
+
+        ByLineReaderSource source = new ByLineReaderSource( reader );
+        String line = null;
+        StringBuffer buffer = new StringBuffer();
+
+        while ( ( line = source.getNextLine() ) != null )
+        {
+            int lastLineIdx = buffer.length();
+            
+            buffer.append( '\n' ).append( line );
+            
+            while( buffer.length() > LOOKAHEAD_LEN )
+            {
+                StateParser newState = stateFactory.getState( buffer );
+
+                // if we've detected a new markup class, push the last one onto the stack.
+                if ( newState != null )
+                {
+                    if ( currentState != null )
+                    {
+                        states.push( currentState );
+                    }
+                    currentState = newState;
+                    currentState.beginState( sink, options );
+                }
+                else
+                {
+                    if ( currentState == null )
+                    {
+                        throw new ParseException( "Cannot parse document; cannot find root-state parser for: \'" + buffer + "\'." );
+                    }
+
+                    int bufferLen = buffer.length();
+                    int remainder = currentState.consume( buffer, bufferLen, sink, options );
+                    if ( remainder > -1 )
+                    {
+                        if ( remainder >= lastLineIdx )
+                        {
+                            options.incrementLine();
+                        }
+                        buffer = buffer.delete( 0, remainder );
+                        
+                        currentState.endState( sink, options );
+
+                        if ( !states.isEmpty() )
+                        {
+                            currentState = (StateParser) states.pop();
+                        }
+                        else
+                        {
+                            currentState = null;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    protected Logger getLogger()
+    {
+        if ( logger == null )
+        {
+            logger = new ConsoleLogger( Logger.LEVEL_INFO, "MediaWikiParser::Logger" );
+        }
+
+        return logger;
+    }
+
+    public void enableLogging( Logger logger )
+    {
+        this.logger = logger;
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/MediaWikiParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/MediaWikiParser.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/ParsingContext.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/ParsingContext.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/ParsingContext.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/ParsingContext.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,14 @@
+package org.apache.maven.doxia.module.mediawiki.parser;
+
+public interface ParsingContext
+{
+
+    String getUrlSpaceToken();
+
+    String getBaseUrl();
+
+    void incrementLine();
+    
+    int getLine();
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/ParsingContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/ParsingContext.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParser.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParser.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParser.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,110 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+public abstract class AbstractStateParser
+    implements StateParser
+{
+
+    private int consumedEndMarkerIndex = -1;
+
+    protected abstract char[] getEndMarker();
+
+    protected abstract String getStateName();
+
+    protected abstract void addContent( char[] buffer, int contentSize, Sink sink, ParsingContext options )
+        throws ParseException;
+
+    public int consume( CharSequence buffer, int bufferSize, Sink sink, ParsingContext context )
+        throws ParseException
+    {
+        if ( buffer.length() < 1 )
+        {
+            return -1;
+        }
+        
+        char[] endMarker = getEndMarker();
+
+        if ( consumedEndMarkerIndex > -1 )
+        {
+            // increment to the first unchecked index
+            consumedEndMarkerIndex++;
+            
+            int bufferMark = 0;
+            for ( int i = consumedEndMarkerIndex; i < endMarker.length; i++ )
+            {
+                if ( endMarker[i] != buffer.charAt( i - consumedEndMarkerIndex ) )
+                {
+                    throw new ParseException( "Invalid end marker for state: " + getStateName() + " (expected: \'"
+                        + String.copyValueOf( endMarker, consumedEndMarkerIndex, endMarker.length ) + "\'; got: \'"
+                        + buffer + "\')." );
+                }
+                
+                // increment the index in the end marker to pick up with on the next consume() call.
+                consumedEndMarkerIndex++;
+                bufferMark++;
+            }
+
+            return bufferMark;
+        }
+        else
+        {
+            int bufferLen = buffer.length();
+            
+            if ( bufferSize < bufferLen )
+            {
+                bufferLen = bufferSize;
+            }
+            
+            int bufferMaxIdx = bufferLen - 1;
+            
+            int consumedToIdx = -1;
+            int contentLastIdx = bufferLen - 1;
+            int endMarkerIdx = 0;
+            for ( int i = 0; i < bufferLen; i++ )
+            {
+                // if we're in the end marker (the contentLastIdx is changed), then see if we're past the
+                // end of the end marker.
+                if ( contentLastIdx != bufferMaxIdx && endMarkerIdx == endMarker.length )
+                {
+                    consumedToIdx = i;
+                    break;
+                }
+                else if ( endMarker[endMarkerIdx] == buffer.charAt( i ) )
+                {
+                    // if we find the start of the end marker, cap the content sub-array.
+                    if ( contentLastIdx == bufferMaxIdx )
+                    {
+                        contentLastIdx = i-1;
+                    }
+                    
+                    // increment the index in the end marker to pick up with on the next consume() call.
+                    endMarkerIdx++;
+                    consumedEndMarkerIndex++;
+                }
+            }
+            
+            if ( contentLastIdx > -1 )
+            {
+                addContent( buffer.toString().toCharArray(), contentLastIdx + 1, sink, context );
+            }
+            
+            return consumedToIdx;
+        }
+    }
+
+    public void beginState( Sink sink, ParsingContext parseOptions )
+        throws ParseException
+    {
+        // override if needed.
+    }
+
+    public void endState( Sink sink, ParsingContext parseOptions )
+        throws ParseException
+    {
+        // override if needed.
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParser.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/NoSuchStateException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/NoSuchStateException.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/NoSuchStateException.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/NoSuchStateException.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,31 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state;
+
+public class NoSuchStateException
+    extends Exception
+{
+
+    private final String lookahead;
+
+    public NoSuchStateException( String lookahead, Throwable cause )
+    {
+        super( buildMessage( lookahead ), cause );
+        this.lookahead = lookahead;
+    }
+
+    public NoSuchStateException( String lookahead )
+    {
+        super( buildMessage( lookahead ) );
+        this.lookahead = lookahead;
+    }
+    
+    private static String buildMessage( String lookahead )
+    {
+        return "No state parser found for: \'" + lookahead + "\'.";
+    }
+
+    public String getLookahead()
+    {
+        return lookahead;
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/NoSuchStateException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/NoSuchStateException.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateFactory.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateFactory.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateFactory.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateFactory.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,8 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state;
+
+public interface StateFactory
+{
+    
+    StateParser getState( CharSequence lookahead );
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateFactory.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateParser.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateParser.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateParser.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+public interface StateParser
+{
+
+    void beginState( Sink sink, ParsingContext parseOptions )
+        throws ParseException;
+
+    /**
+     * Consume the given character array. If the end marker for this state is encountered, return
+     * the index of the first character AFTER the LAST character in the end marker.
+     * @param buffer the content buffer to consume
+     * @param bufferSize The size of the buffer to read. The rest is junk.
+     * @param sink The Sink which will render the document events as they happen
+     * @param options The ParsingContext used to help determine things like relative link locations, etc.
+     * @return -1 if the whole buffer was used, otherwise the first index AFTER the last character 
+     *   in the end marker. THIS INDEX MUST BE LESS THAN bufferSize.
+     * @throws ParseException 
+     */
+    int consume( CharSequence buffer, int bufferSize, Sink sink, ParsingContext options )
+        throws ParseException;
+
+    void endState( Sink sink, ParsingContext parseOptions )
+        throws ParseException;
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/StateParser.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/BoldFormatParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/BoldFormatParser.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/BoldFormatParser.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/BoldFormatParser.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,42 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state.format;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.module.mediawiki.parser.state.AbstractStateParser;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+public class BoldFormatParser
+    extends AbstractStateParser
+{
+
+    private static final char[] END_MARKER = "'''".toCharArray();
+
+    protected void addContent( char[] buffer, int contentSize, Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        sink.text( String.copyValueOf( buffer, 0, contentSize ) );
+    }
+
+    protected char[] getEndMarker()
+    {
+        return END_MARKER;
+    }
+
+    protected String getStateName()
+    {
+        return "Bold Format";
+    }
+
+    public void beginState( Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        sink.bold();
+    }
+
+    public void endState( Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        sink.bold_();
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/BoldFormatParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/BoldFormatParser.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParser.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParser.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParser.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,42 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state.format;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.module.mediawiki.parser.state.AbstractStateParser;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+public class ItalicFormatParser
+    extends AbstractStateParser
+{
+    
+    private static final char[] END_MARKER = "''".toCharArray();
+    
+    protected void addContent( char[] buffer, int contentSize, Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        sink.text( String.copyValueOf( buffer, 0, contentSize ) );
+    }
+
+    protected char[] getEndMarker()
+    {
+        return END_MARKER;
+    }
+
+    protected String getStateName()
+    {
+        return "Italic Format";
+    }
+
+    public void beginState( Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        sink.italic();
+    }
+
+    public void endState( Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        sink.italic_();
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParser.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParser.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParser.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParser.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,94 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state.link;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.module.mediawiki.parser.state.AbstractStateParser;
+import org.apache.maven.doxia.module.mediawiki.parser.util.URLUtils;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+public class ExternalLinkParser
+    extends AbstractStateParser
+{
+
+    private static final char[] END_MARKER = { ']' };
+
+    private boolean urlFinished = false;
+
+    private StringBuffer urlBuffer = new StringBuffer();
+
+    private StringBuffer labelBuffer = new StringBuffer();
+
+    protected void addContent( char[] buffer, int contentSize, Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        int labelStartIdx = 0;
+        if ( !urlFinished )
+        {
+            for ( int i = 0; i < contentSize; i++ )
+            {
+                if ( buffer[i] == ' ' )
+                {
+                    labelStartIdx = i+1;
+                    urlFinished = true;
+                    break;
+                }
+                else
+                {
+                    urlBuffer.append( buffer[i] );
+                }
+            }
+        }
+        
+        if ( labelStartIdx < contentSize )
+        {
+            labelBuffer.append( buffer, labelStartIdx, contentSize - labelStartIdx );
+        }
+    }
+
+    protected char[] getEndMarker()
+    {
+        return END_MARKER;
+    }
+
+    protected String getStateName()
+    {
+        return "External Link";
+    }
+
+    public void endState( Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        String href = urlBuffer.toString();
+        String urlLabel = null;
+        if ( !URLUtils.isAbsolute( href ) )
+        {
+            String baseUrl = options.getBaseUrl();
+            
+            href = URLUtils.appendToBaseURL( baseUrl, href );
+            urlLabel = href;
+            
+            // let's make handling spaces in URLs a bit easier...
+            href = href.replaceAll( " ", "%20" );
+        }
+        
+        if ( href.length() < 1 )
+        {
+            throw new ParseException( null, "No href provided for external link.", options.getLine() );
+        }
+        
+        String label;
+        if ( labelBuffer != null && labelBuffer.length() > 0 )
+        {
+            label = labelBuffer.toString();
+        }
+        else
+        {
+            label = urlLabel;
+        }
+        
+        sink.link( href );
+        sink.text( label );
+        sink.link_();
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParser.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParser.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParser.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParser.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,97 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state.link;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.module.mediawiki.parser.state.AbstractStateParser;
+import org.apache.maven.doxia.module.mediawiki.parser.util.URLUtils;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+public class InternalLinkParser
+    extends AbstractStateParser
+{
+
+    private static final char[] END_MARKER = "]]".toCharArray();
+    
+    private boolean urlFinished = false;
+
+    private StringBuffer urlBuffer = new StringBuffer();
+
+    private StringBuffer labelBuffer = new StringBuffer();
+
+    protected void addContent( char[] buffer, int contentSize, Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        int labelStartIdx = 0;
+        if ( !urlFinished )
+        {
+            for ( int i = 0; i < contentSize; i++ )
+            {
+                if ( buffer[i] == '|' )
+                {
+                    labelStartIdx = i+1;
+                    urlFinished = true;
+                    break;
+                }
+                else
+                {
+                    urlBuffer.append( buffer[i] );
+                }
+            }
+        }
+        
+        if ( labelStartIdx < contentSize )
+        {
+            labelBuffer.append( buffer, labelStartIdx, contentSize - labelStartIdx );
+        }
+    }
+
+    protected char[] getEndMarker()
+    {
+        return END_MARKER;
+    }
+
+    protected String getStateName()
+    {
+        return "Internal Link";
+    }
+
+    public void endState( Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        String href = urlBuffer.toString();
+        String urlLabel = href;
+        
+        if ( !URLUtils.isAbsolute( href ) )
+        {
+            String baseUrl = options.getBaseUrl();
+            String spaceToken = options.getUrlSpaceToken();
+            
+            href = URLUtils.appendToBaseURL( baseUrl, href );
+            
+            if ( spaceToken != null )
+            {
+                href = href.replaceAll( " ", spaceToken );
+            }
+        }
+        
+        if ( href.length() < 1 )
+        {
+            throw new ParseException( null, "No href provided for internal link.", options.getLine() );
+        }
+        
+        String label;
+        if ( labelBuffer != null && labelBuffer.length() > 0 )
+        {
+            label = labelBuffer.toString();
+        }
+        else
+        {
+            label = urlLabel;
+        }
+        
+        sink.link( href );
+        sink.text( label );
+        sink.link_();
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParser.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtils.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtils.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtils.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtils.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,124 @@
+package org.apache.maven.doxia.module.mediawiki.parser.util;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.StringTokenizer;
+
+public final class URLUtils
+{
+    
+    private URLUtils()
+    {
+    }
+    
+    public static boolean isAbsolute( String url )
+    {
+        return url.matches( "[a-zA-Z0-9]+:/?/?.+" );
+    }
+    
+    public static String appendToBaseURL( String baseUrl, String path )
+    {
+        // null checks; don't try to concat if one or both is null.
+        if ( path == null )
+        {
+            return baseUrl;
+        }
+        else if ( baseUrl == null )
+        {
+            return path;
+        }
+        
+        boolean baseWithSlash = baseUrl.endsWith( "/" );
+        boolean pathWithSlash = path.startsWith( "/" );
+        
+        // basic concat.
+        String result = null;
+        if ( baseWithSlash && !pathWithSlash )
+        {
+            result = baseUrl + path;
+        }
+        else if ( !baseWithSlash && pathWithSlash )
+        {
+            result = baseUrl + path;
+        }
+        else if ( baseWithSlash && pathWithSlash )
+        {
+            if ( path.length() > 1 )
+            {
+                result = baseUrl + path.substring( 1 );
+            }
+            else
+            {
+                result = baseUrl;
+            }
+        }
+        else
+        {
+            result = baseUrl + "/" + path;
+        }
+        
+        // '.' and '..' replacement...
+        result = result.replaceAll( "\\/\\.\\/", "/" );
+        result = adjustForDoubleDotPathParts( result );
+        
+        return result;
+    }
+
+    private static String adjustForDoubleDotPathParts( String input )
+    {
+        // trim off the protocol, save it for later.
+        String proto = "";
+        if ( isAbsolute( input ) )
+        {
+            int trimIdx = input.indexOf( ":" ) + 1;
+            proto = input.substring( 0, trimIdx );
+            input = input.substring( trimIdx );
+            
+            while ( input.startsWith( "/" ) )
+            {
+                proto += "/";
+                
+                if ( input.length() > 1 )
+                {
+                    input = input.substring( 1 );
+                }
+                else
+                {
+                    input = "";
+                }
+            }
+        }
+        
+        LinkedList pathParts = new LinkedList();
+        StringTokenizer tokens = new StringTokenizer( input, "/" );
+        
+        while( tokens.hasMoreTokens() )
+        {
+            String token = tokens.nextToken();
+            
+            if ( "..".equals( token.trim() ) )
+            {
+                pathParts.removeLast();
+            }
+            else
+            {
+                pathParts.add( token );
+            }
+        }
+        
+        StringBuffer resultBuffer = new StringBuffer();
+        for ( Iterator it = pathParts.iterator(); it.hasNext(); )
+        {
+            String part = (String) it.next();
+            
+            resultBuffer.append( part );
+            if ( it.hasNext() )
+            {
+                resultBuffer.append( "/" );
+            }
+        }
+        
+        return proto + resultBuffer.toString();
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/main/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtils.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParserTCK.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParserTCK.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParserTCK.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParserTCK.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,36 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+import junit.framework.TestCase;
+
+public abstract class AbstractStateParserTCK
+    extends TestCase
+{
+
+    public abstract void testConsume_EndMarkerNotPresent()
+        throws ParseException;
+
+    public abstract void testConsume_EndMarkerAtBeginningOfBuffer()
+        throws ParseException;
+
+    public abstract void testConsume_EndMarkerAtEndOfBuffer()
+        throws ParseException;
+
+    public abstract void testConsume_EndMarkerInMiddleOfBuffer()
+        throws ParseException;
+
+    public abstract void testConsume_EndMarkerPartialAtEndOfBuffer()
+        throws ParseException;
+
+    protected void assertConsume( StateParser parser, String testInput, int testResult, Sink sink, ParsingContext options )
+        throws ParseException
+    {
+        int result = parser.consume( testInput, testInput.length(), sink, options );
+
+        assertEquals( "Remaining unconsumed input is incorrect.", testResult, result );
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParserTCK.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/AbstractStateParserTCK.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParserTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParserTest.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParserTest.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParserTest.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,45 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state.format;
+
+import org.apache.maven.doxia.module.mediawiki.parser.state.AbstractStateParserTCK;
+import org.apache.maven.doxia.parser.ParseException;
+
+public class ItalicFormatParserTest
+    extends AbstractStateParserTCK
+{
+
+    public void testConsume_EndMarkerAtBeginningOfBuffer()
+        throws ParseException
+    {
+        // TODO Implement
+        fail( "not implemented" );
+    }
+
+    public void testConsume_EndMarkerAtEndOfBuffer()
+        throws ParseException
+    {
+        // TODO Implement
+        fail( "not implemented" );
+    }
+
+    public void testConsume_EndMarkerInMiddleOfBuffer()
+        throws ParseException
+    {
+        // TODO Implement
+        fail( "not implemented" );
+    }
+
+    public void testConsume_EndMarkerNotPresent()
+        throws ParseException
+    {
+        // TODO Implement
+        fail( "not implemented" );
+    }
+
+    public void testConsume_EndMarkerPartialAtEndOfBuffer()
+        throws ParseException
+    {
+        // TODO Implement
+        fail( "not implemented" );
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParserTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/format/ItalicFormatParserTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParserTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParserTest.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParserTest.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParserTest.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,133 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state.link;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.module.mediawiki.parser.state.AbstractStateParserTCK;
+import org.apache.maven.doxia.module.mediawiki.parser.state.StateParser;
+import org.apache.maven.doxia.module.mediawiki.parser.testutil.MockManager;
+import org.apache.maven.doxia.module.mediawiki.parser.testutil.ParserOptionsMockAndControl;
+import org.apache.maven.doxia.module.mediawiki.parser.testutil.SinkMockAndControl;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+public class ExternalLinkParserTest
+    extends AbstractStateParserTCK
+{
+
+    public void testConsume_EndMarkerNotPresent()
+        throws ParseException
+    {
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "http://www.google.com", "link", mm );
+        ParserOptionsMockAndControl optionsMac = new ParserOptionsMockAndControl();
+        
+        mm.register( optionsMac );
+        
+        mm.replayAll();
+        
+        StateParser parser = newParser();
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        assertConsume( parser, "http://www.google.com link", -1, sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    private SinkMockAndControl newSinkMock( String href, String label, MockManager mm )
+    {
+        SinkMockAndControl mac = new SinkMockAndControl();
+        
+        mm.register( mac );
+        
+        mac.link( href );
+        mac.text( label );
+        mac.link_();
+        
+        return mac;
+    }
+
+    private ExternalLinkParser newParser()
+    {
+        return new ExternalLinkParser();
+    }
+
+    public void testConsume_EndMarkerAtBeginningOfBuffer()
+        throws ParseException
+    {
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "http://www.google.com", "link", mm );
+        ParserOptionsMockAndControl optionsMac = new ParserOptionsMockAndControl();
+        
+        mm.register( optionsMac );
+        
+        mm.replayAll();
+        
+        StateParser parser = newParser();
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String startLink = "http://www.google.com link";
+        parser.consume( startLink, startLink.length(), sink, options );
+        
+        assertConsume( parser, "] other text", 1, sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    public void testConsume_EndMarkerAtEndOfBuffer()
+        throws ParseException
+    {
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "http://www.google.com", "link", mm );
+        ParserOptionsMockAndControl optionsMac = new ParserOptionsMockAndControl();
+        
+        mm.register( optionsMac );
+        
+        mm.replayAll();
+        
+        StateParser parser = newParser();
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        assertConsume( parser, "http://www.google.com link]", -1, sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    public void testConsume_EndMarkerInMiddleOfBuffer()
+        throws ParseException
+    {
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "http://www.google.com", "link", mm );
+        ParserOptionsMockAndControl optionsMac = new ParserOptionsMockAndControl();
+        
+        mm.register( optionsMac );
+        
+        mm.replayAll();
+        
+        StateParser parser = newParser();
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String link = "http://www.google.com link]";
+        
+        assertConsume( parser, link + " other text", link.length(), sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    public void testConsume_EndMarkerPartialAtEndOfBuffer()
+        throws ParseException
+    {
+        System.out.println( "SKIPPED: single-character end marker." );
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParserTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/ExternalLinkParserTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParserTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParserTest.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParserTest.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParserTest.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,258 @@
+package org.apache.maven.doxia.module.mediawiki.parser.state.link;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.apache.maven.doxia.module.mediawiki.parser.state.AbstractStateParserTCK;
+import org.apache.maven.doxia.module.mediawiki.parser.state.StateParser;
+import org.apache.maven.doxia.module.mediawiki.parser.testutil.MockManager;
+import org.apache.maven.doxia.module.mediawiki.parser.testutil.ParserOptionsMockAndControl;
+import org.apache.maven.doxia.module.mediawiki.parser.testutil.SinkMockAndControl;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.sink.Sink;
+
+import java.net.MalformedURLException;
+
+public class InternalLinkParserTest
+    extends AbstractStateParserTCK
+{
+    
+    public void testConsume_EndMarkerNotPresent()
+        throws ParseException
+    {
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "internal-url", "link", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( null, null, mm );
+        
+        mm.replayAll();
+        
+        StateParser parser = newParser();
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        assertConsume( parser, "internal-url|link", -1, sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    private SinkMockAndControl newSinkMock( String href, String label, MockManager mm )
+    {
+        SinkMockAndControl mac = new SinkMockAndControl();
+        
+        mm.register( mac );
+        
+        mac.link( href );
+        mac.text( label );
+        mac.link_();
+        
+        return mac;
+    }
+
+    private InternalLinkParser newParser()
+    {
+        return new InternalLinkParser();
+    }
+
+    public void testConsume_EndMarkerAtBeginningOfBuffer()
+        throws ParseException
+    {
+        StateParser parser = newParser();
+
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "internal-url", "link", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( null, null, mm );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        String startLink = "internal-url|link";
+        
+        parser.consume( startLink, startLink.length(), sink, options );
+        assertConsume( parser, "]] other text", 2, sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+        
+    }
+
+    public void testConsume_EndMarkerAtEndOfBuffer()
+        throws ParseException
+    {
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "internal-url", "link", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( null, null, mm );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        StateParser parser = newParser();
+        
+        assertConsume( parser, "internal-url|link]]", -1, sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    public void testConsume_EndMarkerInMiddleOfBuffer()
+        throws ParseException
+    {
+        StateParser parser = newParser();
+
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "internal-url", "link", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( null, null, mm );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String link = "internal-url|link]]";
+
+        assertConsume( parser, link + " other text", link.length(), sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    public void testConsume_EndMarkerPartialAtEndOfBuffer()
+        throws ParseException
+    {
+        StateParser parser = newParser();
+
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "internal-url", "link", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( null, null, mm );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String startLink = "internal-url|link]";
+        
+        parser.consume( startLink, startLink.length(), sink, options );
+        assertConsume( parser, "] other text", 1, sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+    
+    public void testAddToDocument_SimpleAdd() throws ParseException, MalformedURLException
+    {
+        StateParser parser = newParser();
+
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "http://www.site.com/internal-url", "link", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( "http://www.site.com", "_", mm );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String startLink = "internal-url|link]]";
+        parser.consume( startLink, startLink.length(), sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    private ParserOptionsMockAndControl newOptionsMock( String baseUrl, String urlSpaceToken, MockManager mm )
+    {
+        ParserOptionsMockAndControl optionsMac = new ParserOptionsMockAndControl();
+        
+        mm.register( optionsMac );
+        
+        optionsMac.getBaseUrl( baseUrl );
+        optionsMac.getUrlSpaceToken( urlSpaceToken );
+        
+        return optionsMac;
+    }
+
+    public void testAddToDocument_NoLabel() throws ParseException, MalformedURLException
+    {
+        StateParser parser = newParser();
+
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "http://www.site.com/internal-url", "internal-url", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( "http://www.site.com", "_", mm );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String startLink = "internal-url]]";
+        parser.consume( startLink, startLink.length(), sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    public void testAddToDocument_HrefWithSpace() throws ParseException, MalformedURLException
+    {
+        StateParser parser = newParser();
+
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = newSinkMock( "http://www.site.com/internal_url", "link", mm );
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( "http://www.site.com", "_", mm );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String startLink = "internal url|link]]";
+        parser.consume( startLink, startLink.length(), sink, options );
+        parser.endState( sink, options );
+        
+        mm.verifyAll();
+    }
+
+    public void testAddToDocument_MissingHref() throws ParseException
+    {
+        StateParser parser = newParser();
+
+        MockManager mm = new MockManager();
+        
+        SinkMockAndControl sinkMac = new SinkMockAndControl();
+        mm.register( sinkMac );
+        
+        ParserOptionsMockAndControl optionsMac = newOptionsMock( null, null, mm );
+        
+        optionsMac.getLine( 1 );
+        
+        mm.replayAll();
+        
+        Sink sink = sinkMac.getSink();
+        ParsingContext options = optionsMac.getOptions();
+        
+        String startLink = "|link]]";
+        parser.consume( startLink, startLink.length(), sink, options );
+        
+        try
+        {
+            parser.endState( sink, options );
+            
+            fail( "Failed to throw exception when url is missing." );
+        }
+        catch ( ParseException e )
+        {
+            // expected
+        }
+        
+        mm.verifyAll();
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParserTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/state/link/InternalLinkParserTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockAndControl.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockAndControl.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockAndControl.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockAndControl.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,10 @@
+package org.apache.maven.doxia.module.mediawiki.parser.testutil;
+
+import org.easymock.MockControl;
+
+public interface MockAndControl
+{
+    
+    MockControl getControl();
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockAndControl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockAndControl.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockManager.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockManager.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockManager.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,54 @@
+package org.apache.maven.doxia.module.mediawiki.parser.testutil;
+
+import org.easymock.MockControl;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public class MockManager
+{
+    
+    private Set controls = new HashSet();
+    
+    public void register( MockControl control )
+    {
+        controls.add( control );
+    }
+    
+    public void register( MockAndControl mac )
+    {
+        controls.add( mac.getControl() );
+    }
+    
+    public void replayAll()
+    {
+        for ( Iterator it = controls.iterator(); it.hasNext(); )
+        {
+            MockControl control = (MockControl) it.next();
+            
+            control.replay();
+        }
+    }
+    
+    public void resetAll()
+    {
+        for ( Iterator it = controls.iterator(); it.hasNext(); )
+        {
+            MockControl control = (MockControl) it.next();
+            
+            control.reset();
+        }
+    }
+
+    public void verifyAll()
+    {
+        for ( Iterator it = controls.iterator(); it.hasNext(); )
+        {
+            MockControl control = (MockControl) it.next();
+            
+            control.verify();
+        }
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/MockManager.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/ParserOptionsMockAndControl.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/ParserOptionsMockAndControl.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/ParserOptionsMockAndControl.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/ParserOptionsMockAndControl.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,54 @@
+package org.apache.maven.doxia.module.mediawiki.parser.testutil;
+
+import org.apache.maven.doxia.module.mediawiki.parser.ParsingContext;
+import org.easymock.MockControl;
+
+public class ParserOptionsMockAndControl
+    implements MockAndControl
+{
+
+    private MockControl control;
+
+    private ParsingContext options;
+
+    public ParserOptionsMockAndControl()
+    {
+        control = MockControl.createControl( ParsingContext.class );
+        options = (ParsingContext) control.getMock();
+    }
+
+    public MockControl getControl()
+    {
+        return control;
+    }
+
+    public ParsingContext getOptions()
+    {
+        return options;
+    }
+
+    public void getBaseUrl( String returnValue )
+    {
+        options.getBaseUrl();
+        control.setReturnValue( returnValue, MockControl.ZERO_OR_MORE );
+    }
+
+    public void getUrlSpaceToken( String returnValue )
+    {
+        options.getUrlSpaceToken();
+        control.setReturnValue( returnValue, MockControl.ZERO_OR_MORE );
+    }
+    
+    public void incrementLine()
+    {
+        options.incrementLine();
+        control.setVoidCallable();
+    }
+    
+    public void getLine( int line )
+    {
+        options.getLine();
+        control.setReturnValue( line );
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/ParserOptionsMockAndControl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/ParserOptionsMockAndControl.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/SinkMockAndControl.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/SinkMockAndControl.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/SinkMockAndControl.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/SinkMockAndControl.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,574 @@
+package org.apache.maven.doxia.module.mediawiki.parser.testutil;
+
+import org.apache.maven.doxia.sink.Sink;
+import org.easymock.MockControl;
+
+public class SinkMockAndControl
+    implements MockAndControl
+{
+
+    private MockControl control;
+
+    private Sink sink;
+
+    public SinkMockAndControl()
+    {
+        control = MockControl.createControl( Sink.class );
+        sink = (Sink) control.getMock();
+    }
+
+    public MockControl getControl()
+    {
+        return control;
+    }
+
+    public Sink getSink()
+    {
+        return sink;
+    }
+
+    public void replay()
+    {
+        control.replay();
+    }
+
+    public void verify()
+    {
+        control.verify();
+    }
+
+    public void anchor_()
+    {
+        sink.anchor_();
+        control.setVoidCallable();
+    }
+
+    public void anchor( String name )
+    {
+        sink.anchor( name );
+        control.setVoidCallable();
+    }
+
+    public void author_()
+    {
+        sink.author_();
+        control.setVoidCallable();
+    }
+
+    public void author()
+    {
+        sink.author();
+        control.setVoidCallable();
+    }
+
+    public void body_()
+    {
+        sink.body_();
+        control.setVoidCallable();
+    }
+
+    public void body()
+    {
+        sink.body();
+        control.setVoidCallable();
+    }
+
+    public void bold_()
+    {
+        sink.bold_();
+        control.setVoidCallable();
+    }
+
+    public void bold()
+    {
+        sink.bold();
+        control.setVoidCallable();
+    }
+
+    public void close()
+    {
+        sink.close();
+        control.setVoidCallable();
+    }
+
+    public void date_()
+    {
+        sink.date_();
+        control.setVoidCallable();
+    }
+
+    public void date()
+    {
+        sink.date();
+        control.setVoidCallable();
+    }
+
+    public void definedTerm_()
+    {
+        sink.definedTerm_();
+        control.setVoidCallable();
+    }
+
+    public void definedTerm()
+    {
+        sink.definedTerm();
+        control.setVoidCallable();
+    }
+
+    public void definition_()
+    {
+        sink.definition_();
+        control.setVoidCallable();
+    }
+
+    public void definition()
+    {
+        sink.definition();
+        control.setVoidCallable();
+    }
+
+    public void definitionList_()
+    {
+        sink.definitionList_();
+        control.setVoidCallable();
+    }
+
+    public void definitionList()
+    {
+        sink.definitionList();
+        control.setVoidCallable();
+    }
+
+    public void definitionListItem_()
+    {
+        sink.definitionListItem_();
+        control.setVoidCallable();
+    }
+
+    public void definitionListItem()
+    {
+        sink.definitionListItem();
+        control.setVoidCallable();
+    }
+
+    public void figure_()
+    {
+        sink.figure_();
+        control.setVoidCallable();
+    }
+
+    public void figure()
+    {
+        sink.figure();
+        control.setVoidCallable();
+    }
+
+    public void figureCaption_()
+    {
+        sink.figureCaption_();
+        control.setVoidCallable();
+    }
+
+    public void figureCaption()
+    {
+        sink.figureCaption();
+        control.setVoidCallable();
+    }
+
+    public void figureGraphics( String name )
+    {
+        sink.figureGraphics( name );
+        control.setVoidCallable();
+    }
+
+    public void flush()
+    {
+        sink.flush();
+        control.setVoidCallable();
+    }
+
+    public void head_()
+    {
+        sink.head_();
+        control.setVoidCallable();
+    }
+
+    public void head()
+    {
+        sink.head();
+        control.setVoidCallable();
+    }
+
+    public void horizontalRule()
+    {
+        sink.horizontalRule();
+        control.setVoidCallable();
+    }
+
+    public void italic_()
+    {
+        sink.italic_();
+        control.setVoidCallable();
+    }
+
+    public void italic()
+    {
+        sink.italic();
+        control.setVoidCallable();
+    }
+
+    public void lineBreak()
+    {
+        sink.lineBreak();
+        control.setVoidCallable();
+    }
+
+    public void link_()
+    {
+        sink.link_();
+        control.setVoidCallable();
+    }
+
+    public void link( String name )
+    {
+        sink.link( name );
+        control.setVoidCallable();
+    }
+
+    public void list_()
+    {
+        sink.list_();
+        control.setVoidCallable();
+    }
+
+    public void list()
+    {
+        sink.list();
+        control.setVoidCallable();
+    }
+
+    public void listItem_()
+    {
+        sink.listItem_();
+        control.setVoidCallable();
+    }
+
+    public void listItem()
+    {
+        sink.listItem();
+        control.setVoidCallable();
+    }
+
+    public void monospaced_()
+    {
+        sink.monospaced_();
+        control.setVoidCallable();
+    }
+
+    public void monospaced()
+    {
+        sink.monospaced();
+        control.setVoidCallable();
+    }
+
+    public void nonBreakingSpace()
+    {
+        sink.nonBreakingSpace();
+        control.setVoidCallable();
+    }
+
+    public void numberedList_()
+    {
+        sink.numberedList_();
+        control.setVoidCallable();
+    }
+
+    public void numberedList( int numbering )
+    {
+        sink.numberedList( numbering );
+        control.setVoidCallable();
+    }
+
+    public void numberedListItem_()
+    {
+        sink.numberedListItem_();
+        control.setVoidCallable();
+    }
+
+    public void numberedListItem()
+    {
+        sink.numberedListItem();
+        control.setVoidCallable();
+    }
+
+    public void pageBreak()
+    {
+        sink.pageBreak();
+        control.setVoidCallable();
+    }
+
+    public void paragraph_()
+    {
+        sink.paragraph_();
+        control.setVoidCallable();
+    }
+
+    public void paragraph()
+    {
+        sink.paragraph();
+        control.setVoidCallable();
+    }
+
+    public void rawText( String text )
+    {
+        sink.rawText( text );
+        control.setVoidCallable();
+    }
+
+    public void section1_()
+    {
+        sink.section1_();
+        control.setVoidCallable();
+    }
+
+    public void section1()
+    {
+        sink.section1();
+        control.setVoidCallable();
+    }
+
+    public void section2_()
+    {
+        sink.section2_();
+        control.setVoidCallable();
+    }
+
+    public void section2()
+    {
+        sink.section2();
+        control.setVoidCallable();
+    }
+
+    public void section3_()
+    {
+        sink.section3_();
+        control.setVoidCallable();
+    }
+
+    public void section3()
+    {
+        sink.section3();
+        control.setVoidCallable();
+    }
+
+    public void section4_()
+    {
+        sink.section4_();
+        control.setVoidCallable();
+    }
+
+    public void section4()
+    {
+        sink.section4();
+        control.setVoidCallable();
+    }
+
+    public void section5_()
+    {
+        sink.section5_();
+        control.setVoidCallable();
+    }
+
+    public void section5()
+    {
+        sink.section5();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle_()
+    {
+        sink.sectionTitle_();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle()
+    {
+        sink.sectionTitle();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle1_()
+    {
+        sink.sectionTitle1_();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle1()
+    {
+        sink.sectionTitle1();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle2_()
+    {
+        sink.sectionTitle2_();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle2()
+    {
+        sink.sectionTitle2();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle3_()
+    {
+        sink.sectionTitle3_();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle3()
+    {
+        sink.sectionTitle3();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle4_()
+    {
+        sink.sectionTitle4_();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle4()
+    {
+        sink.sectionTitle4();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle5_()
+    {
+        sink.sectionTitle5_();
+        control.setVoidCallable();
+    }
+
+    public void sectionTitle5()
+    {
+        sink.sectionTitle5();
+        control.setVoidCallable();
+    }
+
+    public void table_()
+    {
+        sink.table_();
+        control.setVoidCallable();
+    }
+
+    public void table()
+    {
+        sink.table();
+        control.setVoidCallable();
+    }
+
+    public void tableCaption_()
+    {
+        sink.tableCaption_();
+        control.setVoidCallable();
+    }
+
+    public void tableCaption()
+    {
+        sink.tableCaption();
+        control.setVoidCallable();
+    }
+
+    public void tableCell_()
+    {
+        sink.tableCell_();
+        control.setVoidCallable();
+    }
+
+    public void tableCell()
+    {
+        sink.tableCell();
+        control.setVoidCallable();
+    }
+
+    public void tableCell( String width )
+    {
+        sink.tableCell( width );
+        control.setVoidCallable();
+    }
+
+    public void tableHeaderCell_()
+    {
+        sink.tableHeaderCell_();
+        control.setVoidCallable();
+    }
+
+    public void tableHeaderCell()
+    {
+        sink.tableHeaderCell();
+        control.setVoidCallable();
+    }
+
+    public void tableHeaderCell( String width )
+    {
+        sink.tableHeaderCell( width );
+        control.setVoidCallable();
+    }
+
+    public void tableRow_()
+    {
+        sink.tableRow_();
+        control.setVoidCallable();
+    }
+
+    public void tableRow()
+    {
+        sink.tableRow();
+        control.setVoidCallable();
+    }
+
+    public void tableRows_()
+    {
+        sink.tableRows_();
+        control.setVoidCallable();
+    }
+
+    public void tableRows( int[] justification, boolean grid )
+    {
+        sink.tableRows( justification, grid );
+        control.setVoidCallable();
+    }
+
+    public void text( String text )
+    {
+        sink.text( text );
+        control.setVoidCallable();
+    }
+
+    public void title_()
+    {
+        sink.title_();
+        control.setVoidCallable();
+    }
+
+    public void title()
+    {
+        sink.title();
+        control.setVoidCallable();
+    }
+
+    public void verbatim_()
+    {
+        sink.verbatim_();
+        control.setVoidCallable();
+    }
+
+    public void verbatim( boolean boxed )
+    {
+        sink.verbatim( boxed );
+        control.setVoidCallable();
+    }
+
+}

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/SinkMockAndControl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/testutil/SinkMockAndControl.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtilsTest.java?view=auto&rev=528353
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtilsTest.java (added)
+++ maven/sandbox/trunk/doxia/doxia-module-mediawiki/src/test/java/org/apache/maven/doxia/module/mediawiki/parser/util/URLUtilsTest.java Thu Apr 12 21:48:00 2007
@@ -0,0 +1,106 @@
+package org.apache.maven.doxia.module.mediawiki.parser.util;
+
+import junit.framework.TestCase;
+
+public class URLUtilsTest
+    extends TestCase
+{
+    
+    public void testIsAbsolute_RelativeURL_RootOriented()
+    {
+        assertFalse( URLUtils.isAbsolute( "/other.html" ) );
+    }
+
+    public void testIsAbsolute_RelativeURL_LocalOriented()
+    {
+        assertFalse( URLUtils.isAbsolute( "index.html" ) );
+    }
+
+    public void testIsAbsolute_RelativeURL_RootOrientedNoExtension()
+    {
+        assertFalse( URLUtils.isAbsolute( "/app" ) );
+    }
+
+    public void testIsAbsolute_RelativeURL_LocalOrientedNoExtension()
+    {
+        assertFalse( URLUtils.isAbsolute( "app" ) );
+    }
+
+    public void testIsAbsolute_AbsoluteURL()
+    {
+        assertTrue( URLUtils.isAbsolute( "http://www.google.com/other.html" ) );
+    }
+
+    public void testIsAbsolute_AbsoluteURL_NoExtension()
+    {
+        assertTrue( URLUtils.isAbsolute( "http://www.google.com/app" ) );
+    }
+
+    public void testIsAbsolute_MailtoURL()
+    {
+        assertTrue( URLUtils.isAbsolute( "mailto:nobody@nowhere.com" ) );
+    }
+    
+    public void testAppendToBaseURL_BaseUrlWithTrailingSlash_PathWithLeadingSlash()
+    {
+        String base = "http://www.google.com/";
+        String path = "/index.html";
+        
+        assertEquals( "http://www.google.com/index.html", URLUtils.appendToBaseURL( base, path ) );
+    }
+
+    public void testAppendToBaseURL_BaseUrlWithoutTrailingSlash_PathWithLeadingSlash()
+    {
+        String base = "http://www.google.com";
+        String path = "/index.html";
+        
+        assertEquals( "http://www.google.com/index.html", URLUtils.appendToBaseURL( base, path ) );
+    }
+
+    public void testAppendToBaseURL_BaseUrlWithTrailingSlash_PathWithoutLeadingSlash()
+    {
+        String base = "http://www.google.com/";
+        String path = "index.html";
+        
+        assertEquals( "http://www.google.com/index.html", URLUtils.appendToBaseURL( base, path ) );
+    }
+
+    public void testAppendToBaseURL_BaseUrlWithoutTrailingSlash_PathWithoutLeadingSlash()
+    {
+        String base = "http://www.google.com";
+        String path = "index.html";
+        
+        assertEquals( "http://www.google.com/index.html", URLUtils.appendToBaseURL( base, path ) );
+    }
+
+    public void testAppendToBaseURL_NullBaseUrl()
+    {
+        String path = "index.html";
+        
+        assertEquals( path, URLUtils.appendToBaseURL( null, path ) );
+    }
+
+    public void testAppendToBaseURL_NullPath()
+    {
+        String base = "http://www.google.com";
+        
+        assertEquals( base, URLUtils.appendToBaseURL( base, null ) );
+    }
+
+    public void testAppendToBaseURL_RemoveSingleDotPathParts()
+    {
+        String base = "http://www.google.com/";
+        String path = "./index.html";
+        
+        assertEquals( "http://www.google.com/index.html", URLUtils.appendToBaseURL( base, path ) );
+    }
+
+    public void testAppendToBaseURL_AdjustForDoubleDotPathParts()
+    {
+        String base = "http://www.google.com/app/";
+        String path = "../index.html";
+        
+        assertEquals( "http://www.google.com/index.html", URLUtils.appendToBaseURL( base, path ) );
+    }
+
+}