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

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-04-14 12:20:45 -0400 (Wed, 14 Apr 2010)
New Revision: 1689

Modified:
   trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java
   trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
Log:
Lucene directory: minor cleanup in tests

Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java	2010-04-14 13:43:43 UTC (rev 1688)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java	2010-04-14 16:20:45 UTC (rev 1689)
@@ -26,7 +26,6 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriter.MaxFieldLength;
-import org.apache.lucene.index.SerialMergeScheduler;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.TermQuery;
@@ -48,6 +47,9 @@
 import java.io.IOException;
 import java.util.Random;
 
+/**
+ * Contains general utilities used by other tests
+ */
 public abstract class CacheTestSupport {
 
    private static final Log log = LogFactory.getLog(CacheTestSupport.class);
@@ -75,9 +77,11 @@
    protected static File createDummyDocToIndex(String fileName, int sz) throws Exception {
       File dummyDocToIndex = new File(fileName);
       if (dummyDocToIndex.exists()) {
-         dummyDocToIndex.delete();
+         boolean deleted = dummyDocToIndex.delete();
+         assert deleted;
       }
-      dummyDocToIndex.createNewFile();
+      boolean newFileCreated = dummyDocToIndex.createNewFile();
+      assert newFileCreated;
       Random r = new Random();
       FileWriter fw = new FileWriter(dummyDocToIndex);
       for (int i = 0; i < sz; i++) {

Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java	2010-04-14 13:43:43 UTC (rev 1688)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/InfinispanDirectoryStressTest.java	2010-04-14 16:20:45 UTC (rev 1689)
@@ -28,14 +28,13 @@
 import java.util.ArrayList;
 
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
+
 import org.infinispan.Cache;
-import org.infinispan.lucene.testutils.LuceneSettings;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
@@ -61,6 +60,7 @@
       CacheManager cacheManager = CacheTestSupport.createTestCacheManager();
       Cache<CacheKey, Object> cache = cacheManager.getCache();
       Directory directory = new InfinispanDirectory(cache, "indexName");
+      CacheTestSupport.initializeDirectory(directory);
       File document = CacheTestSupport.createDummyDocToIndex("document.lucene", 10000);
 
       for (int i = 0; i < OPERATIONS; i++) {
@@ -84,11 +84,8 @@
       List<InfinispanDirectoryThread> threads = new ArrayList<InfinispanDirectoryThread>();
       Cache<CacheKey, Object> cache = CacheTestSupport.createTestCacheManager().getCache();
       Directory directory1 = new InfinispanDirectory(cache, "indexName");
+      CacheTestSupport.initializeDirectory(directory1);
 
-      IndexWriter.MaxFieldLength fieldLength = new IndexWriter.MaxFieldLength(IndexWriter.DEFAULT_MAX_FIELD_LENGTH);
-      IndexWriter iw = new IndexWriter(directory1, LuceneSettings.analyzer, true, fieldLength);
-      iw.close();
-
       // second cache joins after index creation: tests proper configuration
       Cache<CacheKey, Object> cache2 = CacheTestSupport.createTestCacheManager().getCache(); // dummy cache, to force replication
       Directory directory2 = new InfinispanDirectory(cache2, "indexName");