You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@apache.org on 2001/10/29 16:40:32 UTC

cvs commit: xml-xalan/test/tests/extensions/java javaBugzilla3722.java javaBugzilla3722.xsl

curcuru     01/10/29 07:40:32

  Modified:    test/tests/extensions/java javaBugzilla3722.java
                        javaBugzilla3722.xsl
  Log:
  Update to produce better output; test should now pass
  
  Revision  Changes    Path
  1.2       +17 -23    xml-xalan/test/tests/extensions/java/javaBugzilla3722.java
  
  Index: javaBugzilla3722.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/extensions/java/javaBugzilla3722.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- javaBugzilla3722.java	2001/09/21 19:46:21	1.1
  +++ javaBugzilla3722.java	2001/10/29 15:40:32	1.2
  @@ -48,17 +48,26 @@
                           } 
                           catch (Exception e) 
                           {
  -                            extnLogger.logThrowable(Logger.ERRORMSG, e, "dumpConfig threw:");
  -                            extnLogger.checkFail("dumpConfig threw unexpected exception");
  +                            if (extnLogger == null) 
  +                            {
  +                                e.printStackTrace();
  +                                throw new RuntimeException("FATAL ERROR: javaBugzilla3722 has no logger; " + e.toString());
  +                            }
  +                            else
  +                            {
  +                                extnLogger.logThrowable(Logger.ERRORMSG, e, "dumpConfig threw:");
  +                                extnLogger.checkFail("dumpConfig threw unexpected exception");
  +                            }
                           }
                       } else 
                       {
  -                        extnLogger.logMsg(Logger.INFOMSG, "<" + node.getNodeName() + "/>");
  +                        // Output info about the node for later debugging
  +                        counters.put(node.getNodeName(), node.getNodeValue());
                       }
                   }
               }
           }
  -        return "dumpConfig-done";
  +        return "dumpConfig.count=" + counter;
       }
   
       //// Implementations of TestableExtension
  @@ -105,25 +114,10 @@
           // Supply default value
           if (null == fileChecker)
               fileChecker = new XHTFileCheckService();
  -        if (Logger.PASS_RESULT
  -            != fileChecker.check(logger,
  -                                 new File(datalet.outputName), 
  -                                 new File(datalet.goldName), 
  -                                 "Extension test of " + datalet.getDescription())
  -           )
  -        {
  -            // Log a custom element with all the file refs first
  -            // Closely related to viewResults.xsl select='fileref"
  -            //@todo check that these links are valid when base 
  -            //  paths are either relative or absolute!
  -            Hashtable attrs = new Hashtable();
  -            attrs.put("idref", (new File(datalet.inputName)).getName());
  -            attrs.put("inputName", datalet.inputName);
  -            attrs.put("xmlName", datalet.xmlName);
  -            attrs.put("outputName", datalet.outputName);
  -            attrs.put("goldName", datalet.goldName);
  -            logger.logElement(Logger.STATUSMSG, "fileref", attrs, "Extension test file references");
  -        }
  +        fileChecker.check(logger,
  +                          new File(datalet.outputName), 
  +                          new File(datalet.goldName), 
  +                          "Extension test of " + datalet.getDescription());
       }
   
   
  
  
  
  1.2       +1 -1      xml-xalan/test/tests/extensions/java/javaBugzilla3722.xsl
  
  Index: javaBugzilla3722.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/extensions/java/javaBugzilla3722.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- javaBugzilla3722.xsl	2001/09/21 19:46:21	1.1
  +++ javaBugzilla3722.xsl	2001/10/29 15:40:32	1.2
  @@ -18,7 +18,7 @@
   
      <xsl:template match="matcher">
         <xsl:variable name="config"><xsl:copy-of select="."/></xsl:variable>
  -      <xsl:value-of select="bug3722:dumpConfig($config)"/>
  +      <dumpConfig><xsl:value-of select="bug3722:dumpConfig($config)"/></dumpConfig>
      </xsl:template>
    
   </xsl:stylesheet>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org