cvs commit: xml-xindice/java/tests/src/org/apache/xindice/stress/filer StressFilerTestSetup.java

[vgritsenko]

vgritsenko    2003/12/14 11:47:19

  Modified:    java/tests/src/org/apache/xindice StressTests.java
               java/tests/src/org/apache/xindice/stress/filer
                        StressFilerTestSetup.java
  Log:
  stress tests do not work as filer tests do not expect concurrent execution
  
  Revision  Changes    Path
  1.5       +8 -9      
xml-xindice/java/tests/src/org/apache/xindice/StressTests.java
  
  Index: StressTests.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/StressTests.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StressTests.java  7 Aug 2003 20:13:26 -0000       1.4
  +++ StressTests.java  14 Dec 2003 19:47:19 -0000      1.5
  @@ -75,18 +75,17 @@
    */
   public class StressTests {
   
  -   private static final int maxUsers = 2;
  -   private static final long maxElapsedTime = 500;
  +   private static final int USERS = 1;
  +   private static final int ITERATIONS = 1;
   
      public static Test suite() {
         TestSuite suite = new TestSuite("Xindice stress tests");
   
  -      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new BTreeFiler(), maxUsers));
  -      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new FSFiler(), maxUsers));
  -      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new HashFiler(), maxUsers));
  -      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new MemFiler(), maxUsers));
  +      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new BTreeFiler(), USERS, ITERATIONS));
  +      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new FSFiler(), USERS, ITERATIONS));
  +      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new HashFiler(), USERS, ITERATIONS));
  +      suite.addTest(new StressFilerTestSetup(new 
TestSuite(FilerTestCase.class), new MemFiler(), USERS, ITERATIONS));
   
         return suite;
      }
  -
   }
  
  
  
  1.4       +8 -14     
xml-xindice/java/tests/src/org/apache/xindice/stress/filer/StressFilerTestSetup.java
  
  Index: StressFilerTestSetup.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/stress/filer/StressFilerTestSetup.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StressFilerTestSetup.java 7 Aug 2003 20:13:27 -0000       1.3
  +++ StressFilerTestSetup.java 14 Dec 2003 19:47:19 -0000      1.4
  @@ -69,29 +69,23 @@
   
   /**
    * @version CVS $Revision$, $Date$
  - * @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
  + * @author Vladimir R. Bossicard &lt;[EMAIL PROTECTED]&gt;
    */
  -public class StressFilerTestSetup
  -      extends FilerTestSetup {
  +public class StressFilerTestSetup extends FilerTestSetup {
   
      protected Test test;
   
  -   public StressFilerTestSetup(Test test,
  -                               Filer filer,
  -                               int users) {
  -      super(new LoadTest(test, users), filer);
  +   public StressFilerTestSetup(Test test, Filer filer, int users, int 
iterations) {
  +      super(new LoadTest(test, users, iterations), filer);
         this.test = test;
      }
   
  -   public void setUp()
  -         throws Exception {
  +   public void setUp() throws Exception {
         initFiler();
         initTests((TestSuite) this.test);
      }
   
  -   public void tearDown()
  -         throws Exception {
  +   public void tearDown() throws Exception {
         super.tearDown();
      }
  -
   }