cvs commit: xml-fop/test/java/org/apache/fop/layoutengine LayoutEngineTester.java

2005-01-24 Thread jeremias 
jeremias2005/01/24 06:04:29

  Modified:test/java/org/apache/fop/layoutengine
LayoutEngineTester.java
  Log:
  Set base URL so relative URLs work in tests
  
  Revision  ChangesPath
  1.5   +6 -2  
xml-fop/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
  
  Index: LayoutEngineTester.java
  ===
  RCS file: 
/home/cvs/xml-fop/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LayoutEngineTester.java   17 Jan 2005 14:21:10 -  1.4
  +++ LayoutEngineTester.java   24 Jan 2005 14:04:29 -  1.5
  @@ -20,6 +20,7 @@
   
   import java.io.File;
   import java.lang.reflect.Constructor;
  +import java.net.MalformedURLException;
   import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
  @@ -101,8 +102,10 @@
* @param testFile Test case to run
* @throws TransformerException In case of an XSLT/JAXP problem
* @throws FOPException In case of a FOP problem
  + * @throws MalformedURLException if the base URL cannot be set
*/
  -public void runTest(File testFile) throws TransformerException, 
FOPException {
  +public void runTest(File testFile) 
  +throws TransformerException, FOPException, MalformedURLException 
{
   //Setup Transformer to convert the testcase XML to XSL-FO
   Transformer transformer = 
getTestcase2FOStylesheet().newTransformer();
   Source src = new StreamSource(testFile);
  @@ -114,6 +117,7 @@
   
   //Setup FOP for area tree rendering
   FOUserAgent ua = new FOUserAgent();
  +ua.setBaseURL(testFile.getParentFile().toURL().toString());
   XMLRenderer atrenderer = new XMLRenderer();
   atrenderer.setUserAgent(ua);
   atrenderer.setTransformerHandler(athandler);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/test/java/org/apache/fop/layoutengine LayoutEngineTester.java

2005-01-17 Thread jeremias 
jeremias2005/01/17 06:21:19

  Modified:test/java/org/apache/fop/layoutengine
LayoutEngineTester.java
  Log:
  getLocalName() doesn't seem to work in this case in JDK 1.4.1.
  
  Revision  ChangesPath
  1.4   +2 -2  
xml-fop/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
  
  Index: LayoutEngineTester.java
  ===
  RCS file: 
/home/cvs/xml-fop/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LayoutEngineTester.java   17 Jan 2005 12:56:07 -  1.3
  +++ LayoutEngineTester.java   17 Jan 2005 14:21:10 -  1.4
  @@ -136,7 +136,7 @@
* @return The newly create check
*/
   protected LayoutEngineCheck createCheck(Element el) {
  -String name = el.getLocalName();
  +String name = el.getTagName();
   Class clazz = (Class)CHECK_CLASSES.get(name);
   if (clazz != null) {
   try {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/test/java/org/apache/fop/layoutengine LayoutEngineTester.java

2005-01-17 Thread jeremias 
jeremias2005/01/17 04:56:08

  Modified:test/java/org/apache/fop/layoutengine
LayoutEngineTester.java
  Log:
  Using only DOM elements to create checks. This should help avoid errors due 
to comment nodes being passed to the factory method.
  
  Revision  ChangesPath
  1.3   +10 -7 
xml-fop/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
  
  Index: LayoutEngineTester.java
  ===
  RCS file: 
/home/cvs/xml-fop/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LayoutEngineTester.java   6 Jan 2005 08:39:19 -   1.2
  +++ LayoutEngineTester.java   17 Jan 2005 12:56:07 -  1.3
  @@ -44,6 +44,7 @@
   import org.apache.fop.fo.Constants;
   import org.apache.fop.render.xml.XMLRenderer;
   import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   
  @@ -130,17 +131,17 @@
   }
   
   /**
  - * Factory method to create checks from DOM nodes.
  - * @param node DOM node to create the check from
  + * Factory method to create checks from DOM elements.
  + * @param el DOM element to create the check from
* @return The newly create check
*/
  -protected LayoutEngineCheck createCheck(Node node) {
  -String name = node.getLocalName();
  +protected LayoutEngineCheck createCheck(Element el) {
  +String name = el.getLocalName();
   Class clazz = (Class)CHECK_CLASSES.get(name);
   if (clazz != null) {
   try {
   Constructor c = clazz.getDeclaredConstructor(new Class[] 
{Node.class});
  -LayoutEngineCheck instance = 
(LayoutEngineCheck)c.newInstance(new Object[] {node});
  +LayoutEngineCheck instance = 
(LayoutEngineCheck)c.newInstance(new Object[] {el});
   return instance;
   } catch (Exception e) {
   throw new RuntimeException("Error while instantiating check 
'" 
  @@ -168,7 +169,9 @@
   NodeList nodes = doc.getDocumentElement().getChildNodes();
   for (int i = 0; i < nodes.getLength(); i++) {
   Node node = nodes.item(i);
  -checks.add(createCheck(node));
  +if (node instanceof Element) {
  +checks.add(createCheck((Element)node));
  +}
   }
   
   Iterator i = checks.iterator();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]