[infinispan-commits] Infinispan SVN: r2173 - trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling.

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-08-06 06:37:33 -0400 (Fri, 06 Aug 2010)
New Revision: 2173

Modified:
   trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
Log:
Lucene Directory tests: cleanup, trunk

Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java	2010-08-06 10:34:14 UTC (rev 2172)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/PerformanceCompareStressTest.java	2010-08-06 10:37:33 UTC (rev 2173)
@@ -81,7 +81,7 @@
    @Test
    public void profileTestRAMDirectory() throws InterruptedException, IOException {
       RAMDirectory dir = new RAMDirectory();
-      testDirectory(dir, "RAMDirectory");
+      stressTestDirectory(dir, "RAMDirectory");
    }
 
    @Test
@@ -90,14 +90,14 @@
       boolean directoriesCreated = indexDir.mkdirs();
       assert directoriesCreated : "couldn't create directory for FSDirectory test";
       FSDirectory dir = FSDirectory.open(indexDir);
-      testDirectory(dir, "FSDirectory");
+      stressTestDirectory(dir, "FSDirectory");
    }
    
    @Test
    public void profileTestInfinispanDirectoryWithNetworkDelayZero() throws Exception {
       // TestingUtil.setDelayForCache(cache, 0, 0);
       InfinispanDirectory dir = new InfinispanDirectory(cache, indexName);
-      testDirectory(dir, "InfinispanClustered-delayedIO:0");
+      stressTestDirectory(dir, "InfinispanClustered-delayedIO:0");
       DirectoryIntegrityCheck.verifyDirectoryStructure(cache, indexName);
    }
 
@@ -105,7 +105,7 @@
    public void profileTestInfinispanDirectoryWithNetworkDelay4() throws Exception {
       TestingUtil.setDelayForCache(cache, 4, 4);
       InfinispanDirectory dir = new InfinispanDirectory(cache, indexName);
-      testDirectory(dir, "InfinispanClustered-delayedIO:4");
+      stressTestDirectory(dir, "InfinispanClustered-delayedIO:4");
       DirectoryIntegrityCheck.verifyDirectoryStructure(cache, indexName);
    }
 
@@ -113,7 +113,7 @@
    public void profileTestInfinispanDirectoryWithHighNetworkDelay40() throws Exception {
       TestingUtil.setDelayForCache(cache, 40, 40);
       InfinispanDirectory dir = new InfinispanDirectory(cache, indexName);
-      testDirectory(dir, "InfinispanClustered-delayedIO:40");
+      stressTestDirectory(dir, "InfinispanClustered-delayedIO:40");
       DirectoryIntegrityCheck.verifyDirectoryStructure(cache, indexName);
    }
 
@@ -123,14 +123,14 @@
       try {
          Cache<CacheKey, Object> cache = cacheContainer.getCache();
          InfinispanDirectory dir = new InfinispanDirectory(cache, indexName);
-         testDirectory(dir, "InfinispanLocal");
+         stressTestDirectory(dir, "InfinispanLocal");
          DirectoryIntegrityCheck.verifyDirectoryStructure(cache, indexName);
       } finally {
          cacheContainer.stop();
       }
    }
 
-   private void testDirectory(Directory dir, String testLabel) throws InterruptedException, IOException {
+   public static void stressTestDirectory(Directory dir, String testLabel) throws InterruptedException, IOException {
       SharedState state = new SharedState(DICTIONARY_SIZE);
       CacheTestSupport.initializeDirectory(dir);
       ExecutorService e = Executors.newFixedThreadPool(READER_THREADS + 1);
@@ -146,7 +146,7 @@
       long searchesCount = state.incrementIndexSearchesCount(0);
       long writerTaskCount = state.incrementIndexWriterTaskCount(0);
       state.quit();
-      boolean terminatedCorrectly = e.awaitTermination(10, TimeUnit.SECONDS);
+      boolean terminatedCorrectly = e.awaitTermination(20, TimeUnit.SECONDS);
       Assert.assertTrue(terminatedCorrectly);
       System.out.println("Test " + testLabel + " run in " + DURATION_MS + "ms:\n\tSearches: " + searchesCount + "\n\t" + "Writes: "
                + writerTaskCount);