skip two tests on Informix

Author: gavinking

hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java

@@ -4,11 +4,13 @@
  */
 package org.hibernate.orm.test.hql;
 
+import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -23,6 +25,8 @@
 @JiraKey( value = "HHH-10463")
 @DomainModel(annotatedClasses = org.hibernate.testing.orm.domain.gambit.EntityOfBasics.class)
 @SessionFactory
+@SkipForDialect(dialectClass = InformixDialect.class,
+		reason = "Informix does not allow JDBC parameters as arguments to the COALESCE function (not even with a cast)")
 public class CoalesceTest {
 	final String QRY_STR = "from EntityOfBasics e where e.theString = coalesce(:p , e.theString)";
 

hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java

@@ -16,9 +16,11 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
 
@@ -29,18 +31,18 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author Andrea Boriero
  */
-
+@SkipForDialect(dialectClass = InformixDialect.class,
+		reason = "Informix has a strange syntax for 'alter table add constraint'")
 public class ForeignKeyGenerationTest extends BaseUnitTestCase {
 	private File output;
 	private StandardServiceRegistry ssr;
-	private MetadataImplementor metadata;
 
 	@Before
 	public void setUp() throws IOException {
@@ -150,13 +152,13 @@ alter table EMPLOYEE_PROJECT add constraint FK_PROJECT foreign key (PROJECT_ID)
 		) );
 	}
 
-	private void createSchema(Class[] annotatedClasses) {
+	private void createSchema(Class<?>[] annotatedClasses) {
 		final MetadataSources metadataSources = new MetadataSources( ssr );
 
-		for ( Class c : annotatedClasses ) {
+		for ( Class<?> c : annotatedClasses ) {
 			metadataSources.addAnnotatedClass( c );
 		}
-		metadata = (MetadataImplementor) metadataSources.buildMetadata();
+		final MetadataImplementor metadata = (MetadataImplementor) metadataSources.buildMetadata();
 		metadata.orderColumns( false );
 		metadata.validate();
 		new SchemaExport()
@@ -171,7 +173,8 @@ private void checkAlterTableStatement(AlterTableStatement alterTableStatement)
 		final String expectedAlterTableStatement = alterTableStatement.toSQL();
 		final List<String> sqlLines = Files.readAllLines( output.toPath(), Charset.defaultCharset() );
 
-		assertThat( "Expected alter table statement not found", sqlLines, hasItem( containsString( expectedAlterTableStatement ) ) );
+		assertThat( "Expected alter table statement not found", sqlLines,
+				hasItem( containsString( expectedAlterTableStatement ) ) );
 	}
 
 	private static class AlterTableStatement {
@@ -195,7 +198,7 @@ public AlterTableStatement(
 		}
 
 		public String toSQL() {
-			JdbcEnvironment jdbcEnvironment = ssr.getService( JdbcEnvironment.class );
+			JdbcEnvironment jdbcEnvironment = ssr.requireService( JdbcEnvironment.class );
 			Dialect dialect = jdbcEnvironment.getDialect();
 			IdentifierHelper identifierHelper = jdbcEnvironment.getIdentifierHelper();
 			UnaryOperator<String> asIdentifier = identifier -> identifierHelper.toIdentifier( identifier ).render( dialect );

settings.gradle

@@ -224,7 +224,7 @@ dependencyResolutionManagement {
             def hanaVersion = version "hana", "2.22.12"
             def h2gisVersion = version "h2gis", overrideableVersion( "gradle.libs.versions.h2gis", "2.2.3" )
             def hsqldbVersion = version "hsqldb", overrideableVersion( "gradle.libs.versions.hsqldb", "2.7.4" )
-            def informixVersion = version "informix", "4.50.11"
+            def informixVersion = version "informix", "15.0.0.1.1"
             def mariadbVersion = version "mariadb", "3.5.1"
             def mssqlVersion = version "mssql", "12.8.1.jre11"
             def mysqlVersion = version "mysql", "9.2.0"