[hibernate-commits] Hibernate SVN: r10567 - in branches/Lucene_Integration/HibernateExt/metadata/src: java/org/hibernate/lucene/store test/org/hibernate/lucene/test test/org/hibernate/lucene/test/inheritance

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2006-10-11 01:18:23 -0400 (Wed, 11 Oct 2006)
New Revision: 10567

Added:
   branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/
   branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Animal.java
   branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/InheritanceTest.java
   branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Mammal.java
Modified:
   branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java
Log:
tests for ANN-387

Modified: branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java	2006-10-11 04:01:11 UTC (rev 10566)
+++ branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java	2006-10-11 05:18:23 UTC (rev 10567)
@@ -37,7 +37,6 @@
 	private static String DEFAULT_DIRECTORY_PROVIDER = FSDirectoryProvider.class.getName();
 
 
-
 	public DirectoryProvider<?> createDirectoryProvider(Class<?> entity, Configuration cfg) {
 		//get properties
 		String directoryProviderName = getDirectoryProviderName( entity, cfg );
@@ -50,7 +49,8 @@
 		}
 		DirectoryProvider<?> provider = null;
 		try {
-			Class<DirectoryProvider> directoryClass = ReflectHelper.classForName(
+            @SuppressWarnings("unchecked")
+            Class<DirectoryProvider> directoryClass = ReflectHelper.classForName(
 					className, DirectoryProviderFactory.class
 			);
 			provider = directoryClass.newInstance();

Added: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Animal.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Animal.java	2006-10-11 04:01:11 UTC (rev 10566)
+++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Animal.java	2006-10-11 05:18:23 UTC (rev 10567)
@@ -0,0 +1,38 @@
+//$Id: $
+package org.hibernate.lucene.test.inheritance;
+
+import org.hibernate.lucene.Keyword;
+import org.hibernate.lucene.Text;
+import org.hibernate.lucene.Indexed;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+ at Indexed
+public class Animal {
+    private Long id;
+    private String name;
+
+    @Id @GeneratedValue @Keyword(id=true) 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Text
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

Added: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/InheritanceTest.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/InheritanceTest.java	2006-10-11 04:01:11 UTC (rev 10566)
+++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/InheritanceTest.java	2006-10-11 05:18:23 UTC (rev 10567)
@@ -0,0 +1,63 @@
+//$Id: $
+package org.hibernate.lucene.test.inheritance;
+
+import org.hibernate.lucene.test.TestCase;
+import org.hibernate.lucene.test.query.Clock;
+import org.hibernate.lucene.test.query.Book;
+import org.hibernate.lucene.LuceneSession;
+import org.hibernate.Transaction;
+import org.hibernate.Hibernate;
+import org.hibernate.ScrollableResults;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.search.Query;
+
+import java.util.List;
+import java.util.Iterator;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class InheritanceTest extends TestCase {
+
+	public void testInheritance() throws Exception {
+		LuceneSession s = new LuceneSession( openSession() );
+		Transaction tx = s.beginTransaction();
+		Animal a = new Animal();
+        a.setName("Shark");
+        s.save( a );
+        Mammal m = new Mammal();
+        m.setMammalNbr(2);
+        m.setName("Elephant");
+        s.save(m);
+		tx.commit();//post commit events for lucene
+		s.clear();
+		tx = s.beginTransaction();
+		QueryParser parser = new QueryParser("name", new StopAnalyzer() );
+
+		Query query;
+		org.hibernate.Query hibQuery;
+
+        query = parser.parse( "Elephant" );
+		hibQuery = s.createLuceneQuery( query, Animal.class, Mammal.class );
+		List result = hibQuery.list();
+		assertNotNull( result );
+		assertEquals( 1, result.size() );
+
+        query = parser.parse( "mammalNbr:[2 TO 2]" );
+		hibQuery = s.createLuceneQuery( query, Animal.class, Mammal.class );
+		result = hibQuery.list();
+		assertNotNull( result );
+		assertEquals( 1, result.size() );
+
+        tx.commit();
+		s.close();
+	}
+
+	protected Class[] getMappings() {
+		return new Class[] {
+                Animal.class,
+                Mammal.class
+        };
+	}
+}

Added: branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Mammal.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Mammal.java	2006-10-11 04:01:11 UTC (rev 10566)
+++ branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/inheritance/Mammal.java	2006-10-11 05:18:23 UTC (rev 10567)
@@ -0,0 +1,26 @@
+//$Id: $
+package org.hibernate.lucene.test.inheritance;
+
+import org.hibernate.lucene.Text;
+import org.hibernate.lucene.Indexed;
+import org.hibernate.lucene.Keyword;
+
+import javax.persistence.Entity;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+ at Indexed
+public class Mammal extends Animal {
+    private int mammalNbr;
+
+    @Keyword
+    public int getMammalNbr() {
+        return mammalNbr;
+    }
+
+    public void setMammalNbr(int mammalNbr) {
+        this.mammalNbr = mammalNbr;
+    }
+}