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

Make sure tests work with Oracle 11

This commit is contained in:
Christian Beikov 2023-07-27 18:28:35 +02:00
parent c5cd1c2664
commit d213fff3de
11 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassWithSuperclassTest.java
View File

@ -61,7 +61,7 @@ public class IdClassWithSuperclassTest {
} }
} }
@Entity @Entity(name = "MyEntity")
@IdClass(ChildPrimaryKey.class) @IdClass(ChildPrimaryKey.class)
public static class MyEntity { public static class MyEntity {

11
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedEnhancementNonStandardAccessTest.java
View File

@ -10,6 +10,7 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id; import jakarta.persistence.Id;
@ -508,11 +509,11 @@ public class ExtendedEnhancementNonStandardAccessTest extends BaseCoreFunctional
@Id @Id
@GeneratedValue @GeneratedValue
public long id; public long id;
@Column(name = "abstract_public_field")
public Long abstractEntityPublicField; public Long abstractEntityPublicField;
@Column(name = "abstract_protected_field")
protected Long abstractEntityProtectedField; protected Long abstractEntityProtectedField;
@Column(name = "abstract_default_field")
Long abstractEntityPackagePrivateField; Long abstractEntityPackagePrivateField;
} }
@ -523,9 +524,13 @@ public class ExtendedEnhancementNonStandardAccessTest extends BaseCoreFunctional
@Entity(name = "concrete") @Entity(name = "concrete")
public static class MyConcreteEntity extends MyAbstractConfusingEntity { public static class MyConcreteEntity extends MyAbstractConfusingEntity {
@Column(name = "concrete_public_field")
public Long publicField; public Long publicField;
@Column(name = "concrete_protected_field")
protected Long protectedField; protected Long protectedField;
@Column(name = "concrete_default_field")
Long packagePrivateField; Long packagePrivateField;
@Column(name = "concrete_private_field")
private Long privateField; private Long privateField;
public Long getAbstractEntityPublicField() { public Long getAbstractEntityPublicField() {

14
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cache/ManyToOneTestReusedColumn.java vendored
View File

@ -112,7 +112,7 @@ public class ManyToOneTestReusedColumn extends BaseCoreFunctionalTestCase {
); );
} }
@Entity @Entity(name = "Fridge")
@Cacheable @Cacheable
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public static class Fridge { public static class Fridge {
@ -145,7 +145,7 @@ public class ManyToOneTestReusedColumn extends BaseCoreFunctionalTestCase {
} }
} }
@Entity @Entity(name = "Container")
@BatchSize(size = 500) @BatchSize(size = 500)
@Inheritance(strategy = InheritanceType.SINGLE_TABLE) @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@Cacheable @Cacheable
@ -177,7 +177,7 @@ public class ManyToOneTestReusedColumn extends BaseCoreFunctionalTestCase {
} }
} }
@Entity @Entity(name = "FruitContainer")
@DiscriminatorValue(value = "FRUIT_CONTAINER") @DiscriminatorValue(value = "FRUIT_CONTAINER")
public static class FruitContainer extends Container { public static class FruitContainer extends Container {
@ManyToOne @ManyToOne
@ -194,7 +194,7 @@ public class ManyToOneTestReusedColumn extends BaseCoreFunctionalTestCase {
} }
} }
@Entity @Entity(name = "CheeseContainer")
@DiscriminatorValue(value = "CHEESE_CONTAINER") @DiscriminatorValue(value = "CHEESE_CONTAINER")
public static class CheeseContainer extends Container { public static class CheeseContainer extends Container {
@ManyToOne @ManyToOne
@ -211,7 +211,7 @@ public class ManyToOneTestReusedColumn extends BaseCoreFunctionalTestCase {
} }
} }
@Entity @Entity(name = "Food")
@BatchSize(size = 500) @BatchSize(size = 500)
@Inheritance(strategy = InheritanceType.SINGLE_TABLE) @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@Cacheable @Cacheable
@ -232,7 +232,7 @@ public class ManyToOneTestReusedColumn extends BaseCoreFunctionalTestCase {
} }
} }
@Entity @Entity(name = "Fruit")
@BatchSize(size = 500) @BatchSize(size = 500)
@DiscriminatorValue(value = "FRUIT") @DiscriminatorValue(value = "FRUIT")
public static class Fruit extends Food { public static class Fruit extends Food {
@ -249,7 +249,7 @@ public class ManyToOneTestReusedColumn extends BaseCoreFunctionalTestCase {
} }
} }
@Entity @Entity(name = "Cheese")
@BatchSize(size = 500) @BatchSize(size = 500)
@DiscriminatorValue(value = "CHEESE") @DiscriminatorValue(value = "CHEESE")
public static class Cheese extends Food { public static class Cheese extends Food {

8
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyAbstractManyToOneNoProxyTest.java
View File

@ -20,6 +20,7 @@ import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType; import jakarta.persistence.InheritanceType;
import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@ -95,7 +96,8 @@ public class LazyAbstractManyToOneNoProxyTest extends BaseCoreFunctionalTestCase
); );
} }
@Entity @Entity(name = "User")
@Table(name = "usr_tbl")
@Proxy(lazy = false) @Proxy(lazy = false)
public static class User { public static class User {
@Id @Id
@ -129,7 +131,7 @@ public class LazyAbstractManyToOneNoProxyTest extends BaseCoreFunctionalTestCase
} }
} }
@Entity @Entity(name = "ActorGroup")
@Inheritance(strategy = InheritanceType.SINGLE_TABLE) @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@DiscriminatorColumn(name = "TYPE") @DiscriminatorColumn(name = "TYPE")
@Proxy(lazy = false) @Proxy(lazy = false)
@ -145,7 +147,7 @@ public class LazyAbstractManyToOneNoProxyTest extends BaseCoreFunctionalTestCase
} }
} }
@Entity @Entity(name = "UserGroup")
@Proxy(lazy = false) @Proxy(lazy = false)
@DiscriminatorValue("USERS") @DiscriminatorValue("USERS")
public static class UserGroup extends ActorGroup { public static class UserGroup extends ActorGroup {

6
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyManyToOneNoProxyTest.java
View File

@ -16,6 +16,7 @@ import jakarta.persistence.FetchType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@ -88,7 +89,8 @@ public class LazyManyToOneNoProxyTest extends BaseCoreFunctionalTestCase {
); );
} }
@Entity @Entity(name = "User")
@Table(name = "usr_tbl")
@Proxy(lazy = false) @Proxy(lazy = false)
public static class User { public static class User {
@Id @Id
@ -122,7 +124,7 @@ public class LazyManyToOneNoProxyTest extends BaseCoreFunctionalTestCase {
} }
} }
@Entity @Entity(name = "UserGroup")
@Proxy(lazy = false) @Proxy(lazy = false)
public static class UserGroup { public static class UserGroup {
@Id @Id

4
hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritance2Test.java
View File

@ -1,7 +1,6 @@
package org.hibernate.orm.test.embeddable; package org.hibernate.orm.test.embeddable;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.Parent; import org.hibernate.annotations.Parent;
import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModel;
@ -17,7 +16,6 @@ import jakarta.persistence.Embeddable;
import jakarta.persistence.Embedded; import jakarta.persistence.Embedded;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.Inheritance; import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType; import jakarta.persistence.InheritanceType;
@ -81,7 +79,7 @@ public class EmbeddableWithParentWithInheritance2Test {
} }
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue
public Long getId() { public Long getId() {
return id; return id;
} }

3
hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithParentWithInheritanceTest.java
View File

@ -17,7 +17,6 @@ import jakarta.persistence.Embeddable;
import jakarta.persistence.Embedded; import jakarta.persistence.Embedded;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.Inheritance; import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType; import jakarta.persistence.InheritanceType;
@ -80,7 +79,7 @@ public class EmbeddableWithParentWithInheritanceTest {
} }
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue
public Long getId() { public Long getId() {
return id; return id;
} }

3
hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/A.java
View File

@ -9,7 +9,6 @@ package org.hibernate.orm.test.foreignkeys.sorting;
import jakarta.persistence.CascadeType; import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
@ -19,7 +18,7 @@ import jakarta.persistence.ManyToOne;
@Entity @Entity
public class A { public class A {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue
private int id; private int id;
@ManyToOne(cascade = CascadeType.PERSIST) @ManyToOne(cascade = CascadeType.PERSIST)

2
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SelectOnlyArrayPropertyTest.java
View File

@ -78,7 +78,7 @@ public class SelectOnlyArrayPropertyTest extends BaseEntityManagerFunctionalTest
} ); } );
} }
@Entity @Entity(name = "EntityWithIdAndIntegerArray")
public static class EntityWithIdAndIntegerArray { public static class EntityWithIdAndIntegerArray {
@Id @Id

3
hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java
View File

@ -22,6 +22,7 @@ import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -135,6 +136,7 @@ public class EntityWithEagerManyToOneTest {
} }
@Entity(name = "LazyAbstractEntityReference") @Entity(name = "LazyAbstractEntityReference")
@Table(name = "lazy_abstract_ent_ref")
@Cacheable @Cacheable
public static class LazyAbstractEntityReference { public static class LazyAbstractEntityReference {
@ -170,6 +172,7 @@ public class EntityWithEagerManyToOneTest {
} }
@Entity(name = "LazyConcreteEntityReference") @Entity(name = "LazyConcreteEntityReference")
@Table(name = "lazy_concrete_ent_ref")
@Cacheable @Cacheable
public static class LazyConcreteEntityReference { public static class LazyConcreteEntityReference {

3
hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java
View File

@ -25,6 +25,7 @@ import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
@DomainModel( @DomainModel(
annotatedClasses = { annotatedClasses = {
@ -137,6 +138,7 @@ public class EntityWithLazyManyToOneTest {
} }
@Entity(name = "LazyAbstractEntityReference") @Entity(name = "LazyAbstractEntityReference")
@Table(name = "lazy_abstract_ent_ref")
@Cacheable @Cacheable
public static class LazyAbstractEntityReference { public static class LazyAbstractEntityReference {
@ -172,6 +174,7 @@ public class EntityWithLazyManyToOneTest {
} }
@Entity(name = "LazyConcreteEntityReference") @Entity(name = "LazyConcreteEntityReference")
@Table(name = "lazy_concrete_ent_ref")
@Cacheable @Cacheable
public static class LazyConcreteEntityReference { public static class LazyConcreteEntityReference {