From hibernate-commits at lists.jboss.org Mon Aug 18 13:36:38 2008
Content-Type: multipart/mixed; boundary="===============4903484851854098280=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r15096 -
 search/trunk/src/test/org/hibernate/search/test/id/providedId.
Date: Mon, 18 Aug 2008 13:36:38 -0400
Message-ID: <E1KV8ek-0005lT-HY@committer01.frg.pub.inap.atl.jboss.com>

--===============4903484851854098280==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: navssurtani
Date: 2008-08-18 13:36:38 -0400 (Mon, 18 Aug 2008)
New Revision: 15096

Added:
   search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedId=
Person.java
   search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedId=
PersonSub.java
Removed:
   search/trunk/src/test/org/hibernate/search/test/id/providedId/JBossCache=
Person.java
Modified:
   search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedId=
Test.java
Log:
Changed JBossCachePerson to ProvidedIdPerson and added subclass ...

Deleted: search/trunk/src/test/org/hibernate/search/test/id/providedId/JBos=
sCachePerson.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/id/providedId/JBossCach=
ePerson.java	2008-08-18 15:25:50 UTC (rev 15095)
+++ search/trunk/src/test/org/hibernate/search/test/id/providedId/JBossCach=
ePerson.java	2008-08-18 17:36:38 UTC (rev 15096)
@@ -1,63 +0,0 @@
-package org.hibernate.search.test.id.providedId;
-
-import org.hibernate.search.annotations.*;
-import org.hibernate.search.bridge.builtin.LongBridge;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import java.io.Serializable;
-
-
-/**
- @author Navin Surtani (<a href=3D"mailto:nsurtani(a)redhat.com">nsurtani(=
a)redhat.com</a>)
- */
-(a)Entity
-(a)ProvidedId(bridge =3D @FieldBridge(impl =3D LongBridge.class))
-(a)Indexed
-public class JBossCachePerson implements Serializable
-{
-
-   @Id
-   @GeneratedValue
-   private long id;
-
-
-   @Field (index =3D Index.TOKENIZED, store =3D Store.YES)
-   private String name;
-   @Field (index =3D Index.TOKENIZED, store =3D Store.YES)
-   private String blurb;
-   @Field (index =3D Index.UN_TOKENIZED, store =3D Store.YES)
-   private int age;
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name =3D name;
-   }
-
-   public String getBlurb()
-   {
-      return blurb;
-   }
-
-   public void setBlurb(String blurb)
-   {
-      this.blurb =3D blurb;
-   }
-
-   public int getAge()
-   {
-      return age;
-   }
-
-   public void setAge(int age)
-   {
-      this.age =3D age;
-   }
-
-}

Copied: search/trunk/src/test/org/hibernate/search/test/id/providedId/Provi=
dedIdPerson.java (from rev 15091, search/trunk/src/test/org/hibernate/searc=
h/test/id/providedId/JBossCachePerson.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedI=
dPerson.java	                        (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedI=
dPerson.java	2008-08-18 17:36:38 UTC (rev 15096)
@@ -0,0 +1,63 @@
+package org.hibernate.search.test.id.providedId;
+
+import org.hibernate.search.annotations.*;
+import org.hibernate.search.bridge.builtin.LongBridge;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import java.io.Serializable;
+
+
+/**
+ @author Navin Surtani (<a href=3D"mailto:nsurtani(a)redhat.com">nsurtani(=
a)redhat.com</a>)
+ */
+(a)Entity
+(a)ProvidedId(bridge =3D @FieldBridge(impl =3D LongBridge.class))
+(a)Indexed
+public class ProvidedIdPerson implements Serializable
+{
+
+   @Id
+   @GeneratedValue
+   private long id;
+
+
+   @Field (index =3D Index.TOKENIZED, store =3D Store.YES)
+   private String name;
+   @Field (index =3D Index.TOKENIZED, store =3D Store.YES)
+   private String blurb;
+   @Field (index =3D Index.UN_TOKENIZED, store =3D Store.YES)
+   private int age;
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name =3D name;
+   }
+
+   public String getBlurb()
+   {
+      return blurb;
+   }
+
+   public void setBlurb(String blurb)
+   {
+      this.blurb =3D blurb;
+   }
+
+   public int getAge()
+   {
+      return age;
+   }
+
+   public void setAge(int age)
+   {
+      this.age =3D age;
+   }
+
+}

Added: search/trunk/src/test/org/hibernate/search/test/id/providedId/Provid=
edIdPersonSub.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedI=
dPersonSub.java	                        (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedI=
dPersonSub.java	2008-08-18 17:36:38 UTC (rev 15096)
@@ -0,0 +1,9 @@
+package org.hibernate.search.test.id.providedId;
+
+/**
+ * @author Navin Surtani (<a href=3D"mailto:nsurtani(a)redhat.com">nsurtan=
i(a)redhat.com</a>)
+ */
+public class ProvidedIdPersonSub extends ProvidedIdPerson {
+
+   =

+}

Modified: search/trunk/src/test/org/hibernate/search/test/id/providedId/Pro=
videdIdTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedI=
dTest.java	2008-08-18 15:25:50 UTC (rev 15095)
+++ search/trunk/src/test/org/hibernate/search/test/id/providedId/ProvidedI=
dTest.java	2008-08-18 17:36:38 UTC (rev 15096)
@@ -1,9 +1,6 @@
 package org.hibernate.search.test.id.providedId;
 =

-import java.util.List;
-
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.queryParser.ParseException;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.IndexSearcher;
@@ -11,7 +8,6 @@
 =

 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
 import org.hibernate.search.store.DirectoryProvider;
@@ -24,28 +20,32 @@
 =

 	protected Class[] getMappings() {
 		return new Class[] {
-				JBossCachePerson.class
+				ProvidedIdPerson.class
 		};
 	}
 =

 	public void testProvidedId() throws Exception {
 =

-		JBossCachePerson person1 =3D new JBossCachePerson();
+		ProvidedIdPerson person1 =3D new ProvidedIdPerson();
 		person1.setName( "Big Goat" );
 		person1.setBlurb( "Eats grass" );
 =

-		JBossCachePerson person2 =3D new JBossCachePerson();
+		ProvidedIdPerson person2 =3D new ProvidedIdPerson();
 		person2.setName( "Mini Goat" );
 		person2.setBlurb( "Eats cheese" );
 =

+      ProvidedIdPersonSub person3 =3D new ProvidedIdPersonSub();
+      person3.setName ( "Regular goat" );
+      person3.setBlurb ( "Is anorexic" );
 =

-		Session session =3D openSession();
+      Session session =3D openSession();
 		FullTextSession fullTextSession =3D Search.getFullTextSession( session );
 		Transaction transaction =3D session.beginTransaction();
 		session.persist( person1 );
 		session.persist( person2 );
+      session.persist( person3 );
 =

-		transaction.commit();
+      transaction.commit();
 		session.clear();
 =

 		transaction =3D fullTextSession.beginTransaction();
@@ -57,14 +57,14 @@
 		//needs it. So we use plain Lucene =

 =

 		//we know there is only one DP
-		DirectoryProvider provider =3D fullTextSession.getSearchFactory().getDir=
ectoryProviders( JBossCachePerson.class )[0];
+		DirectoryProvider provider =3D fullTextSession.getSearchFactory().getDir=
ectoryProviders( ProvidedIdPerson.class )[0];
 		IndexSearcher searcher =3D  new IndexSearcher( provider.getDirectory() );
 		Hits hits =3D searcher.search( luceneQuery );
 		searcher.close();
 		transaction.commit();
 		session.close();
 =

-		assertEquals( 2, hits.length() );
+		assertEquals( 3, hits.length() );
 	}
 =

 =



--===============4903484851854098280==--