Re-enabled additional tests

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_From.java

@@ -1,4 +1,4 @@
-package org.hibernate.test.bytecode.enhancement.lazy.group;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LGMB_To.java

@@ -1,4 +1,4 @@
-package org.hibernate.test.bytecode.enhancement.lazy.group;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
 import jakarta.persistence.AccessType;
 import jakarta.persistence.Column;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java

@@ -1,4 +1,4 @@
-package org.hibernate.test.bytecode.enhancement.lazy.group;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.bytecode.enhancement.lazy.notfound;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.ConstraintMode;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.bytecode.enhancement.lazy.notfound;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
 
 /**
  * @author Gail Badner
@@ -28,7 +28,6 @@ import org.hibernate.annotations.NotFoundAction;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
-import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.bytecode.enhancement.lazy.notfound;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.ConstraintMode;
@@ -21,7 +21,6 @@ import org.hibernate.annotations.LazyToOne;
 import org.hibernate.annotations.LazyToOneOption;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 
 import org.hibernate.testing.TestForIssue;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Customer.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import java.util.HashSet;
 import java.util.Set;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java

@@ -4,7 +4,9 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
+
+import org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.Customer;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import java.util.List;
 import java.util.Set;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import java.util.List;
 import java.util.Set;
@@ -19,7 +19,6 @@ import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.stat.Statistics;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
 import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ModelEntity.java

@@ -11,7 +11,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import java.sql.Timestamp;
 import jakarta.persistence.Basic;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Order.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import java.util.HashSet;
 import java.util.Set;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/Payment.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
  */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java

@@ -31,14 +31,11 @@ import org.hibernate.cfg.AvailableSettings;
 
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.hibernate.test.bytecode.enhancement.lazy.proxy.AbstractKey;
-import org.hibernate.test.bytecode.enhancement.lazy.proxy.Activity;
 import org.hibernate.test.bytecode.enhancement.lazy.proxy.GenericKey;
-import org.hibernate.test.bytecode.enhancement.lazy.proxy.Instruction;
 import org.hibernate.test.bytecode.enhancement.lazy.proxy.MoreSpecializedKey;
 import org.hibernate.test.bytecode.enhancement.lazy.proxy.RoleEntity;
 import org.hibernate.test.bytecode.enhancement.lazy.proxy.SpecializedEntity;
 import org.hibernate.test.bytecode.enhancement.lazy.proxy.SpecializedKey;
-import org.hibernate.test.bytecode.enhancement.lazy.proxy.WebApplication;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/AbstractKey.java

@@ -27,8 +27,7 @@ import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyGroup;
-import org.hibernate.annotations.LazyToOne;
-import org.hibernate.annotations.LazyToOneOption;
+import org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.ModelEntity;
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Activity.java

@@ -6,6 +6,8 @@
  */
 package org.hibernate.test.bytecode.enhancement.lazy.proxy;
 
+import org.hibernate.annotations.LazyGroup;
+
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -13,10 +15,6 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
-import org.hibernate.annotations.LazyGroup;
-import org.hibernate.annotations.LazyToOne;
-import org.hibernate.annotations.LazyToOneOption;
-
 /**
  * @author Steve Ebersole
  */

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Address.java

@@ -1,49 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later
- * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
- */
-package org.hibernate.test.bytecode.enhancement.lazy.proxy;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-
-/**
- * @author Steve Ebersole
- */
-@Entity(name = "Address")
-@Table(name = "address")
-public class Address {
-	private Integer id;
-
-	private String text;
-
-	public Address() {
-	}
-
-	public Address(Integer id, String text) {
-		this.id = id;
-		this.text = text;
-	}
-
-	@Id
-	@Column(name = "oid")
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-}

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java

@@ -27,8 +27,6 @@ import jakarta.persistence.Table;
 import org.hibernate.Hibernate;
 import org.hibernate.ScrollableResults;
 import org.hibernate.annotations.LazyGroup;
-import org.hibernate.annotations.LazyToOne;
-import org.hibernate.annotations.LazyToOneOption;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
@@ -38,7 +36,6 @@ import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
 import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/GenericKey.java

@@ -14,6 +14,7 @@
 package org.hibernate.test.bytecode.enhancement.lazy.proxy;
 
 import java.io.Serializable;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java

@@ -14,6 +14,7 @@
 package org.hibernate.test.bytecode.enhancement.lazy.proxy;
 
 import java.io.Serializable;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/RoleEntity.java

@@ -27,6 +27,7 @@ import jakarta.persistence.Table;
 import org.hibernate.annotations.LazyGroup;
 import org.hibernate.annotations.LazyToOne;
 import org.hibernate.annotations.LazyToOneOption;
+import org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.ModelEntity;
 
 @Entity(name = "RoleEntity")
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java

@@ -23,9 +23,6 @@ import jakarta.persistence.InheritanceType;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
-
 @Entity(name="SpecializedKey")
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @Table(name="PP_PartnerDCKey")