[hibernate-commits] Hibernate SVN: r18737 - in search/trunk/src: main/java/org/hibernate/search/reader and 38 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Mon Feb 8 16:35:15 EST 2010
Author: sannegrinovero
Date: 2010-02-08 16:35:12 -0500 (Mon, 08 Feb 2010)
New Revision: 18737
Modified:
search/trunk/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java
search/trunk/src/main/java/org/hibernate/search/reader/CacheableMultiReader.java
search/trunk/src/test/java/org/hibernate/search/test/FSDirectoryTest.java
search/trunk/src/test/java/org/hibernate/search/test/PurgeTest.java
search/trunk/src/test/java/org/hibernate/search/test/RamDirectoryTest.java
search/trunk/src/test/java/org/hibernate/search/test/SearchTestCase.java
search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java
search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java
search/trunk/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java
search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java
search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java
search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java
search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java
search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
search/trunk/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java
search/trunk/src/test/java/org/hibernate/search/test/bridge/Cloud.java
search/trunk/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java
search/trunk/src/test/java/org/hibernate/search/test/configuration/Country.java
search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java
search/trunk/src/test/java/org/hibernate/search/test/configuration/SecurityFilterFactory.java
search/trunk/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java
search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java
search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java
search/trunk/src/test/java/org/hibernate/search/test/embedded/EmbeddedTest.java
search/trunk/src/test/java/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java
search/trunk/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java
search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
search/trunk/src/test/java/org/hibernate/search/test/engine/RollbackTransactionTest.java
search/trunk/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java
search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilterFactory.java
search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java
search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java
search/trunk/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java
search/trunk/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java
search/trunk/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java
search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPersonSub.java
search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java
search/trunk/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java
search/trunk/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java
search/trunk/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
search/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java
search/trunk/src/test/java/org/hibernate/search/test/jgroups/slave/JGroupsSlaveTest.java
search/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
search/trunk/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java
search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerSerializationTest.java
search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java
search/trunk/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java
search/trunk/src/test/java/org/hibernate/search/test/optimizer/OptimizerPerfTest.java
search/trunk/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java
search/trunk/src/test/java/org/hibernate/search/test/perf/SearcherThread.java
search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/QueryLoaderTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/TermVectorTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java
search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java
search/trunk/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java
search/trunk/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java
search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/FilterOnDirectoryTest.java
search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java
search/trunk/src/test/java/org/hibernate/search/test/reader/performance/AbstractActivity.java
search/trunk/src/test/java/org/hibernate/search/test/reader/performance/ReaderPerformance.java
search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexTest.java
search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java
search/trunk/src/test/java/org/hibernate/search/test/session/OptimizeTest.java
search/trunk/src/test/java/org/hibernate/search/test/session/SessionTest.java
search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java
search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java
search/trunk/src/test/java/org/hibernate/search/test/shards/ShardsTest.java
search/trunk/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java
search/trunk/src/test/java/org/hibernate/search/test/util/textbuilder/WordDictionary.java
search/trunk/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java
search/trunk/src/test/java/org/hibernate/search/test/worker/WorkerTestCase.java
search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java
Log:
HSEARCH-458 Remove all deprecations from Lucene's 2.9 API usage
Modified: search/trunk/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -25,7 +25,6 @@
package org.hibernate.search.filter;
import java.io.IOException;
-import java.util.BitSet;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.DocIdSet;
@@ -75,18 +74,6 @@
}
@Override
- public BitSet bits(IndexReader reader) throws IOException {
- throw new UnsupportedOperationException();
- /* BitSet cached = (BitSet) cache.get(reader);
- if (cached != null) {
- return cached;
- }
- final BitSet bits = filter.bits(reader);
- cache.put(reader, bits);
- return bits; */
- }
-
- @Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
DocIdSet cached = (DocIdSet) cache.get( reader );
if ( cached != null ) {
Modified: search/trunk/src/main/java/org/hibernate/search/reader/CacheableMultiReader.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/reader/CacheableMultiReader.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/main/java/org/hibernate/search/reader/CacheableMultiReader.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,8 +24,6 @@
*/
package org.hibernate.search.reader;
-import java.io.IOException;
-
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
@@ -41,7 +39,7 @@
// expose this publically (it's a protected member in Lucene 2.3)
final IndexReader[] subReaders;
- public CacheableMultiReader(IndexReader[] subReaders) throws IOException {
+ public CacheableMultiReader(IndexReader[] subReaders) {
super( subReaders );
this.subReaders = subReaders;
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/FSDirectoryTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/FSDirectoryTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/FSDirectoryTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -28,7 +28,6 @@
import java.util.List;
import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
@@ -37,6 +36,8 @@
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
import org.hibernate.Session;
import org.hibernate.search.Environment;
@@ -76,63 +77,70 @@
);
s.getTransaction().commit();
s.close();
- IndexReader reader = IndexReader.open( new File( getBaseIndexDir(), "Documents" ) );
+
+ Directory dir = FSDirectory.open( new File( getBaseIndexDir(), "Documents" ) );
try {
- int num = reader.numDocs();
- assertEquals( 1, num );
- TermDocs docs = reader.termDocs( new Term( "Abstract", "hibernate" ) );
- assertTrue( docs.next() );
- org.apache.lucene.document.Document doc = reader.document( docs.doc() );
- assertFalse( docs.next() );
- docs = reader.termDocs( new Term( "title", "action" ) );
- assertTrue( docs.next() );
- doc = reader.document( docs.doc() );
- assertFalse( docs.next() );
- assertEquals( "1", doc.getField( "id" ).stringValue() );
- }
- finally {
- reader.close();
- }
+ IndexReader reader = IndexReader.open( dir, true );
+ try {
+ int num = reader.numDocs();
+ assertEquals( 1, num );
+ TermDocs docs = reader.termDocs( new Term( "Abstract", "hibernate" ) );
+ assertTrue( docs.next() );
+ org.apache.lucene.document.Document doc = reader.document( docs.doc() );
+ assertFalse( docs.next() );
+ docs = reader.termDocs( new Term( "title", "action" ) );
+ assertTrue( docs.next() );
+ doc = reader.document( docs.doc() );
+ assertFalse( docs.next() );
+ assertEquals( "1", doc.getField( "id" ).stringValue() );
+ }
+ finally {
+ reader.close();
+ }
- s = getSessions().openSession();
- s.getTransaction().begin();
- Document entity = (Document) s.get( Document.class, Long.valueOf( 1 ) );
- entity.setSummary( "Object/relational mapping with EJB3" );
- s.persist( new Document( "Seam in Action", "", "blah blah blah blah" ) );
- s.getTransaction().commit();
- s.close();
+ s = getSessions().openSession();
+ s.getTransaction().begin();
+ Document entity = (Document) s.get( Document.class, Long.valueOf( 1 ) );
+ entity.setSummary( "Object/relational mapping with EJB3" );
+ s.persist( new Document( "Seam in Action", "", "blah blah blah blah" ) );
+ s.getTransaction().commit();
+ s.close();
- reader = IndexReader.open( new File( getBaseIndexDir(), "Documents" ) );
- try {
- int num = reader.numDocs();
- assertEquals( 2, num );
- TermDocs docs = reader.termDocs( new Term( "Abstract", "ejb" ) );
- assertTrue( docs.next() );
- org.apache.lucene.document.Document doc = reader.document( docs.doc() );
- assertFalse( docs.next() );
- }
- finally {
- reader.close();
- }
+ reader = IndexReader.open( dir, true );
+ try {
+ int num = reader.numDocs();
+ assertEquals( 2, num );
+ TermDocs docs = reader.termDocs( new Term( "Abstract", "ejb" ) );
+ assertTrue( docs.next() );
+ org.apache.lucene.document.Document doc = reader.document( docs.doc() );
+ assertFalse( docs.next() );
+ }
+ finally {
+ reader.close();
+ }
- s = getSessions().openSession();
- s.getTransaction().begin();
- s.delete( entity );
- s.getTransaction().commit();
- s.close();
+ s = getSessions().openSession();
+ s.getTransaction().begin();
+ s.delete( entity );
+ s.getTransaction().commit();
+ s.close();
- reader = IndexReader.open( new File( getBaseIndexDir(), "Documents" ) );
- try {
- int num = reader.numDocs();
- assertEquals( 1, num );
- TermDocs docs = reader.termDocs( new Term( "title", "seam" ) );
- assertTrue( docs.next() );
- org.apache.lucene.document.Document doc = reader.document( docs.doc() );
- assertFalse( docs.next() );
- assertEquals( "2", doc.getField( "id" ).stringValue() );
+ reader = IndexReader.open( dir, true );
+ try {
+ int num = reader.numDocs();
+ assertEquals( 1, num );
+ TermDocs docs = reader.termDocs( new Term( "title", "seam" ) );
+ assertTrue( docs.next() );
+ org.apache.lucene.document.Document doc = reader.document( docs.doc() );
+ assertFalse( docs.next() );
+ assertEquals( "2", doc.getField( "id" ).stringValue() );
+ }
+ finally {
+ reader.close();
+ }
}
finally {
- reader.close();
+ dir.close();
}
s = getSessions().openSession();
@@ -154,9 +162,10 @@
s.getTransaction().commit();
s.close();
- IndexSearcher searcher = new IndexSearcher( new File( getBaseIndexDir(), "Documents" ).getCanonicalPath() );
+ FSDirectory dir = FSDirectory.open( new File( getBaseIndexDir(), "Documents" ) );
+ IndexSearcher searcher = new IndexSearcher( dir, true );
try {
- QueryParser qp = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser qp = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
Query query = qp.parse( "title:Action OR Abstract:Action" );
TopDocs hits = searcher.search( query, 1000 );
assertEquals( 2, hits.totalHits );
@@ -166,6 +175,7 @@
}
finally {
searcher.close();
+ dir.close();
}
s = getSessions().openSession();
@@ -182,23 +192,25 @@
public void testSearchOnDeletedIndex() throws Exception {
Session s = getSessions().openSession();
s.getTransaction().begin();
- s.persist( new Document( "Hibernate Search in Action", "", "") );
+ s.persist( new Document( "Hibernate Search in Action", "", "" ) );
s.getTransaction().commit();
s.close();
-
- IndexSearcher searcher = new IndexSearcher( new File( getBaseIndexDir(), "Documents" ).getCanonicalPath() );
+
+ Directory dir = FSDirectory.open( new File( getBaseIndexDir(), "Documents" ) );
+ IndexSearcher searcher = new IndexSearcher( dir, true );
// deleting before search, but after IndexSearcher creation:
// ( fails when deleting -concurrently- to IndexSearcher initialization! )
- FileHelper.delete(getBaseIndexDir());
- TermQuery query = new TermQuery( new Term("title","action") );
+ FileHelper.delete( getBaseIndexDir() );
+ TermQuery query = new TermQuery( new Term( "title", "action" ) );
TopDocs hits = searcher.search( query, 1000 );
assertEquals( 1, hits.totalHits );
org.apache.lucene.document.Document doc = searcher.doc( 0 );
assertEquals( "Hibernate Search in Action", doc.get( "title" ) );
searcher.close();
+ dir.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Document.class
};
@@ -213,4 +225,3 @@
}
}
-
Modified: search/trunk/src/test/java/org/hibernate/search/test/PurgeTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/PurgeTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/PurgeTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,7 +26,6 @@
import java.util.List;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.hibernate.Transaction;
@@ -60,7 +59,7 @@
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "brand", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "brand", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "brand:Seiko" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Clock.class, Book.class );
@@ -104,8 +103,8 @@
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "brand", new StopAnalyzer() );
- tx = s.beginTransaction();
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "brand", SearchTestCase.stopAnalyzer );
+ tx = s.beginTransaction();
s.purgeAll( Clock.class);
tx.commit();
@@ -127,7 +126,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Book.class,
AlternateBook.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/RamDirectoryTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/RamDirectoryTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/RamDirectoryTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -82,7 +82,7 @@
}
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[]{
Document.class,
AlternateDocument.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/SearchTestCase.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/SearchTestCase.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/SearchTestCase.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,8 +27,13 @@
import java.io.File;
import java.io.InputStream;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.KeywordAnalyzer;
+import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.hibernate.HibernateException;
@@ -56,6 +61,11 @@
public abstract class SearchTestCase extends TestCase {
private static final Logger log = org.hibernate.search.util.LoggerFactory.make();
+
+ public static Analyzer standardAnalyzer = new StandardAnalyzer( getTargetLuceneVersion() );
+ public static Analyzer stopAnalyzer = new StopAnalyzer( getTargetLuceneVersion() );
+ public static Analyzer simpleAnalyzer = new SimpleAnalyzer();
+ public static Analyzer keywordAnalyzer = new KeywordAnalyzer();
private static File indexDir;
@@ -180,4 +190,9 @@
protected static File getIndexDir() {
return indexDir;
}
+
+ public static Version getTargetLuceneVersion() {
+ return Version.LUCENE_29;
+ }
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -89,7 +89,8 @@
}
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] { Document.class };
}
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -29,7 +29,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.slf4j.Logger;
@@ -78,12 +77,12 @@
// at query time we use a standard analyzer. We explicitly search for tokens which can only be found if the
// right language specific stemmer was used at index time
- QueryParser parser = new QueryParser( "references.text", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "references.text", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "aufeinanderschlug" );
FullTextQuery query = s.createFullTextQuery( luceneQuery );
assertEquals( 1, query.getResultSize() );
- parser = new QueryParser( "text", new StandardAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "text", SearchTestCase.standardAnalyzer );
luceneQuery = parser.parse( "acknowledg" );
query = s.createFullTextQuery( luceneQuery );
assertEquals( 1, query.getResultSize() );
@@ -92,7 +91,7 @@
s.close();
}
- public void testMultipleAnalyzerDiscriminatorDefinitions() throws Exception {
+ public void testMultipleAnalyzerDiscriminatorDefinitions() {
SearchConfigurationFromHibernateCore searchConfig = new SearchConfigurationFromHibernateCore( cfg );
ReflectionManager reflectionManager = searchConfig.getReflectionManager();
XClass xclass = reflectionManager.toXClass( BlogEntry.class );
@@ -119,7 +118,7 @@
tx.commit();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "entity:alarm" );
FullTextQuery query = s.createFullTextQuery( luceneQuery, MyEntity.class );
assertEquals( 1, query.getResultSize() );
Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,7 +24,6 @@
*/
package org.hibernate.search.test.analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
@@ -45,7 +44,7 @@
public static final Logger log = LoggerFactory.make();
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] { MyEntity.class, AlarmEntity.class };
}
@@ -61,7 +60,7 @@
tx.commit();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
{
Query luceneQuery = new MatchAllDocsQuery();
FullTextQuery query = s.createFullTextQuery( luceneQuery );
Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -65,7 +65,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "name", s.getSearchFactory().getAnalyzer( SubClass.class ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "name", s.getSearchFactory().getAnalyzer( SubClass.class ) );
org.apache.lucene.search.Query luceneQuery = parser.parse( "name:Proca\u00EFne" );
FullTextQuery query = s.createFullTextQuery( luceneQuery, SubClass.class );
assertEquals( 1, query.getResultSize() );
@@ -100,7 +100,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] { SubClass.class };
}
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,16 +27,19 @@
import java.io.Reader;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.ISOLatin1AccentFilter;
+import org.apache.lucene.analysis.ASCIIFoldingFilter;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.hibernate.search.test.SearchTestCase;
/**
* @author Hardy Ferentschik
*/
- public class ISOLatin1Analyzer extends Analyzer {
- public TokenStream tokenStream(String s, Reader reader) {
- TokenStream result = new StandardTokenizer( reader );
- return new ISOLatin1AccentFilter( result );
- }
+public class ISOLatin1Analyzer extends Analyzer {
+
+ public TokenStream tokenStream(String s, Reader reader) {
+ TokenStream result = new StandardTokenizer( SearchTestCase.getTargetLuceneVersion(), reader );
+ return new ASCIIFoldingFilter(result);
}
+
+}
Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,29 +26,36 @@
import java.io.IOException;
-import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
/**
* A filter which will actually insert spaces. Most filters/tokenizers remove them, but for testing it is
* sometimes better to insert them again ;-)
*
* @author Hardy Ferentschik
+ * @author Sanne Grinovero
*/
public class InsertWhitespaceFilter extends TokenFilter {
+
+ private TermAttribute termAtt;
+
public InsertWhitespaceFilter(TokenStream in) {
super( in );
+ termAtt = (TermAttribute) addAttribute(TermAttribute.class);
}
- public Token next(final Token reusableToken) throws IOException {
- Token nextToken = input.next( reusableToken );
- if ( nextToken != null ) {
- nextToken.setTermBuffer( " " + nextToken.term() + " " );
- return nextToken;
+ @Override
+ public boolean incrementToken() throws IOException {
+ if ( input.incrementToken() ) {
+ String value = " " + termAtt.term() + " ";
+ termAtt.setTermBuffer( value );
+ return true;
}
else {
- return null;
+ return false;
}
}
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -177,7 +177,7 @@
fts.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Team.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -34,14 +34,12 @@
import java.util.TimeZone;
import org.apache.lucene.analysis.SimpleAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
import org.hibernate.search.Environment;
@@ -82,7 +80,7 @@
tx = s.beginTransaction();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
Query query;
List result;
@@ -145,7 +143,7 @@
tx = s.beginTransaction();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "id", new SimpleAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.simpleAnalyzer );
Query query;
List result;
@@ -187,7 +185,7 @@
tx = s.beginTransaction();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
Query query;
List result;
@@ -235,7 +233,7 @@
tx = s.beginTransaction();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
Query query;
List result;
@@ -270,7 +268,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Cloud.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -67,7 +67,7 @@
// Departments entity after being massaged by passing it
// through the EquipmentType class. This field is in
// the Lucene document but not in the Department entity itself.
- QueryParser parser = new QueryParser( "equipment", new SimpleAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "equipment", SearchTestCase.simpleAnalyzer );
// Check the second ClassBridge annotation
Query query = parser.parse( "equiptype:Cisco" );
@@ -87,7 +87,7 @@
assertTrue( "problem with field cross-ups", result.size() == 0 );
// Non-ClassBridge field.
- parser = new QueryParser( "branchHead", new SimpleAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "branchHead", SearchTestCase.simpleAnalyzer );
query = parser.parse( "branchHead:Kent Lewin" );
hibQuery = session.createFullTextQuery( query, Departments.class );
result = hibQuery.list();
@@ -96,7 +96,7 @@
assertEquals("incorrect entity returned", "Kent Lewin", ( result.get( 0 ) ).getBranchHead());
// Check other ClassBridge annotation.
- parser = new QueryParser( "branchnetwork", new SimpleAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "branchnetwork", SearchTestCase.simpleAnalyzer );
query = parser.parse( "branchnetwork:st. george 1D" );
hibQuery = session.createFullTextQuery( query, Departments.class );
result = hibQuery.list();
@@ -135,7 +135,7 @@
// Departments entity after being massaged by passing it
// through the EquipmentType class. This field is in
// the Lucene document but not in the Department entity itself.
- QueryParser parser = new QueryParser( "equipment", new SimpleAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "equipment", SearchTestCase.simpleAnalyzer );
// Check the second ClassBridge annotation
Query query = parser.parse( "equiptype:Cisco" );
@@ -201,7 +201,7 @@
// the branch field and the network field of the Department
// class. This is in the Lucene document but not in the
// Department entity itself.
- QueryParser parser = new QueryParser( "branchnetwork", new SimpleAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "branchnetwork", SearchTestCase.simpleAnalyzer );
Query query = parser.parse( "branchnetwork:layton 2B" );
org.hibernate.search.FullTextQuery hibQuery = session.createFullTextQuery( query, Department.class );
@@ -228,7 +228,7 @@
assertTrue( "problem with field cross-ups", result.size() == 0 );
// Non-ClassBridge field.
- parser = new QueryParser( "branchHead", new SimpleAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "branchHead", SearchTestCase.simpleAnalyzer );
query = parser.parse( "branchHead:Kent Lewin" );
hibQuery = session.createFullTextQuery( query, Department.class );
result = hibQuery.list();
@@ -321,7 +321,7 @@
return depts;
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Department.class,
Departments.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/bridge/Cloud.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/bridge/Cloud.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/bridge/Cloud.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -40,6 +40,7 @@
@Entity
@Indexed
public class Cloud {
+
private int id;
private Long long1;
private long long2;
@@ -76,9 +77,6 @@
private Calendar calendarHour;
private Calendar calendarMillisecond;
-
-
-
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
public URL getUrl() {
return url;
@@ -266,7 +264,6 @@
this.dateHour = dateHour;
}
-
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.MINUTE )
public Date getDateMinute() {
@@ -333,7 +330,6 @@
this.char2 = char2;
}
-
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
public Calendar getMyCalendar() {
return myCalendar;
@@ -373,8 +369,6 @@
this.calendarDay = calendarDay;
}
-
-
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
@CalendarBridge( resolution = Resolution.MINUTE )
public Calendar getCalendarMinute() {
@@ -385,7 +379,6 @@
this.calendarMinute = calendarMinute;
}
-
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
@CalendarBridge( resolution = Resolution.HOUR )
public Calendar getCalendarHour() {
@@ -396,7 +389,6 @@
this.calendarHour = calendarHour;
}
-
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
@CalendarBridge( resolution = Resolution.MILLISECOND )
public Calendar getCalendarMillisecond() {
Modified: search/trunk/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -62,7 +62,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Gangster.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/configuration/Country.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/configuration/Country.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/configuration/Country.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -51,7 +51,7 @@
private String name;
@OneToMany(mappedBy = "country")
- private Set<Address> addresses = new HashSet<Address>();;
+ private Set<Address> addresses = new HashSet<Address>();
public String getName() {
return name;
Modified: search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -32,7 +32,6 @@
import java.util.TimeZone;
import org.apache.lucene.analysis.SimpleAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
@@ -71,7 +70,6 @@
public class ProgrammaticMappingTest extends SearchTestCase {
private static final Logger log = LoggerFactory.make();
-
public void testMapping() throws Exception{
Address address = new Address();
@@ -87,7 +85,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "" + address.getAddressId() );
System.out.println(luceneQuery.toString( ));
FullTextQuery query = s.createFullTextQuery( luceneQuery );
@@ -118,7 +116,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "street1_ngram:pea" );
final FullTextQuery query = s.createFullTextQuery( luceneQuery );
@@ -127,7 +125,6 @@
s.delete( query.list().get( 0 ));
tx.commit();
s.close();
-
}
public void testBridgeMapping() throws Exception{
@@ -144,7 +141,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "street1:peac" );
FullTextQuery query = s.createFullTextQuery( luceneQuery );
assertEquals( "PrefixQuery should not be on", 0, query.getResultSize() );
@@ -178,7 +175,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "street1:peachtree OR idx_street2:peachtree" );
FullTextQuery query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
assertEquals( "expecting two results", 2, query.getResultSize() );
@@ -194,10 +191,7 @@
tx.commit();
s.close();
}
-
-
-
public void testAnalyzerDiscriminator() throws Exception{
FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
@@ -233,7 +227,6 @@
tx.commit();
s.close();
}
-
public void testDateBridgeMapping() throws Exception{
FullTextSession s = Search.getFullTextSession( openSession() );
@@ -269,7 +262,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "date-created:20091115 OR blog-entry-created:20091115" );
FullTextQuery query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
assertEquals( "expecting 3 results", 3, query.getResultSize() );
@@ -310,7 +303,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "last-updated:20091115" );
FullTextQuery query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
assertEquals( "expecting 2 results", 2, query.getResultSize() );
@@ -325,7 +318,6 @@
s.close();
}
-
public void testProvidedIdMapping() throws Exception{
FullTextSession fullTextSession = Search.getFullTextSession( openSession() );
SearchFactoryImplementor sf = (SearchFactoryImplementor) fullTextSession.getSearchFactory();
@@ -355,7 +347,7 @@
Transaction transaction = fullTextSession.beginTransaction();
- QueryParser parser = new QueryParser( "providedidentry.name", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "providedidentry.name", SearchTestCase.standardAnalyzer );
Query luceneQuery = parser.parse( "Goat" );
//we cannot use FTQuery because @ProvidedId does not provide the getter id and Hibernate Hsearch Query extension
@@ -364,7 +356,7 @@
//we know there is only one DP
DirectoryProvider<?> provider = fullTextSession.getSearchFactory()
.getDirectoryProviders( ProvidedIdEntry.class )[0];
- IndexSearcher searcher = new IndexSearcher( provider.getDirectory() );
+ IndexSearcher searcher = new IndexSearcher( provider.getDirectory(), true );
TopDocs hits = searcher.search( luceneQuery, 1000 );
searcher.close();
transaction.commit();
@@ -373,8 +365,6 @@
assertEquals( 3, hits.totalHits );
}
-
-
public void testFullTextFilterDefAtMappingLevel() throws Exception{
FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
@@ -403,7 +393,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "street1:Peachtnot" );
FullTextQuery query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
query.enableFullTextFilter("security").setParameter("ownerName", "test");
@@ -438,7 +428,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "items.description:Ferrari" );
FullTextQuery query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
assertEquals( "expecting 1 results", 1, query.getResultSize() );
@@ -472,7 +462,7 @@
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( "items.description:test" );
FullTextQuery query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
assertEquals( "expecting 1 results", 1, query.getResultSize() );
@@ -489,12 +479,12 @@
tx = s.beginTransaction();
- parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
luceneQuery = parser.parse( "items.description:test" );
query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
assertEquals( "expecting 0 results", 0, query.getResultSize() );
- parser = new QueryParser( "id", new StandardAnalyzer( ) );
+ parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
luceneQuery = parser.parse( "items.description:Ferrari" );
query = s.createFullTextQuery( luceneQuery ).setProjection( FullTextQuery.THIS, FullTextQuery.SCORE );
assertEquals( "expecting 1 results", 1, query.getResultSize() );
@@ -529,7 +519,7 @@
// Departments entity after being massaged by passing it
// through the EquipmentType class. This field is in
// the Lucene document but not in the Department entity itself.
- QueryParser parser = new QueryParser( "equipment", new SimpleAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "equipment", new SimpleAnalyzer() );
// Check the second ClassBridge annotation
Query query = parser.parse( "equiptype:Cisco" );
@@ -549,7 +539,7 @@
assertTrue( "problem with field cross-ups", result.size() == 0 );
// Non-ClassBridge field.
- parser = new QueryParser( "branchHead", new SimpleAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "branchHead", new SimpleAnalyzer() );
query = parser.parse( "branchHead:Kent Lewin" );
hibQuery = session.createFullTextQuery( query, Departments.class );
result = hibQuery.list();
@@ -558,7 +548,7 @@
assertEquals("incorrect entity returned", "Kent Lewin", ( result.get( 0 ) ).getBranchHead());
// Check other ClassBridge annotation.
- parser = new QueryParser( "branchnetwork", new SimpleAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "branchnetwork", new SimpleAnalyzer() );
query = parser.parse( "branchnetwork:st. george 1D" );
hibQuery = session.createFullTextQuery( query, Departments.class );
result = hibQuery.list();
@@ -573,7 +563,6 @@
s.close();
}
-
public void testDynamicBoosts() throws Exception {
Session session = openSession();
@@ -657,7 +646,7 @@
}
private int nbrOfMatchingResults(String field, String token, FullTextSession s) throws ParseException {
- QueryParser parser = new QueryParser( field, new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), field, SearchTestCase.standardAnalyzer );
org.apache.lucene.search.Query luceneQuery = parser.parse( token );
FullTextQuery query = s.createFullTextQuery( luceneQuery );
return query.getResultSize();
@@ -750,9 +739,6 @@
.analyzerDef( "minimal", StandardTokenizerFactory.class );
}
-
-
-
protected Class<?>[] getMappings() {
return new Class<?>[] {
Modified: search/trunk/src/test/java/org/hibernate/search/test/configuration/SecurityFilterFactory.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/configuration/SecurityFilterFactory.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/configuration/SecurityFilterFactory.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -61,7 +61,7 @@
return key;
}
- private final class SecurityFilter extends Filter {
+ private static final class SecurityFilter extends Filter {
private static final long serialVersionUID = -5105989141875576599L;
private final String ownerName;
Modified: search/trunk/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -28,7 +28,6 @@
import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_MERGE_DOCS;
import static org.hibernate.search.backend.configuration.IndexWriterSetting.MERGE_FACTOR;
import static org.hibernate.search.backend.configuration.IndexWriterSetting.RAM_BUFFER_SIZE;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.TERM_INDEX_INTERVAL;
import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.TRANSACTION;
import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.BATCH;
import org.hibernate.search.store.DirectoryProvider;
@@ -67,7 +66,7 @@
cfg.setProperty( "hibernate.search.Documents.1.transaction.term_index_interval", "12" );
}
- public void testCorrectNumberOfShardsDetected() throws Exception {
+ public void testCorrectNumberOfShardsDetected() {
DirectoryProvider[] docDirProviders = getSearchFactory()
.getDirectoryProviders( Document.class );
assertNotNull( docDirProviders);
@@ -78,14 +77,14 @@
assertEquals( 2, bookDirProviders.length );
}
- public void testSelectionOfShardingStrategy() throws Exception {
+ public void testSelectionOfShardingStrategy() {
IndexShardingStrategy shardingStrategy = getSearchFactory().getDocumentBuilderIndexedEntity( Document.class )
.getDirectoryProviderSelectionStrategy();
assertNotNull( shardingStrategy );
assertEquals( shardingStrategy.getClass(), UselessShardingStrategy.class );
}
- public void testShardingSettingsInherited() throws Exception {
+ public void testShardingSettingsInherited() {
DirectoryProvider[] docDirProviders = getSearchFactory().getDirectoryProviders( Document.class );
assertTrue( docDirProviders[0] instanceof RAMDirectoryProvider );
assertTrue( docDirProviders[1] instanceof FSDirectoryProvider );
@@ -93,7 +92,7 @@
assertValueIsSet( Document.class, 0, BATCH, MAX_BUFFERED_DOCS, 4 );
}
- public void testShardN2UsesDefaults() throws Exception {
+ public void testShardN2UsesDefaults() {
assertValueIsSet( Document.class, 2, TRANSACTION, MAX_BUFFERED_DOCS, 6 );
assertValueIsDefault( Document.class, 2, TRANSACTION, MAX_MERGE_DOCS );
assertValueIsSet( Document.class, 2, TRANSACTION, MERGE_FACTOR, 100 );
@@ -104,7 +103,7 @@
assertValueIsDefault( Document.class, 2, BATCH, RAM_BUFFER_SIZE );
}
- public void testShardN1_ExplicitParams() throws Exception {
+ public void testShardN1_ExplicitParams() {
assertValueIsSet( Document.class, 1, TRANSACTION, MAX_BUFFERED_DOCS, 12 );
assertValueIsSet( Document.class, 1, BATCH, MAX_MERGE_DOCS, 11 );
}
@@ -114,7 +113,7 @@
// skips index emptying to prevent a problem with UselessShardingStrategy
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Book.class,
Author.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -37,7 +37,7 @@
*/
public class DirectoryProviderHelperTest extends TestCase {
- public void testMkdirsDetermineIndex() throws Exception {
+ public void testMkdirsDetermineIndex() {
String root = "./testDir/dir1/dir2";
String relative = "dir3";
@@ -45,14 +45,14 @@
properties.put( "indexBase", root );
properties.put( "indexName", relative );
- File f = DirectoryProviderHelper.getVerifiedIndexDir( "name", properties, true );
+ DirectoryProviderHelper.getVerifiedIndexDir( "name", properties, true );
assertTrue( new File( root ).exists() );
FileHelper.delete( new File( "./testDir" ) );
}
- public void testMkdirsGetSource() throws Exception {
+ public void testMkdirsGetSource() {
String root = "./testDir";
String relative = "dir1/dir2/dir3";
Modified: search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -28,7 +28,6 @@
import java.util.Date;
import java.util.List;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.slf4j.Logger;
@@ -38,6 +37,7 @@
import org.hibernate.cfg.Configuration;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
+import org.hibernate.search.test.SearchTestCase;
import org.hibernate.search.util.FileHelper;
import org.hibernate.search.util.LoggerFactory;
@@ -87,7 +87,7 @@
// assert that the salve index is empty
FullTextSession fullTextSession = Search.getFullTextSession( getSlaveSession() );
Transaction tx = fullTextSession.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
List result = fullTextSession.createFullTextQuery( parser.parse( "location:texas" ) ).list();
assertEquals( "No copy yet, fresh index expected", 0, result.size() );
tx.commit();
@@ -212,7 +212,7 @@
return 2;
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
SnowStorm.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/directoryProvider/MultipleSFTestCase.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -28,11 +28,13 @@
import junit.framework.TestCase;
+import org.apache.lucene.util.Version;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
+import org.hibernate.search.test.SearchTestCase;
/**
* Build multiple session factories from the same set of classes
@@ -130,4 +132,9 @@
public static SessionFactory[] getSessionFactories() {
return sessionFactories;
}
+
+ public static Version getTargetLuceneVersion() {
+ return SearchTestCase.getTargetLuceneVersion();
+ }
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/EmbeddedTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/embedded/EmbeddedTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/embedded/EmbeddedTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.QueryParser;
@@ -66,7 +65,7 @@
tx.commit();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
Query query;
List<?> result;
@@ -132,7 +131,7 @@
tx.commit();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
Query query;
List<?> result;
@@ -169,7 +168,7 @@
s.clear();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
Query query;
List<?> result;
@@ -246,7 +245,7 @@
FullTextSession session = Search.getFullTextSession( s );
tx = session.beginTransaction();
- QueryParser parser = new MultiFieldQueryParser( new String[] { "name", "authors.name" }, new StandardAnalyzer() );
+ QueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(), new String[] { "name", "authors.name" }, SearchTestCase.standardAnalyzer );
Query query;
List<?> result;
@@ -306,7 +305,7 @@
FullTextSession session = Search.getFullTextSession( s );
tx = session.beginTransaction();
- QueryParser parser = new MultiFieldQueryParser( new String[] { "name", "state.name" }, new StandardAnalyzer() );
+ QueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(), new String[] { "name", "state.name" }, SearchTestCase.standardAnalyzer );
Query query;
List<?> result;
Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -93,7 +93,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Address.class,
Contact.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,10 +26,8 @@
import java.util.List;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
-
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.search.FullTextSession;
@@ -61,7 +59,7 @@
tx.commit();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "attributes.values.value", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "attributes.values.value", SearchTestCase.standardAnalyzer );
Query query;
List<?> result;
@@ -115,7 +113,7 @@
tx.commit();
FullTextSession session = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser( "placesVisited.address.city", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "placesVisited.address.city", SearchTestCase.standardAnalyzer );
Query query;
List<?> result;
Modified: search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -133,7 +133,7 @@
// Test setup options - Entities
@Override
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] { BusLine.class, BusStop.class };
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/engine/RollbackTransactionTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/engine/RollbackTransactionTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/engine/RollbackTransactionTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -98,7 +98,7 @@
// Test setup options - Entities
@Override
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] { BusLine.class, BusStop.class };
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -32,7 +32,6 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
/**
* @author Emmanuel Bernard
@@ -50,7 +49,7 @@
FullTextSession session = Search.getFullTextSession(s);
tx = session.beginTransaction();
- QueryParser p = new QueryParser("id", new StandardAnalyzer( ) );
+ QueryParser p = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
List result = session.createFullTextQuery( p.parse( "Abstract:Hibernate" ) ).list();
assertEquals( "Query by field", 1, result.size() );
s.delete( result.get( 0 ) );
@@ -74,7 +73,7 @@
FullTextSession session = Search.getFullTextSession(s);
tx = session.beginTransaction();
- QueryParser p = new QueryParser("id", new StandardAnalyzer( ) );
+ QueryParser p = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.standardAnalyzer );
List result = session.createFullTextQuery( p.parse( "title:Action OR Abstract:Action" ) ).list();
assertEquals( "Query by field", 2, result.size() );
assertEquals( "@Boost fails", "Hibernate in Action", ( (Document) result.get( 0 ) ).getTitle() );
@@ -84,7 +83,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Document.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,8 +24,8 @@
*/
package org.hibernate.search.test.filter;
-import java.util.BitSet;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
@@ -34,23 +34,12 @@
/**
* @author Emmanuel Bernard
*/
- at SuppressWarnings("serial")
-public class ExcludeAllFilter extends Filter {
+public class ExcludeAllFilter extends Filter implements Serializable {
// ugly but useful for test purposes
private static volatile boolean done = false;
@Override
- public BitSet bits(IndexReader reader) throws IOException {
- if ( done ) {
- throw new IllegalStateException( "Called twice" );
- }
- BitSet bitSet = new BitSet( reader.maxDoc() );
- done = true;
- return bitSet;
- }
-
- @Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
if ( done ) {
throw new IllegalStateException( "Called twice" );
@@ -58,4 +47,5 @@
done = true;
return DocIdSet.EMPTY_DOCIDSET;
}
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilterFactory.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilterFactory.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilterFactory.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -31,8 +31,10 @@
* @author Emmanuel Bernard
*/
public class ExcludeAllFilterFactory {
+
@Factory
public Filter getFilter() {
return new ExcludeAllFilter();
}
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/filter/FilterTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -30,8 +30,8 @@
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.RangeFilter;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeFilter;
import org.hibernate.Session;
import org.hibernate.search.FullTextQuery;
import org.hibernate.search.FullTextSession;
@@ -137,8 +137,7 @@
ftQuery = s.createFullTextQuery( query, Driver.class );
ftQuery.enableFullTextFilter( "bestDriver");
- Filter dateFilter = new RangeFilter("delivery", "2001", "2005",
- true, true);
+ Filter dateFilter = new TermRangeFilter("delivery", "2001", "2005", true, true);
ftQuery.setFilter( dateFilter );
assertEquals("Should select only liz", 1, ftQuery.getResultSize() );
@@ -200,7 +199,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Driver.class,
Soap.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -126,17 +126,16 @@
private boolean isIdSetSequenceSameTo(DocIdSet docIdSet, int...expectedIds) throws IOException {
DocIdSetIterator idSetIterator = docIdSet.iterator();
for ( int setBit : expectedIds ) {
- if ( ! idSetIterator.next() ) {
+ int currentId = idSetIterator.nextDoc();
+ if ( currentId == DocIdSetIterator.NO_MORE_DOCS ) {
return false;
}
- if ( idSetIterator.doc() != setBit ) {
+ if ( currentId != setBit ) {
return false;
}
}
- if ( idSetIterator.next() ){
- return false;
- }
- return true;
+ // and now test both sequences are at the end:
+ return idSetIterator.nextDoc() == DocIdSetIterator.NO_MORE_DOCS;
}
/**
@@ -185,7 +184,7 @@
* Implementation for testing: wraps a DocIdSet with a new type
* to make it not possible to cast/detect to the original type.
*/
- private class DocIdSetHiddenType extends DocIdSet {
+ private static class DocIdSetHiddenType extends DocIdSet {
private final DocIdSet bitSet;
Modified: search/trunk/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,8 +24,8 @@
*/
package org.hibernate.search.test.filter;
-import java.util.BitSet;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Filter;
@@ -34,20 +34,11 @@
/**
* @author Emmanuel Bernard
*/
-public class InstanceBasedExcludeAllFilter extends Filter {
+public class InstanceBasedExcludeAllFilter extends Filter implements Serializable {
+
private volatile boolean done = false;
@Override
- public BitSet bits(IndexReader reader) throws IOException {
- if ( done ) {
- throw new IllegalStateException( "Called twice" );
- }
- BitSet bitSet = new BitSet( reader.maxDoc() );
- done = true;
- return bitSet;
- }
-
- @Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
if ( done ) {
throw new IllegalStateException( "Called twice" );
@@ -55,4 +46,5 @@
done = true;
return DocIdSet.EMPTY_DOCIDSET;
}
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -112,7 +112,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Person.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -63,7 +63,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Animal.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -32,9 +32,6 @@
import org.hibernate.search.annotations.FieldBridge;
import org.hibernate.search.bridge.builtin.LongBridge;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
import java.io.Serializable;
Modified: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPersonSub.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPersonSub.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPersonSub.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,8 +24,6 @@
*/
package org.hibernate.search.test.id.providedId;
-import javax.persistence.Entity;
-
import org.hibernate.search.annotations.Indexed;
/**
Modified: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,7 +24,6 @@
*/
package org.hibernate.search.test.id.providedId;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -34,6 +33,7 @@
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.impl.SearchFactoryImpl;
import org.hibernate.search.store.DirectoryProvider;
+import org.hibernate.search.test.SearchTestCase;
/**
* @author Navin Surtani
@@ -66,7 +66,7 @@
tc.end();
- QueryParser parser = new QueryParser( "name", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( SearchTestCase.getTargetLuceneVersion(), "name", SearchTestCase.standardAnalyzer );
Query luceneQuery = parser.parse( "Goat" );
//we cannot use FTQuery because @ProvidedId does not provide the getter id and Hibernate Hsearch Query extension
@@ -75,7 +75,7 @@
//we know there is only one DP
DirectoryProvider provider = sf
.getDirectoryProviders( ProvidedIdPerson.class )[0];
- IndexSearcher searcher = new IndexSearcher( provider.getDirectory() );
+ IndexSearcher searcher = new IndexSearcher( provider.getDirectory(), true );
TopDocs hits = searcher.search( luceneQuery, 1000 );
assertEquals( 3, hits.totalHits );
searcher.close();
Modified: search/trunk/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -77,7 +77,7 @@
}
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Document.class,
AlternateDocument.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,12 +27,11 @@
import java.util.List;
import java.io.Serializable;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RangeQuery;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeQuery;
import org.slf4j.Logger;
import org.hibernate.Transaction;
@@ -55,7 +54,7 @@
public void testSearchUnindexClass() throws Exception {
createTestData();
- QueryParser parser = new QueryParser( "name", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "name", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "Elephant" );
FullTextSession s = Search.getFullTextSession( openSession() );
@@ -84,7 +83,7 @@
FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "name", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "name", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "Elephant" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Mammal.class );
assertItsTheElephant( hibQuery.list() );
@@ -103,7 +102,7 @@
assertNotNull( result );
assertEquals( "Query filtering on superclass return mapped subclasses", 2, result.size() );
- query = new RangeQuery( new Term( "weight", "04000" ), new Term( "weight", "05000" ), true );
+ query = new TermRangeQuery( "weight", "04000", "05000", true, true );
hibQuery = s.createFullTextQuery( query, Animal.class );
assertItsTheElephant( hibQuery.list() );
@@ -121,7 +120,7 @@
FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "name", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "name", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "Elephant" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Mammal.class );
@@ -252,7 +251,7 @@
}
private void assertNumberOfAnimals(FullTextSession s, int count) throws Exception {
- QueryParser parser = new QueryParser( "name", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "name", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "Elephant OR White Pointer OR Chimpanzee OR Dove or Eagle" );
List result = s.createFullTextQuery( query, Animal.class ).list();
assertNotNull( result );
@@ -304,7 +303,7 @@
assertEquals( "Wrong animal name", "Elephant", mammal.getName() );
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Animal.class,
Mammal.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,10 +26,8 @@
import java.util.List;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
-
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -38,6 +36,7 @@
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
import org.hibernate.search.backend.impl.jgroups.JGroupsBackendQueueProcessorFactory;
+import org.hibernate.search.test.SearchTestCase;
import org.hibernate.search.test.jgroups.master.TShirt;
/**
@@ -73,7 +72,7 @@
FullTextSession ftSess = Search.getFullTextSession( openSession() );
ftSess.getTransaction().begin();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
Query luceneQuery = parser.parse( "logo:Boston or logo:Mapple leaves" );
org.hibernate.Query query = ftSess.createFullTextQuery( luceneQuery );
List result = query.list();
@@ -89,7 +88,7 @@
//need to sleep for the message consumption
Thread.sleep( 3000 );
- parser = new QueryParser( "id", new StopAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
luceneQuery = parser.parse( "logo:Peter pan" );
query = ftSess.createFullTextQuery( luceneQuery );
result = query.list();
@@ -104,7 +103,7 @@
//Need to sleep for the message consumption
Thread.sleep( 3000 );
- parser = new QueryParser( "id", new StopAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
luceneQuery = parser.parse( "logo:Boston or logo:Mapple leaves" );
query = ftSess.createFullTextQuery( luceneQuery );
result = query.list();
Modified: search/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jgroups/master/JGroupsMasterTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.queryParser.QueryParser;
@@ -82,7 +81,7 @@
FullTextSession ftSess = Search.getFullTextSession( openSession() );
ftSess.getTransaction().begin();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
Query luceneQuery = parser.parse( "logo:jboss" );
org.hibernate.Query query = ftSess.createFullTextQuery( luceneQuery );
List result = query.list();
@@ -186,7 +185,7 @@
"shun=false;print_local_addr=true)";
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
TShirt.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/jgroups/slave/JGroupsSlaveTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jgroups/slave/JGroupsSlaveTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jgroups/slave/JGroupsSlaveTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -118,7 +118,7 @@
super.tearDown();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
TShirt.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -39,12 +39,10 @@
import javax.naming.Context;
import org.apache.activemq.broker.BrokerService;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
-
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.search.Environment;
@@ -93,7 +91,7 @@
FullTextSession ftSess = Search.getFullTextSession( openSession() );
ftSess.getTransaction().begin();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
Query luceneQuery = parser.parse( "logo:jboss" );
org.hibernate.Query query = ftSess.createFullTextQuery( luceneQuery );
List result = query.list();
@@ -200,7 +198,7 @@
cfg.setProperty( Environment.WORKER_BACKEND, "lucene" );
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
TShirt.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -160,7 +160,7 @@
cfg.setProperty( JMSBackendQueueProcessorFactory.JMS_QUEUE, QUEUE_NAME );
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
TShirt.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerSerializationTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerSerializationTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerSerializationTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -31,13 +31,13 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.hibernate.search.jpa.FullTextEntityManager;
import org.hibernate.search.jpa.Search;
+import org.hibernate.search.test.SearchTestCase;
/**
* Serialization test for entity manager. HSEARCH-117.
@@ -120,7 +120,7 @@
em.getTransaction().commit();
em.clear();
em.getTransaction().begin();
- QueryParser parser = new QueryParser("title", new StopAnalyzer());
+ QueryParser parser = new QueryParser( SearchTestCase.getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse("saltQty:noword");
assertEquals(0, em.createFullTextQuery(query).getResultList().size());
query = new TermQuery(new Term("saltQty", "23.0"));
Modified: search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,10 +26,10 @@
import org.hibernate.search.jpa.Search;
import org.hibernate.search.jpa.FullTextEntityManager;
+import org.hibernate.search.test.SearchTestCase;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.index.Term;
/**
@@ -45,7 +45,7 @@
em.getTransaction().commit();
em.clear();
em.getTransaction().begin();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "saltQty:noword" );
assertEquals( 0, em.createFullTextQuery( query ).getResultList().size() );
query = new TermQuery( new Term("saltQty", "23.0") );
@@ -56,14 +56,14 @@
em.getTransaction().commit();
em.clear();
-
+
em.getTransaction().begin();
em.remove( em.find( Bretzel.class, bretzel.getId() ) );
em.getTransaction().commit();
em.close();
}
- public void testIndex() throws Exception {
+ public void testIndex() {
FullTextEntityManager em = Search.getFullTextEntityManager( factory.createEntityManager() );
em.getTransaction().begin();
Bretzel bretzel = new Bretzel( 23, 34 );
Modified: search/trunk/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -37,7 +37,9 @@
import org.hibernate.ejb.AvailableSettings;
import org.hibernate.ejb.HibernatePersistence;
import org.hibernate.search.store.RAMDirectoryProvider;
+import org.hibernate.search.test.SearchTestCase;
import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.util.Version;
/**
* @author Emmanuel Bernard
@@ -127,5 +129,10 @@
return config;
}
+
+ public static Version getTargetLuceneVersion() {
+ return SearchTestCase.getTargetLuceneVersion();
+ }
+
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/optimizer/OptimizerPerfTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/optimizer/OptimizerPerfTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/optimizer/OptimizerPerfTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -123,7 +123,7 @@
s = sf.openSession();
tx = s.beginTransaction();
FullTextSession fts = new FullTextSessionImpl( s );
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
Query query;
try {
query = parser.parse( "name:Gavin" );
@@ -201,7 +201,7 @@
cfg.setProperty( Environment.ANALYZER_CLASS, StopAnalyzer.class.getName() );
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Worker.class,
Construction.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -104,11 +104,11 @@
private IndexSearcher getNewSearcher() throws IOException {
final org.hibernate.classic.Session session = getSessions().openSession();
Directory d = Search.getFullTextSession( session ).getSearchFactory().getDirectoryProviders( Boat.class )[0].getDirectory();
- IndexSearcher indexsearcher = new IndexSearcher( d );
+ IndexSearcher indexsearcher = new IndexSearcher( d, true );
return indexsearcher;
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Boat.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/perf/SearcherThread.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/perf/SearcherThread.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/perf/SearcherThread.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.concurrent.CountDownLatch;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.BooleanQuery;
@@ -45,6 +44,7 @@
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
import org.hibernate.search.SearchException;
+import org.hibernate.search.test.SearchTestCase;
import org.hibernate.search.util.LoggerFactory;
/**
@@ -128,7 +128,7 @@
}
private Query getQuery() throws ParseException {
- QueryParser qp = new QueryParser( "t", new StandardAnalyzer() );
+ QueryParser qp = new QueryParser( SearchTestCase.getTargetLuceneVersion(), "t", SearchTestCase.standardAnalyzer );
qp.setLowercaseExpandedTerms( true );
// Parse the query
Query q = qp.parse( queryString );
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,7 +27,6 @@
import java.util.List;
import java.util.Calendar;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
@@ -53,7 +52,7 @@
FullTextSession s = Search.getFullTextSession( openSession() );
createTestBooks(s);
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser("title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:lucene" );
FullTextQuery hibQuery = s.createFullTextQuery( query, Book.class );
@@ -71,21 +70,21 @@
// now the same query, but with a lucene sort specified.
query = parser.parse( "summary:lucene" );
hibQuery = s.createFullTextQuery( query, Book.class );
- Sort sort = new Sort(new SortField("id", true));
+ Sort sort = new Sort( new SortField( "id", SortField.STRING, true ) );
hibQuery.setSort(sort);
result = hibQuery.list();
assertNotNull( result );
assertEquals( "Wrong number of test results.", 3, result.size() );
id = 3;
- for(Book b : result) {
- assertEquals("Expected another id", Integer.valueOf( id ), b.getId());
+ for (Book b : result) {
+ assertEquals( "Expected another id", Integer.valueOf( id ), b.getId() );
id--;
}
// order by summary
query = parser.parse( "summary:lucene OR summary:action" );
hibQuery = s.createFullTextQuery( query, Book.class );
- sort = new Sort( new SortField( "summary_forSort", false ) ); //ASC
+ sort = new Sort( new SortField( "summary_forSort", SortField.STRING ) ); //ASC
hibQuery.setSort( sort );
result = hibQuery.list();
assertNotNull( result );
@@ -95,7 +94,7 @@
// order by summary backwards
query = parser.parse( "summary:lucene OR summary:action" );
hibQuery = s.createFullTextQuery( query, Book.class );
- sort = new Sort( new SortField( "summary_forSort", true ) ); //DESC
+ sort = new Sort( new SortField( "summary_forSort", SortField.STRING, true ) ); //DESC
hibQuery.setSort( sort );
result = hibQuery.list();
assertNotNull( result );
@@ -158,7 +157,7 @@
s.clear();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Book.class,
Author.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/LuceneQueryTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,8 +27,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.hibernate.FetchMode;
@@ -62,7 +60,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:noword" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Clock.class, Book.class );
@@ -117,7 +115,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:Festina Or brand:Seiko" );
Statistics stats = s.getSessionFactory().getStatistics();
@@ -153,7 +151,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:Festina Or brand:Seiko" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Clock.class, Book.class );
@@ -199,7 +197,7 @@
tx.commit();//post commit events for lucene
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:noword" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Clock.class, Book.class );
@@ -245,7 +243,7 @@
tx.commit();//post commit events for lucene
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:noword" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Clock.class, Book.class );
@@ -281,7 +279,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -307,7 +305,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -332,7 +330,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -368,7 +366,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -412,7 +410,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:XXX" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -438,7 +436,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -496,7 +494,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:Festina" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Clock.class, Book.class );
@@ -552,7 +550,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:Festina" );
org.hibernate.Query hibQuery = s.createFullTextQuery( query, Book.class );
@@ -585,7 +583,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:XXX" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -616,7 +614,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:XXX" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -639,7 +637,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:XXX" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -673,7 +671,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Book.class,
AlternateBook.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -34,7 +34,6 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.KeywordAnalyzer;
import org.apache.lucene.search.Query;
/**
@@ -56,7 +55,7 @@
statement.close();
FullTextSession s = Search.getFullTextSession( sess );
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new KeywordAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.keywordAnalyzer );
Query query = parser.parse( "name:moo" );
FullTextQuery hibQuery = s.createFullTextQuery( query, Author.class, Music.class );
List result = hibQuery.list();
@@ -70,7 +69,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Author.class,
Music.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -30,12 +30,9 @@
import java.util.Map;
import java.util.Date;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
-
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -65,7 +62,7 @@
s.clear();
Transaction tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
hibQuery.setProjection( FullTextQuery.OBJECT_CLASS );
@@ -88,7 +85,7 @@
Transaction tx;
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -154,7 +151,7 @@
Transaction tx;
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -181,7 +178,7 @@
Transaction tx;
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -254,7 +251,7 @@
Transaction tx;
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:ITech" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -292,7 +289,7 @@
Transaction tx;
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:Accounting" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -356,7 +353,7 @@
Transaction tx;
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "dept", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "dept:Accounting" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class );
@@ -430,7 +427,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.stopAnalyzer );
Query query = parser.parse( "summary:Festina" );
org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Book.class );
@@ -489,7 +486,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Book.class,
Author.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/QueryLoaderTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/QueryLoaderTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/QueryLoaderTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,7 +26,6 @@
import java.util.List;
-import org.apache.lucene.analysis.KeywordAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.hibernate.Session;
@@ -88,7 +87,7 @@
FullTextSession s = Search.getFullTextSession( sess );
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "title", new KeywordAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "title", SearchTestCase.keywordAnalyzer );
Query query = parser.parse( "title:moo" );
FullTextQuery hibQuery = s.createFullTextQuery( query, Music.class );
List result = hibQuery.list();
@@ -110,7 +109,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Author.class,
Music.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,10 +24,8 @@
*/
package org.hibernate.search.test.query;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
-
import org.hibernate.HibernateException;
import org.hibernate.Transaction;
import org.hibernate.search.FullTextQuery;
@@ -53,7 +51,7 @@
tx.commit();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "name", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "name", SearchTestCase.standardAnalyzer );
Query query = parser.parse( "name:foo" );
FullTextQuery hibQuery = s.createFullTextQuery( query );
try {
@@ -68,7 +66,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Person.class,
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -80,7 +80,7 @@
public void testScrollingForward() {
Transaction tx = sess.beginTransaction();
TermQuery tq = new TermQuery( new Term( "summary", "number") );
- Sort sort = new Sort( new SortField( "summary" ) );
+ Sort sort = new Sort( new SortField( "summary", SortField.STRING ) );
ScrollableResults scrollableResults = sess
.createFullTextQuery( tq, AlternateBook.class )
.setSort( sort )
@@ -115,7 +115,7 @@
public void testScrollingBackwards() {
Transaction tx = sess.beginTransaction();
TermQuery tq = new TermQuery( new Term( "summary", "number") );
- Sort sort = new Sort( new SortField( "summary" ) );
+ Sort sort = new Sort( new SortField( "summary", SortField.STRING ) );
ScrollableResults scrollableResults = sess
.createFullTextQuery( tq, AlternateBook.class )
.setSort( sort )
@@ -145,7 +145,7 @@
public void testResultsAreManaged() {
Transaction tx = sess.beginTransaction();
TermQuery tq = new TermQuery( new Term( "summary", "number") );
- Sort sort = new Sort( new SortField( "summary" ) );
+ Sort sort = new Sort( new SortField( "summary", SortField.STRING ) );
ScrollableResults scrollableResults = sess
.createFullTextQuery( tq, AlternateBook.class )
.setSort( sort )
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/TermVectorTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/TermVectorTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/TermVectorTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -120,7 +120,7 @@
tx.commit();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[]{
ElectricalProperties.class,
Employee.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -28,7 +28,6 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import org.hibernate.search.annotations.Boost;
import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed;
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -124,7 +124,7 @@
return score;
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
DynamicBoostedDescriptionLibrary.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,7 +26,6 @@
import java.util.List;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
@@ -53,8 +52,8 @@
fullTextSession.clear();
Transaction tx = fullTextSession.beginTransaction();
- QueryParser authorParser = new QueryParser( "author", new StandardAnalyzer() );
- QueryParser descParser = new QueryParser( "description", new StandardAnalyzer() );
+ QueryParser authorParser = new QueryParser( getTargetLuceneVersion(), "author", SearchTestCase.standardAnalyzer );
+ QueryParser descParser = new QueryParser( getTargetLuceneVersion(), "description", SearchTestCase.standardAnalyzer );
Query author = authorParser.parse( "Wells" );
Query desc = descParser.parse( "martians" );
@@ -91,8 +90,8 @@
fullTextSession.clear();
Transaction tx = fullTextSession.beginTransaction();
- QueryParser authorParser = new QueryParser( "author", new StandardAnalyzer() );
- QueryParser descParser = new QueryParser( "description", new StandardAnalyzer() );
+ QueryParser authorParser = new QueryParser( getTargetLuceneVersion(), "author", SearchTestCase.standardAnalyzer );
+ QueryParser descParser = new QueryParser( getTargetLuceneVersion(), "description", SearchTestCase.standardAnalyzer );
Query author = authorParser.parse( "Wells" );
Query desc = descParser.parse( "martians" );
@@ -129,8 +128,8 @@
fullTextSession.clear();
Transaction tx = fullTextSession.beginTransaction();
- QueryParser authorParser = new QueryParser( "author", new StandardAnalyzer() );
- QueryParser descParser = new QueryParser( "description", new StandardAnalyzer() );
+ QueryParser authorParser = new QueryParser( getTargetLuceneVersion(), "author", SearchTestCase.standardAnalyzer );
+ QueryParser descParser = new QueryParser( getTargetLuceneVersion(), "description", SearchTestCase.standardAnalyzer );
Query author = authorParser.parse( "Wells" );
Query desc = descParser.parse( "martians" );
@@ -211,7 +210,7 @@
tx.commit();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
BoostedDescriptionLibrary.class,
BoostedFieldDescriptionLibrary.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,10 +26,8 @@
import java.util.List;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.search.Query;
-
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -54,8 +52,8 @@
Transaction tx = session.beginTransaction();
FullTextSession fullTextSession = Search.getFullTextSession( session );
- MultiFieldQueryParser parser = new MultiFieldQueryParser(
- new String[] { "kurztext" }, new StandardAnalyzer()
+ MultiFieldQueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(),
+ new String[] { "kurztext" }, SearchTestCase.standardAnalyzer
);
Query query = parser.parse( "combi OR sport" );
@@ -78,8 +76,8 @@
Transaction tx = session.beginTransaction();
FullTextSession fullTextSession = Search.getFullTextSession( session );
- MultiFieldQueryParser parser = new MultiFieldQueryParser(
- new String[] { "kurztext" }, new StandardAnalyzer()
+ MultiFieldQueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(),
+ new String[] { "kurztext" }, SearchTestCase.standardAnalyzer
);
Query query = parser.parse( "combi OR sport" );
@@ -102,8 +100,8 @@
Transaction tx = session.beginTransaction();
FullTextSession fullTextSession = Search.getFullTextSession( session );
- MultiFieldQueryParser parser = new MultiFieldQueryParser(
- new String[] { "kurztext" }, new StandardAnalyzer()
+ MultiFieldQueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(),
+ new String[] { "kurztext" }, SearchTestCase.standardAnalyzer
);
Query query = parser.parse( "combi OR sport" );
@@ -143,7 +141,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
AbstractCar.class, CombiCar.class, SportCar.class, Bike.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -35,7 +35,6 @@
import org.hibernate.Transaction;
import org.apache.lucene.search.Query;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
/**
* @author Emmanuel Bernard
@@ -55,7 +54,8 @@
Map<String, Float> boosts = new HashMap<String, Float>(2);
boosts.put( "title", new Float(4) );
boosts.put( "description", new Float(1) );
- MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] {"title", "description"}, new StandardAnalyzer(), boosts);
+ MultiFieldQueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(), new String[] {"title", "description"},
+ SearchTestCase.standardAnalyzer, boosts );
Query luceneQuery = parser.parse( "dark" );
FullTextQuery ftQuery = s.createFullTextQuery( luceneQuery, Dvd.class )
.setProjection( FullTextQuery.DOCUMENT_ID, FullTextQuery.EXPLANATION, FullTextQuery.THIS );
@@ -69,7 +69,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Dvd.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -31,7 +31,6 @@
import java.util.concurrent.Executors;
import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
@@ -70,7 +69,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Detective.class,
Suspect.class
@@ -144,9 +143,9 @@
public void run() {
Session s = sf.openSession();
Transaction tx = s.beginTransaction();
- QueryParser parser = new MultiFieldQueryParser(
+ QueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(),
new String[] { "name", "physicalDescription", "suspectCharge" },
- new StandardAnalyzer()
+ SearchTestCase.standardAnalyzer
);
FullTextQuery query = getQuery( "John Doe", parser, s );
assertTrue( query.getResultSize() != 0 );
@@ -207,9 +206,9 @@
public void run() {
Session s = sf.openSession();
Transaction tx = s.beginTransaction();
- QueryParser parser = new MultiFieldQueryParser(
+ QueryParser parser = new MultiFieldQueryParser( getTargetLuceneVersion(),
new String[] { "name", "physicalDescription", "suspectCharge" },
- new StandardAnalyzer()
+ SearchTestCase.standardAnalyzer
);
FullTextQuery query = getQuery( "John Doe", parser, s );
assertTrue( query.getResultSize() != 0 );
Modified: search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/FilterOnDirectoryTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/FilterOnDirectoryTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/FilterOnDirectoryTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -84,7 +84,7 @@
cfg.setProperty( Environment.READER_STRATEGY, SharingBufferReaderProvider.class.getName() );
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Detective.class,
Suspect.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -189,11 +189,6 @@
}
@Override
- protected void doCommit() {
- throw new UnsupportedOperationException();
- }
-
- @Override
protected void doDelete(int docNum) {
throw new UnsupportedOperationException();
}
@@ -293,6 +288,16 @@
throw new UnsupportedOperationException();
}
+// @Override not defined in Lucene 2.9, added in 3.0
+ protected void doCommit(Map<String, String> commitUserData) {
+ throw new UnsupportedOperationException();
+ }
+
+// @Override not defined in Lucene 3.0, existed before
+ protected void doCommit() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
}
}
Modified: search/trunk/src/test/java/org/hibernate/search/test/reader/performance/AbstractActivity.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/reader/performance/AbstractActivity.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/reader/performance/AbstractActivity.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,7 +27,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
@@ -38,6 +37,7 @@
import org.hibernate.search.FullTextQuery;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
+import org.hibernate.search.test.SearchTestCase;
/**
* @author Sanne Grinovero
@@ -47,9 +47,9 @@
private final ThreadLocal<QueryParser> parsers = new ThreadLocal<QueryParser>(){
@Override
protected QueryParser initialValue(){
- return new MultiFieldQueryParser(
+ return new MultiFieldQueryParser( SearchTestCase.getTargetLuceneVersion(),
new String[] {"name", "physicalDescription", "suspectCharge"},
- new StandardAnalyzer() );
+ SearchTestCase.standardAnalyzer );
}
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/reader/performance/ReaderPerformance.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/reader/performance/ReaderPerformance.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/reader/performance/ReaderPerformance.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -73,7 +73,7 @@
private void buildBigIndex() throws InterruptedException, CorruptIndexException, LockObtainFailedException, IOException {
System.out.println( "Going to create fake index..." );
- FSDirectory directory = FSDirectory.getDirectory(new File(getBaseIndexDir(), Detective.class.getCanonicalName()));
+ FSDirectory directory = FSDirectory.open(new File(getBaseIndexDir(), Detective.class.getCanonicalName()));
IndexWriter.MaxFieldLength fieldLength = new IndexWriter.MaxFieldLength( IndexWriter.DEFAULT_MAX_FIELD_LENGTH );
IndexWriter iw = new IndexWriter( directory, new SimpleAnalyzer(), true, fieldLength );
IndexFillRunnable filler = new IndexFillRunnable( iw );
@@ -90,7 +90,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Detective.class,
Suspect.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -77,7 +77,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
List result = s.createFullTextQuery( parser.parse( "body:create" ) ).list();
assertEquals( 14, result.size() );
for (Object object : result) {
@@ -105,7 +105,7 @@
//check non created object does get found!!1
s = new FullTextSessionImpl( openSession() );
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
List result = s.createFullTextQuery( parser.parse( "body:create" ) ).list();
assertEquals( 0, result.size() );
tx.commit();
@@ -126,7 +126,7 @@
s = new FullTextSessionImpl( openSession() );
tx = s.beginTransaction();
- parser = new QueryParser( "id", new StopAnalyzer() );
+ parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
result = s.createFullTextQuery( parser.parse( "body:write" ) ).list();
assertEquals( 0, result.size() );
result = s.createCriteria( Email.class ).list();
@@ -217,7 +217,7 @@
cfg.setProperty( Environment.ANALYZER_CLASS, StopAnalyzer.class.getName() );
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Email.class,
Entite.class,
Modified: search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -74,7 +74,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
List result = s.createFullTextQuery( parser.parse( "body:create" ) ).list();
assertEquals( 14, result.size() );
for (Object object : result) {
@@ -89,7 +89,7 @@
cfg.setProperty( Environment.ANALYZER_CLASS, StopAnalyzer.class.getName() );
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Email.class,
Domain.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/session/OptimizeTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/session/OptimizeTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/session/OptimizeTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -65,7 +65,7 @@
//check non indexed object get indexed by s.index
s = new FullTextSessionImpl( openSession() );
tx = s.beginTransaction();
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
int result = s.createFullTextQuery( parser.parse( "body:wrote" ) ).getResultSize();
assertEquals( 2000, result );
s.createQuery( "delete " + Email.class.getName() ).executeUpdate();
@@ -101,7 +101,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Email.class,
Domain.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/session/SessionTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/session/SessionTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/session/SessionTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -91,7 +91,7 @@
}
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Email.class,
Domain.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -70,7 +70,7 @@
// create a dummy document for the same customerID, and make sure the shard it would be
// indexed on matches the shard returned by getDirectoryProvidersForQuery()
Document document = new Document();
- document.add(new Field("customerID", "5", Field.Store.NO, Field.Index.UN_TOKENIZED));
+ document.add(new Field("customerID", "5", Field.Store.NO, Field.Index.NOT_ANALYZED));
assertTrue(providers[0].equals(
shardStrategy.getDirectoryProviderForAddition(null, null, null, document)
Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -26,7 +26,6 @@
import java.util.List;
-import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -72,7 +71,7 @@
tx = s.beginTransaction();
FullTextSession fts = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser("id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
FullTextQuery fullTextQuery = fts.createFullTextQuery( parser.parse( "body:message" ) );
List results = fullTextQuery.list();
@@ -88,7 +87,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Email.class
};
Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/ShardsTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/ShardsTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/ShardsTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -41,6 +41,7 @@
import org.hibernate.Transaction;
import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.Term;
@@ -50,7 +51,6 @@
*/
public class ShardsTest extends SearchTestCase {
-
protected void configure(Configuration cfg) {
super.configure( cfg );
cfg.setProperty( "hibernate.search.default.directory_provider", FSDirectoryProvider.class.getName() );
@@ -98,7 +98,7 @@
tx = s.beginTransaction();
FullTextSession fts = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser("id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
List results = fts.createFullTextQuery( parser.parse( "name:mouse OR name:bear" ) ).list();
assertEquals( "Either double insert, single update, or query fails with shards", 2, results.size() );
@@ -127,24 +127,36 @@
s.clear();
- IndexReader reader = IndexReader.open( new File( getBaseIndexDir(), "Animal00" ) );
+ FSDirectory animal00Directory = FSDirectory.open( new File( getBaseIndexDir(), "Animal00" ) );
try {
- int num = reader.numDocs();
- assertEquals( 1, num );
+ IndexReader reader = IndexReader.open( animal00Directory );
+ try {
+ int num = reader.numDocs();
+ assertEquals( 1, num );
+ }
+ finally {
+ reader.close();
+ }
}
finally {
- reader.close();
+ animal00Directory.close();
}
- reader = IndexReader.open( new File( getBaseIndexDir(), "Animal.1" ) );
+
+ FSDirectory animal01Directory = FSDirectory.open( new File( getBaseIndexDir(), "Animal.1" ) );
try {
- int num = reader.numDocs();
- assertEquals( 1, num );
+ IndexReader reader = IndexReader.open( animal01Directory );
+ try {
+ int num = reader.numDocs();
+ assertEquals( 1, num );
+ }
+ finally {
+ reader.close();
+ }
}
finally {
- reader.close();
+ animal01Directory.close();
}
-
tx = s.beginTransaction();
a = (Animal) s.get(Animal.class, 1);
a.setName( "Mouse" );
@@ -152,22 +164,28 @@
s.clear();
- reader = IndexReader.open( new File( getBaseIndexDir(), "Animal.1" ) );
+ animal01Directory = FSDirectory.open( new File( getBaseIndexDir(), "Animal.1" ) );
try {
- int num = reader.numDocs();
- assertEquals( 1, num );
- TermDocs docs = reader.termDocs( new Term( "name", "mouse" ) );
- assertTrue( docs.next() );
- org.apache.lucene.document.Document doc = reader.document( docs.doc() );
- assertFalse( docs.next() );
+ IndexReader reader = IndexReader.open( animal01Directory );
+ try {
+ int num = reader.numDocs();
+ assertEquals( 1, num );
+ TermDocs docs = reader.termDocs( new Term( "name", "mouse" ) );
+ assertTrue( docs.next() );
+ org.apache.lucene.document.Document doc = reader.document( docs.doc() );
+ assertFalse( docs.next() );
+ }
+ finally {
+ reader.close();
+ }
}
finally {
- reader.close();
+ animal01Directory.close();
}
tx = s.beginTransaction();
FullTextSession fts = Search.getFullTextSession( s );
- QueryParser parser = new QueryParser("id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
List results = fts.createFullTextQuery( parser.parse( "name:mouse OR name:bear" ) ).list();
assertEquals( "Either double insert, single update, or query fails with shards", 2, results.size() );
@@ -196,7 +214,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Animal.class,
Furniture.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -80,7 +80,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Trash.class,
Can.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/util/textbuilder/WordDictionary.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/util/textbuilder/WordDictionary.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/util/textbuilder/WordDictionary.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -24,6 +24,7 @@
*/
package org.hibernate.search.test.util.textbuilder;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Random;
@@ -53,7 +54,7 @@
gaussFactor = ((double)maxSize +1 ) / 4d ;
}
- private static class StringLengthComparator implements Comparator<String> {
+ private static class StringLengthComparator implements Comparator<String>, Serializable {
public int compare(String o1, String o2) {
return o1.length()-o2.length();
Modified: search/trunk/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -69,7 +69,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] {
Drink.class,
Food.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/worker/WorkerTestCase.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/worker/WorkerTestCase.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/worker/WorkerTestCase.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -124,7 +124,7 @@
s = sf.openSession();
tx = s.beginTransaction();
FullTextSession fts = new FullTextSessionImpl( s );
- QueryParser parser = new QueryParser( "id", new StopAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
Query query;
try {
query = parser.parse( "name:emmanuel2" );
@@ -198,7 +198,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[]{
Employee.class,
Employer.class
Modified: search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java 2010-02-08 21:28:05 UTC (rev 18736)
+++ search/trunk/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java 2010-02-08 21:35:12 UTC (rev 18737)
@@ -27,13 +27,11 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs;
-
import org.hibernate.Transaction;
import org.hibernate.search.FullTextQuery;
import org.hibernate.search.FullTextSession;
@@ -81,7 +79,7 @@
// search if the record made it into the index
tx = s.beginTransaction();
String searchQuery = "Joe";
- QueryParser parser = new QueryParser( "Content", new StandardAnalyzer() );
+ QueryParser parser = new QueryParser( getTargetLuceneVersion(), "Content", SearchTestCase.standardAnalyzer );
Query luceneQuery = parser.parse( searchQuery );
FullTextQuery query = s.createFullTextQuery( luceneQuery );
List results = query.list();
@@ -154,7 +152,7 @@
}
- protected Class[] getMappings() {
+ protected Class<?>[] getMappings() {
return new Class[] { Person.class, EmailAddress.class, SpecialPerson.class };
}
}
More information about the hibernate-commits
mailing list