Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10691 - Fix other PostgreSQL test failures after HEM integration

This commit is contained in:
Andrea Boriero 2016-05-13 13:44:15 +01:00
parent 25c75eed6f
commit d54b7ad50f
5 changed files with 1024 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1712
hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java
View File

File diff suppressed because it is too large Load Diff

6
hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/SchemaScriptFileGenerationTest.java
View File

@ -67,10 +67,10 @@ public class SchemaScriptFileGenerationTest {
);
final String dropFileContent = new String( Files.readAllBytes( dropSchema.toPath() ) ).toLowerCase();
assertThat( dropFileContent.contains( "drop table test_entity" ), is( true ) );
assertThat( dropFileContent.contains( "drop table " ), is( true ) );
assertThat(
"The statement 'drop table test_entity' is generated twice",
dropFileContent.replaceFirst( "drop table test_entity", "" ).contains( "drop table test_entity" ),
"The statement 'drop table ' is generated twice",
dropFileContent.replaceFirst( "drop table ", "" ).contains( "drop table " ),
is( false )
);
}

14
hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java
View File

@ -25,7 +25,6 @@ import org.hibernate.mapping.Table;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.schema.TargetType;
import org.hibernate.tool.schema.internal.ExceptionHandlerLoggedImpl;
import org.hibernate.tool.schema.internal.exec.ScriptTargetOutputToStdout;
import org.hibernate.tool.schema.spi.ExceptionHandler;
import org.hibernate.tool.schema.spi.ExecutionOptions;
import org.hibernate.tool.schema.spi.SchemaManagementTool;
@ -118,15 +117,24 @@ public class SchemaUpdateTableBackedSequenceTest extends BaseUnitTestCase {
new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), metadata );
}
class TargetImpl extends ScriptTargetOutputToStdout {
class TargetImpl implements ScriptTargetOutput {
boolean found = false;
@Override
public void prepare() {
}
@Override
public void accept(String action) {
super.accept( action );
if ( action.startsWith( "insert into test_seq" ) ) {
found = true;
}
}
@Override
public void release() {
}
}
}

3
hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
View File

@ -6,6 +6,7 @@
*/
package org.hibernate.test.sql.hand.query;
import javax.persistence.PersistenceException;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -142,7 +143,7 @@ public class NativeSQLQueriesTest extends BaseCoreFunctionalTestCase {
s.createSQLQuery( sql ).list();
fail( "Should throw an exception since no addEntity nor addScalar has been performed." );
}
catch( HibernateException he) {
catch( PersistenceException pe) {
// expected behavior
}
finally {

9
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/AuditRelatedIdInTest.java
View File

@ -18,7 +18,9 @@ import org.hibernate.envers.test.tools.TestTools;
import org.hibernate.testing.TestForIssue;
import org.junit.Test;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
/**
* @author Chris Cranford
@ -115,7 +117,8 @@ public class AuditRelatedIdInTest extends BaseEnversJPAFunctionalTestCase {
assertEquals( 2, results.size() );
final Employee employee1 = makeEmployee( employee1Id, "Employee1", company1Id, "COMPANY1" );
final Employee employee2 = makeEmployee( employee2Id, "Employee2", company1Id, "COMPANY1" );
assertEquals( results, TestTools.makeList( employee1, employee2 ) );
assertThat( results.contains( employee1 ), is(true) );
assertThat( results.contains( employee2 ), is(true) );
}
@Test
@ -124,9 +127,11 @@ public class AuditRelatedIdInTest extends BaseEnversJPAFunctionalTestCase {
auditQuery.add( AuditEntity.relatedId( "company" ).in( new Integer[]{ company2Id } ) );
final List<Employee> results = auditQuery.getResultList();
assertEquals( 2, results.size() );
final Employee employee1 = makeEmployee( employee2Id, "Employee2", company2Id, "COMPANY2" );
final Employee employee2 = makeEmployee( employee3Id, "Employee3", company2Id, "COMPANY2" );
assertEquals( results, TestTools.makeList( employee1, employee2 ) );
assertThat( results.contains( employee1 ), is(true) );
assertThat( results.contains( employee2 ), is(true) );
}
@Test