[Xdoclet-devel] CVS: generama/src/main/java/org/generama/tests AbstractJavaGeneratingPluginTestCase.java,1.1,1.2 AbstractPluginTestCase.java,1.1,1.2 package.html,1.1,1.2

[Aslak Helles?y]

Update of /cvsroot/xdoclet/generama/src/main/java/org/generama/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv26610/src/main/java/org/generama/tests

Modified Files:
        AbstractJavaGeneratingPluginTestCase.java 
        AbstractPluginTestCase.java package.html 
Log Message:
More refactorings, closer to a release

Index: AbstractJavaGeneratingPluginTestCase.java
===================================================================
RCS file: 
/cvsroot/xdoclet/generama/src/main/java/org/generama/tests/AbstractJavaGeneratingPluginTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AbstractJavaGeneratingPluginTestCase.java   20 Aug 2003 14:21:16 -0000      1.1
--- AbstractJavaGeneratingPluginTestCase.java   27 Aug 2003 08:33:29 -0000      1.2
***************
*** 4,7 ****
--- 4,12 ----
  
  import xjavadoc.codeunit.CodeTestCase;
+ import com.thoughtworks.qdox.JavaDocBuilder;
+ import com.thoughtworks.qdox.model.JavaSource;
+ import org.generama.Plugin;
+ import org.generama.WriterMapper;
+ import org.generama.defaults.AbstractJavaGeneratingPlugin;
  
  /**
***************
*** 18,20 ****
--- 23,41 ----
          CodeTestCase.assertAstEquals(expected, actual);
      }
+ 
+     protected Object createMetadata() {
+         JavaDocBuilder builder = new JavaDocBuilder();
+         JavaSource source = builder.addSource(getTestSource());
+         return source.getClasses()[0];
+     }
+ 
+     protected Reader getTestSource() {
+         throw new RuntimeException("Override this method in subclasses");
+     }
+ 
+     protected final Plugin createPlugin(WriterMapper writerMapper) throws Exception {
+         return createJavaGeneratingPlugin(writerMapper);
+     }
+ 
+     protected abstract AbstractJavaGeneratingPlugin 
createJavaGeneratingPlugin(WriterMapper writerMapper) throws Exception;
  }

Index: AbstractPluginTestCase.java
===================================================================
RCS file: 
/cvsroot/xdoclet/generama/src/main/java/org/generama/tests/AbstractPluginTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AbstractPluginTestCase.java 20 Aug 2003 14:21:16 -0000      1.1
--- AbstractPluginTestCase.java 27 Aug 2003 08:33:29 -0000      1.2
***************
*** 8,13 ****
--- 8,15 ----
  import java.io.InputStream;
  import java.io.InputStreamReader;
+ import java.io.Writer;
  
  import org.generama.Plugin;
+ import org.generama.WriterMapper;
  
  /**
***************
*** 20,27 ****
  
      public void testGenerateContent() throws Throwable {
!         Plugin plugin = createPlugin();
!         StringWriter sink = new StringWriter();
          Object metadata = createMetadata();
!         plugin.generate(sink, metadata);
          Reader expected = getExpected();
  
--- 22,37 ----
  
      public void testGenerateContent() throws Throwable {
!         final StringWriter sink = new StringWriter();
!         WriterMapper writerMapper = new WriterMapper() {
!             public Writer getWriter(Object metadata, Plugin plugin) {
!                 return sink;
!             }
!         };
!         Plugin plugin = createPlugin(writerMapper);
! 
          Object metadata = createMetadata();
!         if(plugin.shouldGenerate(metadata)) {
!             plugin.generate(metadata);
!         }
          Reader expected = getExpected();
  
***************
*** 39,45 ****
              throw e;
          }
      }
  
!     protected abstract Plugin createPlugin() throws Exception;
      protected abstract Object createMetadata();
      protected abstract Reader getExpected();
--- 49,58 ----
              throw e;
          }
+ 
+         // assert that the content was written to a file
+ 
      }
  
!     protected abstract Plugin createPlugin(WriterMapper writerMapper) throws 
Exception;
      protected abstract Object createMetadata();
      protected abstract Reader getExpected();

Index: package.html
===================================================================
RCS file: /cvsroot/xdoclet/generama/src/main/java/org/generama/tests/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** package.html        20 Aug 2003 14:21:16 -0000      1.1
--- package.html        27 Aug 2003 08:33:29 -0000      1.2
***************
*** 35,39 ****
  </table>
  <p>
! (Although we recommend JellyPlugin for generation of XML, it is possible to generate 
XML with VelocityPlugin subclasses.
  In that case, you should use <a 
href="AbstractXMLGeneratingPluginTestCase.html">AbstractXMLGeneratingPluginTestCase</a>
  to test the output.)
--- 35,39 ----
  </table>
  <p>
! (Although JellyPlugin is recommended for generation of XML, it is possible to 
generate XML with VelocityPlugin subclasses.
  In that case, you should use <a 
href="AbstractXMLGeneratingPluginTestCase.html">AbstractXMLGeneratingPluginTestCase</a>
  to test the output.)



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel