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

HHH-10183 - Fix tests to work pre-5.2

This commit is contained in:
Gail Badner 2017-05-19 14:04:46 -07:00
parent bb95a2bd08
commit 29bb4e3b2f
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hibernate-core/src/test/java/org/hibernate/test/criterion/NationalizedIgnoreCaseTest.java
View File

@ -12,6 +12,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.annotations.Nationalized;
import org.hibernate.criterion.Restrictions;
@ -24,7 +25,6 @@ import org.junit.Test;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
import static org.junit.Assert.assertEquals;
/**
@ -48,16 +48,24 @@ public class NationalizedIgnoreCaseTest extends BaseCoreFunctionalTestCase {
User user1 = new User(1, "Chris");
User user2 = new User(2, "Steve");
doInHibernate( this::sessionFactory, session -> {
Session session = openSession();
session.getTransaction().begin();
{
session.save(user1);
session.save(user2);
} );
}
session.getTransaction().commit();
session.close();
doInHibernate( this::sessionFactory, session -> {
session = openSession();
session.getTransaction().begin();
{
Criteria criteria = session.createCriteria(User.class);
criteria.add(Restrictions.eq("name", user1.getName().toLowerCase()).ignoreCase());
assertEquals(1, criteria.list().size());
} );
}
session.getTransaction().commit();
session.close();
}
@Entity(name = "User")

23
hibernate-core/src/test/java/org/hibernate/test/scalar/NationalizedScalarQueryTest.java
View File

@ -12,6 +12,7 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import org.hibernate.Session;
import org.hibernate.annotations.Nationalized;
import org.hibernate.dialect.SQLServer2008Dialect;
@ -21,7 +22,6 @@ import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
import static org.junit.Assert.assertEquals;
/**
@ -43,16 +43,25 @@ public class NationalizedScalarQueryTest extends BaseCoreFunctionalTestCase {
User user1 = new User( 1, "Chris" );
User user2 = new User( 2, "Steve" );
doInHibernate( this::sessionFactory, session -> {
Session session = openSession();
session.getTransaction().begin();
{
session.save( user1 );
session.save( user2 );
} );
}
session.getTransaction().commit();
session.close();
doInHibernate( this::sessionFactory, session -> {
List<Object[]> users = session.createNativeQuery(
"select * from users" ).getResultList();
session = openSession();
session.getTransaction().begin();
{
List users = session.createSQLQuery(
"select * from users"
).list();
assertEquals( 2, users.size() );
} );
}
session.getTransaction().commit();
session.close();
}
@Entity(name = "User")