Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-16 16:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-9215 HHH-9214 HHH-9213 correcting Sybase test failures

Browse Source 
Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/generated/DefaultGeneratedValueTest.java
This commit is contained in:
Brett Meyer 2014-05-30 14:42:45 -04:00
parent 58aa7a9693
commit 84871ef1de
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/test/java/org/hibernate/test/cache/User.java vendored
View File

@ -28,8 +28,10 @@
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity
@Table(name="`User`")
public class User {
@Id
int id;

3
hibernate-core/src/test/java/org/hibernate/test/generated/DefaultGeneratedValueTest.java
View File

@ -45,7 +45,9 @@
import org.hibernate.annotations.GenerationTime;
import org.hibernate.annotations.GeneratorType;
import org.hibernate.annotations.UpdateTimestamp;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.tuple.ValueGenerator;
@ -59,6 +61,7 @@
* @author Gunnar Morling
*/
@FailureExpectedWithNewMetamodel
@SkipForDialect(value=SybaseDialect.class, comment="CURRENT_TIMESTAMP not supported as default value in Sybase")
public class DefaultGeneratedValueTest extends BaseCoreFunctionalTestCase {
@Test

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

@ -1,5 +1,12 @@
package org.hibernate.test.sql.hand.query;
import static org.hibernate.testing.junit4.ExtraAssertions.assertClassAssignability;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -8,7 +15,6 @@
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.Query;
@ -18,8 +24,8 @@
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.AbstractHANADialect;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.MySQL5Dialect;
import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn;
import org.hibernate.engine.spi.NamedSQLQueryDefinitionBuilder;
@ -47,13 +53,7 @@
import org.hibernate.type.LongType;
import org.hibernate.type.StringType;
import org.hibernate.type.TimestampType;
import static org.hibernate.testing.junit4.ExtraAssertions.assertClassAssignability;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
/**
* Tests of various features of native SQL queries.
@ -150,7 +150,7 @@ public void testRegisteredNamedSQLQueryWithScalar()
{
final NamedSQLQueryDefinitionBuilder builder = new NamedSQLQueryDefinitionBuilder();
builder.setName("namedQuery");
builder.setQuery("select count(*) AS count from organization");
builder.setQuery("select count(*) AS c from organization");
builder.setQueryReturns(new NativeSQLQueryReturn[1]);
sessionFactory().registerNamedSQLQueryDefinition("namedQuery", builder.createNamedQueryDefinition());
@ -158,13 +158,13 @@ public void testRegisteredNamedSQLQueryWithScalar()
final Session s = openSession();
s.beginTransaction();
final SQLQuery query = (SQLQuery) s.getNamedQuery("namedQuery");
query.addScalar("count");
final Object result = query.uniqueResult();
query.addScalar("c");
final Number result = (Number) query.uniqueResult();
s.getTransaction().commit();
s.close();
assertNotNull(result);
assertEquals(BigInteger.valueOf(0), result);
assertTrue(0 == result.intValue());
}
@Test