[hibernate-commits] Hibernate SVN: r19404 - in annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations: lob and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-05-07 08:25:26 -0400 (Fri, 07 May 2010)
New Revision: 19404

Modified:
   annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
   annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
   annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
   annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
Log:
JBPAPP-4235 HHH-4822 Add @FailureExpected annotation to annotations and entitymananger modules to allow the skipping of tests

Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java	2010-05-07 12:23:49 UTC (rev 19403)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java	2010-05-07 12:25:26 UTC (rev 19404)
@@ -3,6 +3,7 @@
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.mapping.Column;
 import org.hibernate.test.annotations.TestCase;
 import org.hibernate.test.annotations.id.sequences.entities.Ball;
@@ -277,8 +278,8 @@
 	
 	
 	@Override
-	protected boolean runForCurrentDialect() {
-		return super.runForCurrentDialect() && getDialect().supportsSequences();
+	protected boolean runForCurrentDialect( Dialect dialect ) {
+		return dialect.supportsSequences();
 	}
 
 	/**

Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java	2010-05-07 12:23:49 UTC (rev 19403)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java	2010-05-07 12:25:26 UTC (rev 19404)
@@ -3,6 +3,9 @@
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.junit.SkipForDialect;
 import org.hibernate.test.annotations.TestCase;
 
 /**
@@ -65,6 +68,7 @@
 		s.close();
 	}
 
+	@SkipForDialect(jiraKey="HHH-4876",value={PostgreSQLDialect.class})
 	public void testBlob() throws Exception {
 		Session s;
 		Transaction tx;
@@ -115,8 +119,8 @@
 	}
 
 	@Override
-	protected boolean runForCurrentDialect() {
-		return super.runForCurrentDialect() && getDialect().supportsExpectedLobUsagePattern();
+	protected boolean runForCurrentDialect( Dialect dialect ) {
+		return dialect.supportsExpectedLobUsagePattern();
 	}
 
 	public LobTest(String x) {

Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java	2010-05-07 12:23:49 UTC (rev 19403)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java	2010-05-07 12:25:26 UTC (rev 19404)
@@ -4,6 +4,7 @@
 import java.math.BigDecimal;
 
 import org.hibernate.Session;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.test.annotations.TestCase;
 
 /**
@@ -38,8 +39,8 @@
 	
 	
 	@Override
-	protected boolean runForCurrentDialect() {
-		return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+	protected boolean runForCurrentDialect( Dialect dialect ) {
+		return dialect.supportsIdentityColumns();
 	}
 
 

Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java	2010-05-07 12:23:49 UTC (rev 19403)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java	2010-05-07 12:25:26 UTC (rev 19404)
@@ -2,6 +2,7 @@
 package org.hibernate.test.annotations.xml.hbm;
 
 import org.hibernate.Session;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.test.annotations.TestCase;
 
 /**
@@ -26,8 +27,8 @@
 	
 	
 	@Override
-	protected boolean runForCurrentDialect() {
-		return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+	protected boolean runForCurrentDialect( Dialect dialect ) {
+		return dialect.supportsIdentityColumns();
 	}