From 2f8d22e9e54dba4f3acfd3c8b53169055d6325e8 Mon Sep 17 00:00:00 2001
From: Fabio Massimo Ercoli <fabiomassimo.ercoli@gmail.com>
Date: Thu, 23 Dec 2021 14:15:43 +0100
Subject: [PATCH] Fix test to follow 6.0 behaviour (#4513)

* Fix test to follow 6.0 behaviour
---
 .../java/org/hibernate/{ => orm}/test/ternary/Employee.java   | 2 +-
 .../test/java/org/hibernate/{ => orm}/test/ternary/Site.java  | 2 +-
 .../java/org/hibernate/{ => orm}/test/ternary/Ternary.hbm.xml | 2 +-
 .../org/hibernate/{ => orm}/test/ternary/TernaryTest.java     | 4 ++--
 .../hibernate/testing/junit4/BaseCoreFunctionalTestCase.java  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/ternary/Employee.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/ternary/Site.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/ternary/Ternary.hbm.xml (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/ternary/TernaryTest.java (98%)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Employee.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Employee.java
index 8d1698263a..d953f9995c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Employee.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Employee.java 5686 2005-02-12 07:27:32Z steveebersole $
-package org.hibernate.test.ternary;
+package org.hibernate.orm.test.ternary;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Site.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Site.java
index 06d264b969..d8ab6a77b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Site.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Site.java 5686 2005-02-12 07:27:32Z steveebersole $
-package org.hibernate.test.ternary;
+package org.hibernate.orm.test.ternary;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Ternary.hbm.xml
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Ternary.hbm.xml
index 740a756f88..e16a1bd455 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/Ternary.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
-	package="org.hibernate.test.ternary">
+	package="org.hibernate.orm.test.ternary">
 
 	<class name="Employee">
 		<id name="name"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java
index 7105b435e4..9c5e1e985d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.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.ternary;
+package org.hibernate.orm.test.ternary;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -91,7 +91,7 @@ public class TernaryTest extends BaseCoreFunctionalTestCase {
 		s = openSession();
 		t = s.beginTransaction();
 		l = s.createQuery("from Employee e left join fetch e.managerBySite").list();
-		assertEquals( l.size(), 5 );
+		assertEquals( l.size(), 4 );
 		Set set = new HashSet(l);
 		assertEquals( set.size(), 4 );
 		Iterator iter = set.iterator();
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
index 71bc37de18..649c2b747d 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
@@ -253,7 +253,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
 	}
 
 	protected String getBaseForMappings() {
-		return "org/hibernate/test/";
+		return "org/hibernate/orm/test/";
 	}
 
 	protected static final Class<?>[] NO_CLASSES = new Class[0];