svn commit: r1544338 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java test/resources/macro/snippet/testSnippet.txt

[michaelo]

Author: michaelo
Date: Thu Nov 21 21:59:01 2013
New Revision: 1544338

URL: http://svn.apache.org/r1544338
Log:
[DOXIA-386] Snippet Macro: Reference file does not support UTF-8 file format to 
generate the page garbage

- Make clirr happy with a single-arg ctor
- Add Unicode text to the testSnippet.txt in Russian to test the 'encoding' 
parameter. Text reads "This snippet is in Unicode format (UTF-8)"

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
    
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
    
maven/doxia/doxia/trunk/doxia-core/src/test/resources/macro/snippet/testSnippet.txt

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java?rev=1544338&r1=1544337&r2=1544338&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
 Thu Nov 21 21:59:01 2013
@@ -58,6 +58,16 @@ public class SnippetReader
     }
 
     /**
+     * Constructor.
+     *
+     * @param src The source
+     */
+    public SnippetReader( URL src )
+    {
+        this( src, null ) ;
+    }
+
+    /**
      * Reads the snippet with given id.
      *
      * @param snippetId The id of the snippet.

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java?rev=1544338&r1=1544337&r2=1544338&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
 Thu Nov 21 21:59:01 2013
@@ -49,6 +49,7 @@ public class SnippetMacroTest
         File basedir = new File( getBasedir() );
         Map<String, Object> macroParameters = new HashMap<String, Object>();
         macroParameters.put( "file", 
"src/test/resources/macro/snippet/testSnippet.txt" );
+        macroParameters.put( "encoding", "UTF-8" );
 
         SinkEventTestingSink sink = new SinkEventTestingSink();
 
@@ -111,6 +112,23 @@ public class SnippetMacroTest
         assertFalse( snippet.contains( "interlude" ) );
         assertTrue( snippet.contains( "second snippet" ) );
         assertFalse( snippet.contains( "conclusion" ) );
+
+        // again
+
+        macroParameters.put( "id", "thirdId" );
+        macroParameters.put( "verbatim", "false" );
+        sink.reset();
+        request = new MacroRequest( macroParameters, basedir );
+        macro.execute( sink, request );
+
+        it = sink.getEventList().iterator();
+        event = it.next();
+        assertEquals( "rawText", event.getName() );
+        snippet = (String) event.getArgs()[0];
+        assertFalse( it.hasNext() );
+
+        // no need to verify the absence of the first and second snippets if 
tests above were successful
+        assertTrue( snippet.contains( "Этот сниппет в 
формате Unicode (UTF-8)" ) );
     }
 
     public void testIgnoreDownloadError()

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/resources/macro/snippet/testSnippet.txt
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/resources/macro/snippet/testSnippet.txt?rev=1544338&r1=1544337&r2=1544338&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/resources/macro/snippet/testSnippet.txt
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/resources/macro/snippet/testSnippet.txt
 Thu Nov 21 21:59:01 2013
@@ -11,4 +11,8 @@ another snippet to start: secondId
 second snippet
 another snippet to end:   secondId
 
+Unicode snippet start thirdId
+Этот сниппет в формате Unicode (UTF-8)
+Unicode snippet end thirdId
+
 conclusion