[hibernate-commits] Hibernate SVN: r19535 - in core/trunk: documentation/manual and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2010-05-18 03:05:32 -0400 (Tue, 18 May 2010)
New Revision: 19535

Modified:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java
   core/trunk/documentation/manual/pom.xml
Log:
HHH-5233 add test on @FetchProfile and multiple @FetchOverride
Clean some more

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java	2010-05-18 06:25:23 UTC (rev 19534)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java	2010-05-18 07:05:32 UTC (rev 19535)
@@ -49,7 +49,8 @@
 		@FetchProfile(name = "customer-with-orders-and-country",
 				fetchOverrides = {
 			@FetchProfile.FetchOverride(entity = Customer.class, association = "orders", mode = FetchMode.JOIN),
-			@FetchProfile.FetchOverride(entity = Customer.class, association = "lastOrder", mode = FetchMode.JOIN)
+			@FetchProfile.FetchOverride(entity = Customer.class, association = "lastOrder", mode = FetchMode.JOIN),
+			@FetchProfile.FetchOverride(entity = Order.class, association = "country", mode = FetchMode.JOIN)
 		})
 })
 public class Customer {

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java	2010-05-18 06:25:23 UTC (rev 19534)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java	2010-05-18 07:05:32 UTC (rev 19535)
@@ -13,7 +13,7 @@
  */
 public class MoreFetchProfileTest extends TestCase{
 
-	@FailureExpected( jiraKey = "HHH-5233")
+	//@FailureExpected( jiraKey = "HHH-5233")
 	public void testFetchWithTwoOverrides() throws Exception {
 		Session s = openSession(  );
 		s.enableFetchProfile( "customer-with-orders-and-country" );
@@ -47,7 +47,7 @@
 		assertTrue( Hibernate.isInitialized( c.getLastOrder() ) );
 		assertTrue( Hibernate.isInitialized( c.getOrders() ) );
 		for(Order so : c.getOrders() ) {
-			//assertTrue( Hibernate.isInitialized( so.getCountry() ) );
+			assertTrue( Hibernate.isInitialized( so.getCountry() ) );
 		}
 		final Order order = c.getOrders().iterator().next();
 		c.getOrders().remove( order );

Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml	2010-05-18 06:25:23 UTC (rev 19534)
+++ core/trunk/documentation/manual/pom.xml	2010-05-18 07:05:32 UTC (rev 19535)
@@ -40,15 +40,15 @@
                 <configuration>
                     <sourceDocumentName>HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.xml</sourceDocumentName>
                     <masterTranslation>en-US</masterTranslation>
-                    <translations>
+                    <!-- translations>
                         <translation>de-DE</translation>
                         <translation>es-ES</translation>
                         <translation>fr-FR</translation>
                         <translation>ja-JP</translation>
-                        <!-- <translation>ko-KR</translation> -->
+                        <!- - <translation>ko-KR</translation> - ->
                         <translation>pt-BR</translation>
                         <translation>zh-CN</translation>
-                    </translations>
+                    </translations -->
                     <imageResource>
                         <directory>${basedir}/src/main/docbook/en-US</directory>
                         <excludes>