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/02/01 17:51:24 UTC

cvs commit: xml-xalan/test/java/src/org/apache/qetest/xsl XSLDirectoryIterator.java XSLProcessorTestBase.java

curcuru     01/02/01 08:51:23

  Modified:    test/java/src/org/apache/qetest/xsl
                        XSLDirectoryIterator.java XSLProcessorTestBase.java
  Log:
  Regularlize how we log system.getProperties: now happens automatically for all tests
  
  Revision  Changes    Path
  1.6       +2 -7      xml-xalan/test/java/src/org/apache/qetest/xsl/XSLDirectoryIterator.java
  
  Index: XSLDirectoryIterator.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLDirectoryIterator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XSLDirectoryIterator.java	2001/01/19 21:43:12	1.5
  +++ XSLDirectoryIterator.java	2001/02/01 16:51:19	1.6
  @@ -99,7 +99,7 @@
    * </ul>
    * @todo improve file discovery - file execution paradigm
    * @author Shane Curcuru
  - * @version $Id: XSLDirectoryIterator.java,v 1.5 2001/01/19 21:43:12 curcuru Exp $
  + * @version $Id: XSLDirectoryIterator.java,v 1.6 2001/02/01 16:51:19 curcuru Exp $
    */
   public class XSLDirectoryIterator extends XSLProcessorTestBase
   {
  @@ -240,12 +240,9 @@
        */
       public void logTestProps()
       {
  -
           // Log out system/build info - use crit msg so it's always reported
           reporter.logCriticalMsg(getDescription());
  -        reporter.logHashtable(reporter.CRITICALMSG, System.getProperties(),
  -                              "System.getProperties");
  -        reporter.logHashtable(reporter.CRITICALMSG, testProps, "testProps");
  +        super.logTestProps();
       }
   
       /**
  @@ -261,8 +258,6 @@
           //      inputDir, reporter, category, outDir, goldDir, noErrTest, 
           //      plus each of the benchmarking variables: 
           //      overallTime, overallFilesProcessed, dirTime, dirFilesProcessed 
  -        // report out version info, properties, etc.
  -        logTestProps();
   
           // Ensure the inputDir is there - we must have a valid location for input files
           File testDirectory = new File(inputDir);
  
  
  
  1.9       +26 -1     xml-xalan/test/java/src/org/apache/qetest/xsl/XSLProcessorTestBase.java
  
  Index: XSLProcessorTestBase.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLProcessorTestBase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XSLProcessorTestBase.java	2001/01/19 21:43:13	1.8
  +++ XSLProcessorTestBase.java	2001/02/01 16:51:21	1.9
  @@ -91,7 +91,7 @@
    * <li>runErr</li>
    * </ul>
    * @author Shane_Curcuru@lotus.com
  - * @version $Id: XSLProcessorTestBase.java,v 1.8 2001/01/19 21:43:13 curcuru Exp $
  + * @version $Id: XSLProcessorTestBase.java,v 1.9 2001/02/01 16:51:21 curcuru Exp $
    */
   public class XSLProcessorTestBase extends FileBasedTest
   {
  @@ -350,6 +350,31 @@
           }
   
           return true;
  +    }
  +
  +    /**
  +     * Override mostly blank routine to dump environment info.
  +     * <p>Log out information about our environment in a structured way.</p>
  +     * @author Shane_Curcuru@lotus.com
  +     * @param p unused
  +     *
  +     * @return true always
  +     */
  +    public boolean postTestFileInit(Properties p)
  +    {
  +        logTestProps();
  +        return true;
  +    }
  +
  +    /**
  +     * Log out any version or system info.
  +     * <p>Logs System.getProperties(), and our the testProps block.</p>
  +     */
  +    public void logTestProps()
  +    {
  +        reporter.logHashtable(reporter.CRITICALMSG, System.getProperties(),
  +                              "System.getProperties");
  +        reporter.logHashtable(reporter.CRITICALMSG, testProps, "testProps");
       }
   
       // use other implementations from FileBasedTest