svn commit: r1463018 - in /maven/doxia/doxia/trunk: doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java

[rfscholte]

Author: rfscholte
Date: Sun Mar 31 17:51:29 2013
New Revision: 1463018

URL: http://svn.apache.org/r1463018
Log:
Pull up assertMethods, these are very useful for other ParserTests as well

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java?rev=1463018&r1=1463017&r2=1463018&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
 Sun Mar 31 17:51:29 2013
@@ -23,12 +23,16 @@ import org.apache.maven.doxia.AbstractMo
 import org.apache.maven.doxia.sink.WellformednessCheckingSink;
 
 import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.apache.maven.doxia.sink.SinkEventElement;
 import org.apache.maven.doxia.sink.TextSink;
 import org.codehaus.plexus.util.IOUtil;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.util.Arrays;
+import java.util.Iterator;
 
 /**
  * Test the parsing of sample input files.
@@ -119,5 +123,25 @@ public abstract class AbstractParserTest
         }
     }
 
+    protected void assertEquals( SinkEventElement element, String name, 
Object... args )
+    {
+        assertTrue( name.equals( element.getName() ) && Arrays.equals( 
element.getArgs(), args ) );
+    }
+
+    protected void assertAttributeEquals( SinkEventElement element, String 
name, String attr, String value )
+    {
+        assertEquals( name, element.getName() );
+        SinkEventAttributeSet atts = (SinkEventAttributeSet) 
element.getArgs()[0];
+        assertEquals( value, atts.getAttribute( attr ) );
+    }
+
+    protected void assertEquals( Iterator<SinkEventElement> it, String... 
names )
+    {
+        for ( String name: names )
+        {
+            assertEquals( name, it.next().getName() );
+        }
+    }
+
 
 }

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java?rev=1463018&r1=1463017&r2=1463018&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
 Sun Mar 31 17:51:29 2013
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.Arrays;
 import java.util.Iterator;
 
 import org.apache.maven.doxia.parser.AbstractParserTest;
@@ -519,24 +518,4 @@ public class AptParserTest
     {
         return "apt";
     }
-    
-    protected void assertEquals( SinkEventElement element, String name, 
Object... args  )
-    {
-        assertTrue( name.equals( element.getName() ) && Arrays.equals( 
element.getArgs(), args ) );
-    }
-
-    protected void assertAttributeEquals( SinkEventElement element, String 
name, String attr, String value  )
-    {
-        assertEquals( name, element.getName() );
-        SinkEventAttributeSet atts = (SinkEventAttributeSet) 
element.getArgs()[0];
-        assertEquals( value, atts.getAttribute( attr ) );
-    }
-
-    protected void assertEquals( Iterator<SinkEventElement> it, String... 
names )
-    {
-        for ( String name: names )
-        {
-            assertEquals( name, it.next().getName() );
-        }
-    }
 }