[Jaffa-cvs] JaffaCore/source/unittest/java/org/jaffa/persistence/blackboxtests PerformanceTest.java, 1.2, 1.3

[Gautam J. <ga...@us...>]

Update of /cvsroot/jaffa/JaffaCore/source/unittest/java/org/jaffa/persistence/blackboxtests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24345/source/unittest/java/org/jaffa/persistence/blackboxtests

Modified Files:
	PerformanceTest.java 
Log Message:
Added the Wrapper so that the tables are correctly initialized, before running the tests

Index: PerformanceTest.java
===================================================================
RCS file: /cvsroot/jaffa/JaffaCore/source/unittest/java/org/jaffa/persistence/blackboxtests/PerformanceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PerformanceTest.java	17 Feb 2004 02:12:05 -0000	1.2
--- PerformanceTest.java	24 Jul 2007 01:43:06 -0000	1.3
***************
*** 61,64 ****
--- 61,66 ----
  import org.jaffa.persistence.Criteria;
  import java.util.*;
+ import junit.framework.Test;
+ import junit.framework.TestSuite;
  
  /**
***************
*** 67,73 ****
   */
  public class PerformanceTest extends TestCase {
! 
      private UOW m_uow = null;
! 
      /** Creates new QueryTest
       * @param name The name of the test case.
--- 69,82 ----
   */
  public class PerformanceTest extends TestCase {
!     
      private UOW m_uow = null;
!     
!     /** Assembles and returns a test suite containing all known tests.
!      * @return A test suite.
!      */
!     public static Test suite() {
!         return new Wrapper(new TestSuite(PerformanceTest.class));
!     }
!     
      /** Creates new QueryTest
       * @param name The name of the test case.
***************
*** 76,80 ****
          super(name);
      }
! 
      /** Sets up the fixture, by creating the UOW. This method is called before a test is executed.
       */
--- 85,89 ----
          super(name);
      }
!     
      /** Sets up the fixture, by creating the UOW. This method is called before a test is executed.
       */
***************
*** 87,91 ****
          }
      }
! 
      /** Tears down the fixture, by closing the UOW. This method is called after a test is executed.
       */
--- 96,100 ----
          }
      }
!     
      /** Tears down the fixture, by closing the UOW. This method is called after a test is executed.
       */
***************
*** 100,104 ****
          }
      }
! 
      /** This will first create 1000 item records.
       * It will then read them 5 times and display the average read time.
--- 109,113 ----
          }
      }
!     
      /** This will first create 1000 item records.
       * It will then read them 5 times and display the average read time.
***************
*** 112,116 ****
          }
      }
! 
      /** It will create 1000 Item records 5 times and display the average write time.
       */
--- 121,125 ----
          }
      }
!     
      /** It will create 1000 Item records 5 times and display the average write time.
       */
***************
*** 123,127 ****
          }
      }
! 
      /** This will first create 10000 item records.
       * It will then read them 5 times and display the average read time.
--- 132,136 ----
          }
      }
!     
      /** This will first create 10000 item records.
       * It will then read them 5 times and display the average read time.
***************
*** 135,139 ****
          }
      }
! 
      /** It will create 10000 Item records 5 times and display the average write time.
       */
--- 144,148 ----
          }
      }
!     
      /** It will create 10000 Item records 5 times and display the average write time.
       */
***************
*** 146,192 ****
          }
      }
! 
! 
! 
! 
      private void read(int recordSet, int cycles) throws Exception {
          long time = 0;
! 
          // ensure no records exist
          deleteItems("Z-TEST-PERF");
! 
          // create records
          createItems("Z-TEST-PERF", recordSet);
! 
          // read the Record Set 'n' times to calculate the average read-time
          for (int i = 0; i < cycles; i++)
              time += readItems("Z-TEST-PERF", recordSet);
! 
          // delete the record set
          deleteItems("Z-TEST-PERF");
! 
          // display the average read time
          System.out.println("Average Time for reading " + recordSet + " records = " + time/cycles + " ms");
      }
! 
      private void write(int recordSet, int cycles) throws Exception {
          long time = 0;
! 
          // create the Record Set 'n' times to calculate the average write-time
          for (int i = 0; i < cycles; i++) {
              // ensure no records exist
              deleteItems("Z-TEST-PERF");
! 
              // create records
              time += createItems("Z-TEST-PERF", recordSet);
          }
! 
          // delete the record set
          deleteItems("Z-TEST-PERF");
! 
          // display the average write time
          System.out.println("Average Time for writing " + recordSet + " records = " + time/cycles + " ms");
      }
! 
      /** Deletes Item records having item_id like 'itemIdBeginsWith%'.
       * This will commit the UOW and then acquire a new UOW.
--- 155,201 ----
          }
      }
!     
!     
!     
!     
      private void read(int recordSet, int cycles) throws Exception {
          long time = 0;
!         
          // ensure no records exist
          deleteItems("Z-TEST-PERF");
!         
          // create records
          createItems("Z-TEST-PERF", recordSet);
!         
          // read the Record Set 'n' times to calculate the average read-time
          for (int i = 0; i < cycles; i++)
              time += readItems("Z-TEST-PERF", recordSet);
!         
          // delete the record set
          deleteItems("Z-TEST-PERF");
!         
          // display the average read time
          System.out.println("Average Time for reading " + recordSet + " records = " + time/cycles + " ms");
      }
!     
      private void write(int recordSet, int cycles) throws Exception {
          long time = 0;
!         
          // create the Record Set 'n' times to calculate the average write-time
          for (int i = 0; i < cycles; i++) {
              // ensure no records exist
              deleteItems("Z-TEST-PERF");
!             
              // create records
              time += createItems("Z-TEST-PERF", recordSet);
          }
!         
          // delete the record set
          deleteItems("Z-TEST-PERF");
!         
          // display the average write time
          System.out.println("Average Time for writing " + recordSet + " records = " + time/cycles + " ms");
      }
!     
      /** Deletes Item records having item_id like 'itemIdBeginsWith%'.
       * This will commit the UOW and then acquire a new UOW.
***************
*** 200,209 ****
              m_uow.delete(item);
          }
! 
          // commit the exiting UOW and create a new one
          m_uow.commit();
          m_uow = new UOW();
      }
! 
      /** Creates Item records (no. of records = recordSet) having item_id like 'itemIdBeginsWith-N'.
       * This will commit the UOW and then acquire a new UOW.
--- 209,218 ----
              m_uow.delete(item);
          }
!         
          // commit the exiting UOW and create a new one
          m_uow.commit();
          m_uow = new UOW();
      }
!     
      /** Creates Item records (no. of records = recordSet) having item_id like 'itemIdBeginsWith-N'.
       * This will commit the UOW and then acquire a new UOW.
***************
*** 217,229 ****
              m_uow.add(item);
          }
! 
          // commit the exiting UOW and create a new one
          m_uow.commit();
          time = System.currentTimeMillis() - time;
! 
          m_uow = new UOW();
          return time;
      }
! 
      /** Reads Item records having item_id like 'itemIdBeginsWith%'.
       * An assertion error will be thrown if the no. of records retrieved does not match the input recordSet.
--- 226,238 ----
              m_uow.add(item);
          }
!         
          // commit the exiting UOW and create a new one
          m_uow.commit();
          time = System.currentTimeMillis() - time;
!         
          m_uow = new UOW();
          return time;
      }
!     
      /** Reads Item records having item_id like 'itemIdBeginsWith%'.
       * An assertion error will be thrown if the no. of records retrieved does not match the input recordSet.
***************
*** 244,249 ****
          return time;
      }
! 
! 
! 
  }
--- 253,258 ----
          return time;
      }
!     
!     
!     
  }