Author: epbernard Date: 2010-10-11 14:29:09 -0400 (Mon, 11 Oct 2010) New Revision: 20809 Added: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectGet.java search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectSet.java Removed: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect.java search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect2.java Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java Log: HSEARCH-575 Better error report on bridge failure Rename entities in tests to reflect tested area Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java 2010-10-11 18:23:21 UTC (rev 20808) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java 2010-10-11 18:29:09 UTC (rev 20809) @@ -271,8 +271,8 @@ } public void testIncorrectSetBridge() throws Exception { - Incorrect incorrect = new Incorrect(); - incorrect.setSubIncorrect(new Incorrect.SubIncorrect()); + IncorrectSet incorrect = new IncorrectSet(); + incorrect.setSubIncorrect(new IncorrectSet.SubIncorrect()); incorrect.getSubIncorrect().setName("This is a name not a class"); org.hibernate.Session s = openSession(); @@ -293,7 +293,7 @@ final Throwable throwable = e.getCause(); if (throwable instanceof BridgeException) { //expected - assertTrue( throwable.getMessage().contains( "class: " + Incorrect.class.getName() ) ); + assertTrue( throwable.getMessage().contains( "class: " + IncorrectSet.class.getName() ) ); assertTrue( throwable.getMessage().contains("path: subIncorrect.name") ); tx.rollback(); } @@ -310,8 +310,8 @@ } public void testIncorrectGetBridge() throws Exception { - Incorrect2 incorrect = new Incorrect2(); - incorrect.setSubIncorrect(new Incorrect2.SubIncorrect()); + IncorrectGet incorrect = new IncorrectGet(); + incorrect.setSubIncorrect(new IncorrectGet.SubIncorrect()); incorrect.getSubIncorrect().setName("This is a name not a class"); FullTextSession s = Search.getFullTextSession( openSession() ); @@ -320,11 +320,11 @@ tx.commit(); s.clear(); tx = s.beginTransaction(); - final QueryBuilder builder = s.getSearchFactory().buildQueryBuilder().forEntity(Incorrect2.class).get(); + final QueryBuilder builder = s.getSearchFactory().buildQueryBuilder().forEntity(IncorrectGet.class).get(); final Query query = builder.keyword().onField("subIncorrect.name").matching("name").createQuery(); try { - final FullTextQuery textQuery = s.createFullTextQuery(query, Incorrect2.class).setProjection("subIncorrect.name"); + final FullTextQuery textQuery = s.createFullTextQuery(query, IncorrectGet.class).setProjection("subIncorrect.name"); final List results = textQuery.list(); fail("Incorrect bridge should fail"); } @@ -336,7 +336,7 @@ if (throwable instanceof BridgeException) { //expected //System.out.println( throwable.getMessage() ); - assertTrue( throwable.getMessage().contains( "class: " + Incorrect2.class.getName() ) ); + assertTrue( throwable.getMessage().contains( "class: " + IncorrectGet.class.getName() ) ); assertTrue( throwable.getMessage().contains("path: subIncorrect.name") ); tx.rollback(); } @@ -351,7 +351,7 @@ } tx = s.beginTransaction(); - s.delete( s.get( Incorrect2.class, incorrect.getId() ) ); + s.delete( s.get( IncorrectGet.class, incorrect.getId() ) ); tx.commit(); s.close(); } @@ -378,7 +378,7 @@ final Throwable throwable = e.getCause(); if (throwable instanceof BridgeException) { //expected - assertTrue( throwable.getMessage().contains( "class: " + Incorrect.class.getName() ) ); + assertTrue( throwable.getMessage().contains( "class: " + IncorrectSet.class.getName() ) ); assertTrue( throwable.getMessage().contains("path: id") ); tx.rollback(); } @@ -398,8 +398,8 @@ protected Class<?>[] getAnnotatedClasses() { return new Class[] { Cloud.class, - Incorrect.class, - Incorrect2.class, + IncorrectSet.class, + IncorrectGet.class, IncorrectObjectToString.class }; } Deleted: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect.java =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect.java 2010-10-11 18:23:21 UTC (rev 20808) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect.java 2010-10-11 18:29:09 UTC (rev 20809) @@ -1,38 +0,0 @@ -package org.hibernate.search.test.bridge; - -import org.hibernate.search.annotations.Field; -import org.hibernate.search.annotations.FieldBridge; -import org.hibernate.search.annotations.Indexed; -import org.hibernate.search.annotations.IndexedEmbedded; -import org.hibernate.search.bridge.TwoWayStringBridge; -import org.hibernate.search.bridge.builtin.ClassBridge; - -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * @author Emmanuel Bernard - */ -@Entity -@Indexed -public class Incorrect { - @Id @GeneratedValue - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - private Long id; - - @IndexedEmbedded - @Embedded - public SubIncorrect getSubIncorrect() { return subIncorrect; } - public void setSubIncorrect(SubIncorrect subIncorrect) { this.subIncorrect = subIncorrect; } - private SubIncorrect subIncorrect; - - public static class SubIncorrect { - @Field( bridge = @FieldBridge(impl = ClassBridge.class) ) - public String getName() { return name; } - public void setName(String name) { this.name = name; } - private String name; - } -} Deleted: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect2.java =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect2.java 2010-10-11 18:23:21 UTC (rev 20808) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect2.java 2010-10-11 18:29:09 UTC (rev 20809) @@ -1,46 +0,0 @@ -package org.hibernate.search.test.bridge; - -import org.hibernate.search.annotations.*; -import org.hibernate.search.bridge.TwoWayStringBridge; -import org.hibernate.search.bridge.builtin.ClassBridge; - -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * @author Emmanuel Bernard - */ -@Entity -@Indexed -public class Incorrect2 { - @Id @GeneratedValue - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - private Long id; - - @IndexedEmbedded - @Embedded - public SubIncorrect getSubIncorrect() { return subIncorrect; } - public void setSubIncorrect(SubIncorrect subIncorrect) { this.subIncorrect = subIncorrect; } - private SubIncorrect subIncorrect; - - public static class SubIncorrect { - @Field( bridge = @FieldBridge(impl = ErrorOnGetBridge.class), store = Store.YES) - public String getName() { return name; } - public void setName(String name) { this.name = name; } - private String name; - } - - public static class ErrorOnGetBridge implements TwoWayStringBridge { - - public Object stringToObject(String stringValue) { - throw new RuntimeException("Failure"); - } - - public String objectToString(Object object) { - return object.toString(); - } - } -} Copied: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectGet.java (from rev 20808, search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect2.java) =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectGet.java (rev 0) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectGet.java 2010-10-11 18:29:09 UTC (rev 20809) @@ -0,0 +1,46 @@ +package org.hibernate.search.test.bridge; + +import org.hibernate.search.annotations.*; +import org.hibernate.search.bridge.TwoWayStringBridge; +import org.hibernate.search.bridge.builtin.ClassBridge; + +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @author Emmanuel Bernard + */ +@Entity +@Indexed +public class IncorrectGet { + @Id @GeneratedValue + public Long getId() { return id; } + public void setId(Long id) { this.id = id; } + private Long id; + + @IndexedEmbedded + @Embedded + public SubIncorrect getSubIncorrect() { return subIncorrect; } + public void setSubIncorrect(SubIncorrect subIncorrect) { this.subIncorrect = subIncorrect; } + private SubIncorrect subIncorrect; + + public static class SubIncorrect { + @Field( bridge = @FieldBridge(impl = ErrorOnGetBridge.class), store = Store.YES) + public String getName() { return name; } + public void setName(String name) { this.name = name; } + private String name; + } + + public static class ErrorOnGetBridge implements TwoWayStringBridge { + + public Object stringToObject(String stringValue) { + throw new RuntimeException("Failure"); + } + + public String objectToString(Object object) { + return object.toString(); + } + } +} Copied: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectSet.java (from rev 20808, search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/Incorrect.java) =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectSet.java (rev 0) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/IncorrectSet.java 2010-10-11 18:29:09 UTC (rev 20809) @@ -0,0 +1,38 @@ +package org.hibernate.search.test.bridge; + +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.FieldBridge; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.IndexedEmbedded; +import org.hibernate.search.bridge.TwoWayStringBridge; +import org.hibernate.search.bridge.builtin.ClassBridge; + +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @author Emmanuel Bernard + */ +@Entity +@Indexed +public class IncorrectSet { + @Id @GeneratedValue + public Long getId() { return id; } + public void setId(Long id) { this.id = id; } + private Long id; + + @IndexedEmbedded + @Embedded + public SubIncorrect getSubIncorrect() { return subIncorrect; } + public void setSubIncorrect(SubIncorrect subIncorrect) { this.subIncorrect = subIncorrect; } + private SubIncorrect subIncorrect; + + public static class SubIncorrect { + @Field( bridge = @FieldBridge(impl = ClassBridge.class) ) + public String getName() { return name; } + public void setName(String name) { this.name = name; } + private String name; + } +}