pauldick    2002/06/10 12:00:15

  Modified:    test/java/src/org/apache/qetest/dtm
                        TimeDTMTraverserDeep.java TimeDTMTraverserFlat.java
  Log:
  Minor Cleanup, before integration with harness.
  
  Revision  Changes    Path
  1.3       +8 -7      
xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTraverserDeep.java
  
  Index: TimeDTMTraverserDeep.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTraverserDeep.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TimeDTMTraverserDeep.java 26 Apr 2002 21:51:28 -0000      1.2
  +++ TimeDTMTraverserDeep.java 10 Jun 2002 19:00:15 -0000      1.3
  @@ -105,7 +105,7 @@
     {
        long dtmStart = 0;              // Time the creation of dtmManager, and 
dtm initialization.
   
  -     System.out.println("\nTesting Traversal of DEEP documents.");
  +     System.out.println("\n#### Testing Traversal of DEEP documents. ####");
        try
       {
                // Pick our input source
  @@ -148,12 +148,13 @@
          // Time the creation of the dtm
   
   
  -       System.out.println("Pre-DTM free memory:" + 
Runtime.getRuntime().freeMemory());
          dtmStart = System.currentTimeMillis();
         DTMManager manager= new DTMManagerDefault().newInstance(new 
XMLStringFactoryImpl());
         DTM dtm=manager.getDTM(source, true, stripper, false, true);
  +       System.out.println("DTM initialization took: "+ 
(System.currentTimeMillis() - dtmStart)+ "\n");
  +
  +       System.out.println("Pre-DTM free memory:" + 
Runtime.getRuntime().freeMemory());
          System.out.println("Post-DTM free memory:" + 
Runtime.getRuntime().freeMemory());
  -       System.out.println("DTM initialization took: "+ 
(System.currentTimeMillis() - dtmStart));
          Runtime.getRuntime().gc();
          System.out.println("Post-GC free memory:" + 
Runtime.getRuntime().freeMemory());
   
  @@ -168,12 +169,12 @@
          int[] rtData = {0,0,0};               // returns Traversal time, last 
node, number of nodes traversed 
   
          // Get a traverser for Descendant:: axis.
  -       System.out.println("\n#### DESCENDANT from "+"<"+DNodeName+">");
  +       System.out.println("\n* DESCENDANT from "+"<"+DNodeName+">");
          timeAxis(dtm, Axis.DESCENDANT, DNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
          // Get a traverser for Descendant:: axis.
  -       System.out.println("\n#### DESCENDANT-OR-SELF from 
"+"<"+DNodeName+">");
  +       System.out.println("\n* DESCENDANT-OR-SELF from "+"<"+DNodeName+">");
          timeAxis(dtm, Axis.DESCENDANTORSELF, DNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
  @@ -182,12 +183,12 @@
          String lastNodeName = dtm.getNodeName(lastNode);
   
          // Get a traverser for Ancestor:: axis.
  -       System.out.println("\n#### ANCESTOR from "+"<"+lastNodeName+">");     
  +       System.out.println("\n* ANCESTOR from "+"<"+lastNodeName+">");        
          timeAxis(dtm, Axis.ANCESTOR, lastNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
          // Get a traverser for Ancestor:: axis.
  -       System.out.println("\n#### ANCESTOR-OR-SELF from 
"+"<"+lastNodeName+">");     
  +       System.out.println("\n* ANCESTOR-OR-SELF from 
"+"<"+lastNodeName+">");        
          timeAxis(dtm, Axis.ANCESTORORSELF, lastNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
        }
  
  
  
  1.3       +8 -8      
xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTraverserFlat.java
  
  Index: TimeDTMTraverserFlat.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTraverserFlat.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TimeDTMTraverserFlat.java 26 Apr 2002 21:51:28 -0000      1.2
  +++ TimeDTMTraverserFlat.java 10 Jun 2002 19:00:15 -0000      1.3
  @@ -104,7 +104,7 @@
     public static void main(String argv[])
     {
       long dtmStart = 0;
  -     System.out.println("\nTesting Traversal of FLAT documents.");
  +     System.out.println("\n#### Testing Traversal of FLAT documents. ####");
       try
       {
                // Pick our input source
  @@ -160,22 +160,22 @@
          int[] rtData = {0,0,0};                               // holds return 
data from timing routine
   
          // Get a traverser for Child:: axis.
  -       System.out.println("\n#### CHILD from "+"<"+DNodeName+">");
  +       System.out.println("\n* CHILD from "+"<"+DNodeName+">");
          timeAxis(dtm, Axis.CHILD, DNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
          // Get a traverser for Following:: axis.
  -       System.out.println("\n#### FOLLOWING from "+"<"+ANodeName+">");
  +       System.out.println("\n* FOLLOWING from "+"<"+ANodeName+">");
          timeAxis(dtm, Axis.FOLLOWING,ANode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
          // Get a traverser for Following-sibling:: axis.
  -       System.out.println("\n#### FOLLOWINGSIBLING from "+"<"+ANodeName+">");
  +       System.out.println("\n* FOLLOWINGSIBLING from "+"<"+ANodeName+">");
          timeAxis(dtm, Axis.FOLLOWING,ANode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
          // Get a traverser for Descendant:: axis.
  -       System.out.println("\n#### DESCENDANT from "+"<"+DNodeName+">");
  +       System.out.println("\n* DESCENDANT from "+"<"+DNodeName+">");
          timeAxis(dtm, Axis.DESCENDANT, DNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
  @@ -184,17 +184,17 @@
          String lastNodeName = dtm.getNodeName(lastNode);
   
          // Get a traverser for Ancestor:: axis.
  -       System.out.println("\n#### ANCESTOR from "+"<"+lastNodeName+">");     
  +       System.out.println("\n* ANCESTOR from "+"<"+lastNodeName+">");        
          timeAxis(dtm, Axis.ANCESTOR, lastNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
          // Get a traverser for Preceding:: axis.
  -       System.out.println("\n#### PRECEDING from "+"<"+lastNodeName+">");    
                   
  +       System.out.println("\n* PRECEDING from "+"<"+lastNodeName+">");       
                   
          timeAxis(dtm, Axis.PRECEDING, lastNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
          // Get a traverser for Preceding:: axis.
  -       System.out.println("\n#### PRECEDING-SIBLING from 
"+"<"+lastNodeName+">");                       
  +       System.out.println("\n* PRECEDING-SIBLING from 
"+"<"+lastNodeName+">");                          
          timeAxis(dtm, Axis.PRECEDINGSIBLING, lastNode, rtData);
          System.out.println("Time="+rtData[0] + " : " + 
"LastNode="+rtData[1]+" nodes="+rtData[2]);
   
  
  
  

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

Reply via email to