[hibernate-commits] Hibernate SVN: r16417 - in annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations: join and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: jcosta at redhat.com
Date: 2009-04-23 05:53:55 -0400 (Thu, 23 Apr 2009)
New Revision: 16417

Modified:
   annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/EntityTest.java
   annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/Sky.java
   annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/Cat.java
   annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java
Log:
ANN-822 - JBPAPP-1894 - Backported fix from trunk. For branch v3_2_1_GA_CP

Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/EntityTest.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/EntityTest.java	2009-04-23 09:27:56 UTC (rev 16416)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/EntityTest.java	2009-04-23 09:53:55 UTC (rev 16417)
@@ -247,6 +247,8 @@
 		sky.id = new Long( 1 );
 		sky.color = "black";
 		Sky.area = "Paris";
+		sky.day = "23";
+		sky.month = "1";
 		s.save( sky );
 		tx.commit();
 		s.close();

Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/Sky.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/Sky.java	2009-04-23 09:27:56 UTC (rev 16416)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/Sky.java	2009-04-23 09:53:55 UTC (rev 16417)
@@ -18,10 +18,11 @@
 public class Sky implements Serializable {
 	@Id
 	protected Long id;
-	@Column(unique = true, columnDefinition = "varchar(250)")
+	@Column(unique = true, columnDefinition = "varchar(250)", nullable = false)
 	protected String color;
+	@Column(nullable = false)
 	protected String day;
-	@Column(name = "MONTH")
+	@Column(name = "MONTH", nullable = false)
 	protected String month;
 	static protected String area;
 }

Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/Cat.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/Cat.java	2009-04-23 09:27:56 UTC (rev 16416)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/Cat.java	2009-04-23 09:53:55 UTC (rev 16417)
@@ -74,7 +74,7 @@
 		return storyPart1;
 	}
 
-	@Column(table = "Cat2")
+	@Column(table = "Cat2", nullable = false)
 	public String getStoryPart2() {
 		return storyPart2;
 	}

Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java	2009-04-23 09:27:56 UTC (rev 16416)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/join/JoinTest.java	2009-04-23 09:53:55 UTC (rev 16417)
@@ -99,6 +99,7 @@
 		Life life = new Life();
 		Cat cat = new Cat();
 		cat.setName( "kitty" );
+		cat.setStoryPart2( "and the story continues" );
 		life.duration = 15;
 		life.fullDescription = "Long long description";
 		life.owner = cat;