cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/reporters ResultCollector.java

[kcassell]

kcassell    2003/02/05 11:45:56

  Modified:    src/core/org/apache/jmeter/reporters ResultCollector.java
  Log:
  Added CSV support.
  
  Revision  Changes    Path
  1.13      +40 -7     
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
  
  Index: ResultCollector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ResultCollector.java      5 Feb 2003 05:12:08 -0000       1.12
  +++ ResultCollector.java      5 Feb 2003 19:45:56 -0000       1.13
  @@ -92,6 +92,7 @@
    * Title: Description: Copyright: Copyright (c) 2001 Company:
    *
    * @author Michael Stover
  + * @author     <a href="mailto:kcassell&#X0040;apache.org";>Keith Cassell</a>
    * @version $Id$
    */
   public class ResultCollector extends AbstractListenerElement
  @@ -226,13 +227,27 @@
   
       private static void writeFileStart(PrintWriter writer)
       {
  -        writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
  -        writer.println("<testResults>");
  +        if (SaveService.getOutputFormat() == SaveService.SAVE_AS_XML)
  +        {
  +            writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
  +            writer.println("<testResults>");
  +        }
  +        else if (SaveService.getOutputFormat() == SaveService.SAVE_AS_CSV)
  +        {
  +            if (SaveService.getPrintFieldNames())
  +            {
  +                writer.println(SaveService.printableFieldNamesToString());
  +            }
  +        }
       }
   
  +
       private void writeFileEnd()
       {
  -        out.print("</testResults>");
  +        if (SaveService.getOutputFormat() == SaveService.SAVE_AS_XML)
  +        {
  +            out.print("</testResults>");
  +        }
       }
   
       private static synchronized PrintWriter getFileWriter(String filename) throws 
IOException
  @@ -362,14 +377,32 @@
       public void sampleStopped(SampleEvent e)
       {}
   
  +
  +    /**
  +        When a test result is received, display it and save it.
  +        @param  e the sample event that was received
  +    **/
  +
       public void sampleOccurred(SampleEvent e)
       {
  -        if (!isErrorLogging() || !e.getResult().isSuccessful())
  +        SampleResult result = e.getResult();
  +
  +        if (!isErrorLogging() || !result.isSuccessful())
           {
  -            sendToVisualizer(e.getResult());
  +            sendToVisualizer(result);
  +
               try
               {
  -                recordResult(e.getResult());
  +                if (SaveService.getOutputFormat() == SaveService.SAVE_AS_CSV)
  +                {
  +                    String savee = SaveService.resultToDelimitedString(result);
  +                    out.println(savee);
  +                }
  +                // Save results as XML
  +                else
  +                {
  +                    recordResult(result);
  +                }
               }
               catch (Exception err)
               {
  
  
  

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