diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java index 225f818d18..7ee352e39c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java @@ -19,7 +19,6 @@ import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; -import org.hibernate.testing.orm.junit.NotImplementedYet; import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -102,10 +101,6 @@ public void testNormalLifecycle(EntityManagerFactoryScope scope) { } @Test - @NotImplementedYet( - reason = "Refreshing a managed-entity does not work - https://trello.com/c/QAKC08JT/230-refresh-does-not-work-with-managed-entity-the-state-is-not-refreshed", - strict = false - ) public void testRefreshLifecycle(EntityManagerFactoryScope scope) { //tag::mapping-Subselect-entity-find-example[] scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java index 6d1a9dc471..3b4d00aef0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java index 4df5fa3a5c..be9c2ae151 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java index b86140b555..c404e98dbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java index c15270f5fc..e126a39ff0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java index 84bd15c32a..b76621828e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.Date; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Currency.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Currency.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java index 15d5120a01..247a0e97d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Currency.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java index 45698b828e..d11c4c0a78 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.List; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java index 9bc1fba79c..4fc30e8d14 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeOffice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeOffice.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java index 5d0e608407..e74b3d49b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeOffice.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.math.BigDecimal; import java.util.Map; @@ -16,8 +16,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.hibernate.annotations.CascadeType; - @Entity public class ExchangeOffice { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRate.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java index 6bfb030783..0e75ae6470 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRateKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRateKey.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java index d124f8a849..fe9d04344c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/ExchangeRateKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.FetchType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java index 3f64bc2c69..d4446ac6ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java index 48b8cabad7..5851870671 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java index 6329a08d5c..ca75173185 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Embeddable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java index ce96b54c77..e06a7929e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java index 2f0bcf259f..78685fadc0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java index 1e1651389b..f8e095e789 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.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 . */ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.java index 724c5f457e..4bdee89b75 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.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 . */ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/News.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/News.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java index 0facf2237a..071a232f72 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/News.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java index a06c56ba44..79b7d45d7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java index 74c484b916..ff37c92f18 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java index 7b67d04232..dbc3a66256 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java index 7197edc608..69b03c40e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java index 2c846f472a..3b7970c12f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java index b883e71c86..e05b4bf796 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java index 56cfa9401c..aae31d9269 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java index 6355fe5c9d..c6dc87baaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.SortedMap; import java.util.TreeMap; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java index e635dce5d7..15345a020d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java index 36bb60f32d..6eb7f7a663 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.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 . */ -package org.hibernate.test.annotations.indexcoll; +package org.hibernate.orm.test.annotations.indexcoll; import java.util.List; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java index 88209e4743..7de4739c2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java @@ -28,8 +28,8 @@ import javax.persistence.MapKeyTemporal; import javax.persistence.TemporalType; -import org.hibernate.test.annotations.indexcoll.Gas; -import org.hibernate.test.annotations.indexcoll.GasKey; +import org.hibernate.orm.test.annotations.indexcoll.Gas; +import org.hibernate.orm.test.annotations.indexcoll.GasKey; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java index fc174929de..8aaae3f7ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java @@ -16,8 +16,8 @@ import org.hibernate.mapping.Column; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.annotations.indexcoll.Gas; -import org.hibernate.test.annotations.indexcoll.GasKey; +import org.hibernate.orm.test.annotations.indexcoll.Gas; +import org.hibernate.orm.test.annotations.indexcoll.GasKey; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/A.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java index 05555ad030..264c2e9db7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.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 . */ -package org.hibernate.test.annotations.naturalid; +package org.hibernate.orm.test.annotations.naturalid; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java index a4c55eb1d1..e41a7b58cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.naturalid; +package org.hibernate.orm.test.annotations.naturalid; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/D.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java index 3f662d1977..e89c6b2dd8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.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 . */ -package org.hibernate.test.annotations.naturalid; +package org.hibernate.orm.test.annotations.naturalid; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java similarity index 76% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java index 52278ffb6f..12396295c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java @@ -4,12 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.naturalid; +package org.hibernate.orm.test.annotations.naturalid; import javax.persistence.FlushModeType; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Root; import org.junit.Assert; @@ -19,6 +18,10 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.graph.GraphSemantic; +import org.hibernate.graph.RootGraph; +import org.hibernate.graph.spi.RootGraphImplementor; import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -41,7 +44,7 @@ public void testSimpleImmutableNaturalKeyLookup() { newTx.commit(); newTx = s.beginTransaction(); - getQuery( s ).uniqueResult(); // put query-result into cache + fetchA( s ); // put query-result into cache A a2 = new A(); a2.setName( "xxxxxx" ); s.persist( a2 ); @@ -56,7 +59,7 @@ public void testSimpleImmutableNaturalKeyLookup() { Assert.assertTrue( s.getSessionFactory().getStatistics().isStatisticsEnabled() ); s.getSessionFactory().getStatistics().clear(); - getQuery( s ).uniqueResult(); // should produce a hit in StandardQuery cache region + fetchA( s ); // should produce a hit in StandardQuery cache region Assert.assertEquals( "query is not considered as isImmutableNaturalKeyLookup, despite fullfilling all conditions", @@ -91,8 +94,8 @@ public void testNaturalKeyLookupWithConstraint() { Query query = session.createQuery( criteria ); query.setFlushMode( FlushModeType.COMMIT ); query.setCacheable( true ); - query.uniqueResult(); -// getCriteria( s ).add( Restrictions.isNull( "singleD" ) ).uniqueResult(); // put query-result into cache + query.uniqueResult(); // put query-result into cache + A a2 = new A(); a2.setName( "xxxxxx" ); s.persist( a2 ); @@ -112,7 +115,6 @@ public void testNaturalKeyLookupWithConstraint() { query.setFlushMode( FlushModeType.COMMIT ); query.setCacheable( true ); query.uniqueResult(); -// getCriteria( s ).add( Restrictions.isNull( "singleD" ) ).uniqueResult(); Assert.assertEquals( 0, s.getSessionFactory().getStatistics().getQueryCacheHitCount() ); @@ -140,8 +142,8 @@ public void testCriteriaWithFetchModeJoinCollection() { newTx = s.beginTransaction(); - getQueryFecth( s, "ds", JoinType.LEFT ).uniqueResult(); -// getQuery( s ).setFetchMode( "ds", FetchMode.JOIN ).uniqueResult(); // put query-result into cache + fetchA( s, "ds" ); // put query-result into cache + A a2 = new A(); a2.setName( "xxxxxx" ); s.persist( a2 ); @@ -164,8 +166,7 @@ public void testCriteriaWithFetchModeJoinCollection() { s.getSessionFactory().getStatistics().clear(); // should produce a hit in StandardQuery cache region - getQueryFecth( s, "ds", JoinType.LEFT ).uniqueResult(); -// getCriteria( s ).setFetchMode( "ds", FetchMode.JOIN ).uniqueResult(); + fetchA( s, "ds" ); Assert.assertEquals( "query is not considered as isImmutableNaturalKeyLookup, despite fullfilling all conditions", @@ -196,8 +197,8 @@ public void testCriteriaWithFetchModeJoinOnetoOne() { newTx.commit(); newTx = s.beginTransaction(); - getQueryFecth( s, "singleD" , JoinType.LEFT).uniqueResult(); -// getCriteria( s ).setFetchMode( "singleD", FetchMode.JOIN ).uniqueResult(); // put query-result into cache + fetchA( s, "singleD" ); // put query-result into cache + A a2 = new A(); a2.setName( "xxxxxx" ); s.persist( a2 ); @@ -213,8 +214,7 @@ public void testCriteriaWithFetchModeJoinOnetoOne() { s.getSessionFactory().getStatistics().clear(); // should produce a hit in StandardQuery cache region - getQueryFecth( s, "singleD", JoinType.LEFT ).uniqueResult(); -// getCriteria( s ).setFetchMode( "singleD", FetchMode.JOIN ).uniqueResult(); + fetchA( s, "singleD" ); Assert.assertEquals( "query is not considered as isImmutableNaturalKeyLookup, despite fullfilling all conditions", @@ -245,9 +245,8 @@ public void testCriteriaWithAliasOneToOneJoin() { newTx.commit(); newTx = s.beginTransaction(); - getQueryFecth( s, "singleD", JoinType.LEFT).uniqueResult(); -// getCriteria( s ).createAlias( "singleD", "d", JoinType.LEFT_OUTER_JOIN ) -// .uniqueResult(); // put query-result into cache + fetchA( s, "singleD" ); // put query-result into cache + A a2 = new A(); a2.setName( "xxxxxx" ); s.persist( a2 ); @@ -266,8 +265,7 @@ public void testCriteriaWithAliasOneToOneJoin() { s.getSessionFactory().getStatistics().clear(); // should not produce a hit in StandardQuery cache region because createAlias() creates a subcriteria - getQueryFecth( s, "singleD", JoinType.LEFT).uniqueResult(); -// getCriteria( s ).createAlias( "singleD", "d", JoinType.LEFT_OUTER_JOIN ).uniqueResult(); + fetchA( s, "singleD" ); Assert.assertEquals( 0, s.getSessionFactory().getStatistics().getQueryCacheHitCount() ); s.createQuery( "delete from A" ).executeUpdate(); @@ -295,10 +293,8 @@ public void testSubCriteriaOneToOneJoin() { newTx.commit(); newTx = s.beginTransaction(); - getQueryFecth( s, "singleD", JoinType.LEFT).uniqueResult(); + fetchA( s, "singleD" ); // put query-result into cache -// getCriteria( s ).createCriteria( "singleD", "d", JoinType.LEFT_OUTER_JOIN ) -// .uniqueResult(); // put query-result into cache A a2 = new A(); a2.setName( "xxxxxx" ); s.persist( a2 ); @@ -317,9 +313,7 @@ public void testSubCriteriaOneToOneJoin() { s.getSessionFactory().getStatistics().clear(); // should not produce a hit in StandardQuery cache region because createCriteria() creates a subcriteria - getQueryFecth( s, "singleD", JoinType.LEFT).uniqueResult(); - -// getCriteria( s ).createCriteria( "singleD", "d", JoinType.LEFT_OUTER_JOIN ).uniqueResult(); + fetchA( s, "singleD" ); Assert.assertEquals( 0, s.getSessionFactory().getStatistics().getQueryCacheHitCount() ); s.createQuery( "delete from A" ).executeUpdate(); @@ -330,40 +324,25 @@ public void testSubCriteriaOneToOneJoin() { s.close(); } - private Query getQuery(Session s) { - CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); - CriteriaQuery criteria = criteriaBuilder.createQuery( A.class ); - Root root = criteria.from( A.class ); - criteria.where( criteriaBuilder.equal( root.get( "name" ), "name1" ) ); - - Query query = session.createQuery( criteria ); - query.setFlushMode( FlushModeType.COMMIT ); - query.setCacheable( true ); - return query; + private A fetchA(Session s) { + return s.byNaturalId( A.class ) + .using( "name", "name1" ) + .load(); } - private Query getQueryFecth(Session s, String fecth, JoinType joinType) { - CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); - CriteriaQuery criteria = criteriaBuilder.createQuery( A.class ); - Root root = criteria.from( A.class ); - root.fetch( fecth, joinType ); - - criteria.where( criteriaBuilder.equal( root.get( "name" ), "name1" ) ); - - Query query = session.createQuery( criteria ); - query.setFlushMode( FlushModeType.COMMIT ); - query.setCacheable( true ); - return query; + private A fetchA(Session s, String fetch) { + final RootGraph entityGraph = s.createEntityGraph( A.class ); + entityGraph.addAttributeNodes( fetch ); + ( (SharedSessionContractImplementor) s ).getLoadQueryInfluencers() + .getEffectiveEntityGraph() + .applyGraph( (RootGraphImplementor) entityGraph, GraphSemantic.LOAD ); + final A a = s.byNaturalId( A.class ) + .using( "name", "name1" ) + .load(); + ((SharedSessionContractImplementor) s).getLoadQueryInfluencers().getEffectiveEntityGraph().clear(); + return a; } -// private CriteriaQuery getCriteria(Session s) { -// Criteria crit = s.createCriteria( A.class, "anAlias" ); -// crit.add( Restrictions.naturalId().set( "name", "name1" ) ); -// crit.setFlushMode( FlushMode.COMMIT ); -// crit.setCacheable( true ); -// return crit; -// } - @Override protected Class[] getAnnotatedClasses() { return new Class[] { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java index b675578617..2eb5f0082a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.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 . */ -package org.hibernate.test.annotations.naturalid; +package org.hibernate.orm.test.annotations.naturalid; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/naturalid/NaturalIdTest.java.bak b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/naturalid/NaturalIdTest.java.bak rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java index d842223336..f3f8c67e00 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/naturalid/NaturalIdTest.java.bak +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.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 . */ -package org.hibernate.test.annotations.naturalid; +package org.hibernate.orm.test.annotations.naturalid; import java.util.List; @@ -68,10 +68,10 @@ public void testNaturalIdCached() { Session s = openSession(); Transaction tx = s.beginTransaction(); State france = this.getState( s, "Ile de France" ); - Criteria criteria = s.createCriteria( Citizen.class ); - criteria.add( Restrictions.naturalId().set( "ssn", "1234" ).set( "state", france ) ); - criteria.setCacheable( true ); - + NaturalIdLoadAccess loadAccess = s.byNaturalId( Citizen.class ) + .using( "ssn", "1234" ) + .using("state", france ); + this.cleanupCache(); Statistics stats = sessionFactory().getStatistics(); @@ -81,15 +81,14 @@ public void testNaturalIdCached() { assertEquals( "Cache puts should be empty", 0, stats.getNaturalIdCachePutCount() ); // first query - List results = criteria.list(); - assertEquals( 1, results.size() ); + assertNotNull( loadAccess.load() ); assertEquals( "NaturalId Cache Hits", 0, stats.getNaturalIdCacheHitCount() ); assertEquals( "NaturalId Cache Misses", 1, stats.getNaturalIdCacheMissCount() ); assertEquals( "NaturalId Cache Puts", 1, stats.getNaturalIdCachePutCount() ); assertEquals( "NaturalId Cache Queries", 1, stats.getNaturalIdQueryExecutionCount() ); // query a second time - result should be cached in session - criteria.list(); + loadAccess.load(); assertEquals( "NaturalId Cache Hits", 0, stats.getNaturalIdCacheHitCount() ); assertEquals( "NaturalId Cache Misses", 1, stats.getNaturalIdCacheMissCount() ); assertEquals( "NaturalId Cache Puts", 1, stats.getNaturalIdCachePutCount() ); @@ -107,7 +106,7 @@ public void testNaturalIdLoaderNotCached() { Session s = openSession(); Transaction tx = s.beginTransaction(); State france = this.getState( s, "Ile de France" ); - final NaturalIdLoadAccess naturalIdLoader = s.byNaturalId( Citizen.class ); + final NaturalIdLoadAccess naturalIdLoader = s.byNaturalId( Citizen.class ); naturalIdLoader.using( "ssn", "1234" ).using( "state", france ); //NaturalId cache gets populated during entity loading, need to clear it out @@ -121,7 +120,7 @@ public void testNaturalIdLoaderNotCached() { assertEquals( "NaturalId Cache Queries", 0, stats.getNaturalIdQueryExecutionCount() ); // first query - Citizen citizen = (Citizen)naturalIdLoader.load(); + Citizen citizen = naturalIdLoader.load(); assertNotNull( citizen ); assertEquals( "NaturalId Cache Hits", 0, stats.getNaturalIdCacheHitCount() ); assertEquals( "NaturalId Cache Misses", 1, stats.getNaturalIdCacheMissCount() ); @@ -230,15 +229,9 @@ public void testNaturalIdUncached() { Session s = openSession(); Transaction tx = s.beginTransaction(); State france = this.getState( s, "Ile de France" ); - Criteria criteria = s.createCriteria( Citizen.class ); - criteria.add( - Restrictions.naturalId().set( "ssn", "1234" ).set( - "state", - france - ) - ); - criteria.setCacheable( false ); - + final NaturalIdLoadAccess naturalIdLoader = s.byNaturalId( Citizen.class ); + naturalIdLoader.using( "ssn", "1234" ).using( "state", france ); + this.cleanupCache(); Statistics stats = sessionFactory().getStatistics(); @@ -250,8 +243,8 @@ public void testNaturalIdUncached() { ); // first query - List results = criteria.list(); - assertEquals( 1, results.size() ); + Citizen citizen = naturalIdLoader.load(); + assertNotNull( citizen ); assertEquals( "Cache hits should be empty", 0, stats .getNaturalIdCacheHitCount() @@ -262,7 +255,7 @@ public void testNaturalIdUncached() { ); // query a second time - result should be cached in session - criteria.list(); + naturalIdLoader.load(); assertEquals( "Cache hits should be empty", 0, stats .getNaturalIdCacheHitCount() diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/State.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java index 7079ead7e3..e2c4696a63 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/State.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.naturalid; +package org.hibernate.orm.test.annotations.naturalid; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/A.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java index 5585ec9ef5..b5171b664e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.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 . */ -package org.hibernate.test.annotations.naturalid.cid; +package org.hibernate.orm.test.annotations.naturalid.cid; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/AId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/AId.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java index 372083f22b..5bb974f9e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/AId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.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 . */ -package org.hibernate.test.annotations.naturalid.cid; +package org.hibernate.orm.test.annotations.naturalid.cid; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java index 9a7b7a0fe0..9381a6fd04 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.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 . */ -package org.hibernate.test.annotations.naturalid.cid; +package org.hibernate.orm.test.annotations.naturalid.cid; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java index b65c0d5366..340ef7d25d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Asset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Asset.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java index 8404a53aab..a0339fb061 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Asset.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.*; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java index 6d2fa0f478..b3516815a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/BankAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/BankAccount.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java index 1a0ccb9aa3..c6dfb8b435 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/BankAccount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Box.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Box.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java index 08ee5c74d0..38921d2c8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Box.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java index fa54e2d80c..881f8bd96f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Child.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java index 3da7bd66ad..59f367fdb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/City.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java index 01acfa0304..6f14576a97 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/City.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java @@ -6,11 +6,10 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; import javax.persistence.Entity; -import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.JoinColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Comment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Comment.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java index a723e95067..ac44a6263f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Comment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Computer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java index 59df4fc282..d7306170c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Computer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Entity; import javax.persistence.PrimaryKeyJoinColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/DefaultNullOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/DefaultNullOrderingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java index 126c457e0e..5b2e334949 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/DefaultNullOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.Arrays; import java.util.Iterator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java index 61047d412e..2cd7bc4928 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.*; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Forum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Forum.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java index 186c780166..36d90ca7e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Forum.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Item.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java index 7c78f0def7..44dd3a97c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Manufacturer.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Manufacturer.java index 853314235d..0f1fd00737 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Manufacturer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Model.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Model.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java index d7ab2f5e4b..eda26e7e96 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Model.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java index fae8281d0b..75f1f69e92 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java index 0027981c70..7e2b87f2bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.Collection; @@ -567,7 +567,7 @@ protected Class[] getAnnotatedClasses() { @Override protected String[] getXmlFiles() { - return new String[] { "org/hibernate/test/annotations/onetomany/orm.xml" }; + return new String[] { "org/hibernate/orm/test/annotations/onetomany/orm.xml" }; } @Entity(name = "OnDeleteUnidirectionalOneToManyParent") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Order.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java index 617ba4437e..fc536fb512 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java index d09c21a1f1..735d9d6180 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,14 +26,15 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.dialect.SQLServer2008Dialect; +import org.hibernate.dialect.OracleDialect; +import org.hibernate.dialect.SQLServerDialect; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.graph.RootGraph; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.query.Query; import org.hibernate.sql.SimpleSelect; + import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -84,7 +85,7 @@ public void testOrderByOnIdClassProperties() throws Exception { @Test @TestForIssue(jiraKey = "HHH-465") - @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServer2008Dialect.class }, + @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServerDialect.class }, comment = "By default H2 places NULL values first, so testing 'NULLS LAST' expression. " + "For MySQL and SQL Server 2008 testing overridden Dialect#renderOrderByElement(String, String, String, NullPrecedence) method. " + "MySQL and SQLServer 2008 does not support NULLS FIRST / LAST syntax at the moment, so transforming the expression to 'CASE WHEN ...'.") @@ -145,7 +146,7 @@ public void testAnnotationNullsFirstLast() { @Test @TestForIssue(jiraKey = "HHH-465") - @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServer2008Dialect.class }, + @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServerDialect.class }, comment = "By default H2 places NULL values first, so testing 'NULLS LAST' expression. " + "For MySQL and SQL Server 2008 testing overridden Dialect#renderOrderByElement(String, String, String, NullPrecedence) method. " + "MySQL and SQL Server 2008 does not support NULLS FIRST / LAST syntax at the moment, so transforming the expression to 'CASE WHEN ...'.") @@ -174,9 +175,9 @@ public void testNullsFirstLastSpawnMultipleColumns() { zoo = (Zoo) session.get( Zoo.class, zoo.getId() ); Iterator iterator = zoo.getVisitors().iterator(); Assert.assertEquals( 3, zoo.getVisitors().size() ); - Assert.assertEquals( visitor3, iterator.next() ); - Assert.assertEquals( visitor2, iterator.next() ); - Assert.assertEquals( visitor1, iterator.next() ); + assertEquals( visitor3, iterator.next() ); + assertEquals( visitor2, iterator.next() ); + assertEquals( visitor1, iterator.next() ); session.getTransaction().commit(); session.clear(); @@ -194,7 +195,7 @@ public void testNullsFirstLastSpawnMultipleColumns() { @Test @TestForIssue(jiraKey = "HHH-465") - @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServer2008Dialect.class }, + @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServerDialect.class }, comment = "By default H2 places NULL values first, so testing 'NULLS LAST' expression. " + "For MySQL and SQL Server 2008 testing overridden Dialect#renderOrderByElement(String, String, String, NullPrecedence) method. " + "MySQL and SQL Server 2008 does not support NULLS FIRST / LAST syntax at the moment, so transforming the expression to 'CASE WHEN ...'.") @@ -229,7 +230,7 @@ public void testHqlNullsFirstLast() { @Test @TestForIssue( jiraKey = "HHH-7608" ) - @RequiresDialect({ H2Dialect.class, Oracle8iDialect.class }) + @RequiresDialect({ H2Dialect.class, OracleDialect.class }) public void testOrderByReferencingFormulaColumn() { Session session = openSession(); @@ -481,7 +482,7 @@ public void testOrderByOneToManyWithJoinTable() { @Test @TestForIssue( jiraKey = "HHH-14148" ) - @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServer2008Dialect.class }, + @RequiresDialect(value = { H2Dialect.class, MySQLDialect.class, SQLServerDialect.class }, comment = "By default H2 places NULL values first, so testing 'NULLS LAST' expression. " + "For MySQL and SQL Server 2008 testing overridden Dialect#renderOrderByElement(String, String, String, NullPrecedence) method. " + "MySQL and SQL Server 2008 does not support NULLS FIRST / LAST syntax at the moment, so transforming the expression to 'CASE WHEN ...'.") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java index cc24d41dd0..1a1f647e9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java index 57d2a0f3c4..24789da0f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java index 72d587e8da..0475cf93eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java index 93ff71758e..91dbc882ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.Set; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java index d5194ef54a..07a7040369 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java index 4f83edc2c7..9fd2689a60 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java index 3537f96475..7c4941de70 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java index 1d2100c9e6..26d2bc4441 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java index 57c7916990..f76532e7be 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java index c18c55b245..76db290871 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Post.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Post.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java index 76a6b3350c..606467028e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Post.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java index e11b91a229..752e213f06 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Street.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Street.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java index dffce5af7c..49934fb2ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Street.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java index 3b4eda85c7..640bbc8902 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java index cd13ae1616..21603a80de 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java index 0f252b1a26..17fc759488 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Transaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java index e633d69442..3a570762a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java index c20a7993d4..8c30b52985 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Visitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Visitor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java index ab932b325e..eea68a3dd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Visitor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Zoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Zoo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java index d5960fed9f..455c5f31b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Zoo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.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 . */ -package org.hibernate.test.annotations.onetomany; +package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Address.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java index 01a33fdfd4..76a50ff2df 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Body.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Body.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java index 5e2b03ea3a..b1387f389a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Body.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java index 3ccc16260b..fe41eaefa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java index 8ca87b271f..4dbc66e8e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java index 9849cf2252..96e088c18a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Father.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Father.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Father.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Father.java index 7201ec29a6..f6199c268b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Father.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Father.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java index 575005c40d..7d2f1ad284 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java index a91a648397..dc0bbd9636 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.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.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java index 642d9d0d1d..f0c0e92545 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.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 . */ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import java.util.Iterator; @@ -443,7 +443,7 @@ protected Class[] getAnnotatedClasses() { @Override protected String[] getXmlFiles() { - return new String[] { "org/hibernate/test/annotations/onetoone/orm.xml" }; + return new String[] { "org/hibernate/orm/test/annotations/onetoone/orm.xml" }; } /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMappedByTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java index f5cc6d670f..9a2e5c9578 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.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 . */ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import java.util.concurrent.atomic.AtomicReference; import javax.persistence.PersistenceException; @@ -148,8 +148,8 @@ public void testBidirQueryEntityProperty() { } ); - CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); doInHibernate( this::sessionFactory, session -> { + CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); CriteriaQuery criteria = criteriaBuilder.createQuery( PersonAddress.class ); Root root = criteria.from( PersonAddress.class ); criteria.where( criteriaBuilder.equal( root.get("id"), _personAddress.getId()) ); @@ -163,6 +163,7 @@ public void testBidirQueryEntityProperty() { } ); doInHibernate( this::sessionFactory, session -> { + CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); Person person = personHolder.get(); // this call throws GenericJDBCException PersonAddress personAddress = session.createQuery( diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java index a74fab7729..9773c2a041 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.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 . */ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java index caf7fef69c..a8e24c0fa5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.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 . */ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.ConstraintMode; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java index 57fee3e6ac..e6ac201739 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.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 . */ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.PersistenceException; import javax.persistence.criteria.CriteriaBuilder; @@ -167,6 +167,6 @@ protected Class[] getAnnotatedClasses() { @Override protected String[] getOrmXmlFiles() { - return new String[] { "org/hibernate/test/annotations/onetoone/orm.xml" }; + return new String[] { "org/hibernate/orm/test/annotations/onetoone/orm.xml" }; } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java index bb3bdcd179..b0ecee44bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java index 0af8420a9e..d45dd3329d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Party.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java index d4a0ec851e..1760d75f30 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Party.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java index 622d14f5b8..d68fbe3c7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java index 8e9d3bca93..ba5c302a06 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.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 . */ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PersonAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PersonAddress.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java index 4d18ca6368..9f94df9298 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PersonAddress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.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 . */ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java index feadec8119..8f17af7ecb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java index 1f7e214cb6..ad96c6b265 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Show.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Show.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java index 6f1d4e503e..dd36cadf1e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Show.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java index 2818aa0c18..f5db45c650 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Son.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Son.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Son.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Son.java index 58c25385f7..6e369eb72f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Son.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Son.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java index b8927c92ab..e046ccdebb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java index b848799ea1..79abde166a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.onetoone; +package org.hibernate.orm.test.annotations.onetoone; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java index 49931f6a1e..64bb1d2e6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java @@ -362,7 +362,6 @@ public void testExtendedEntityManager() throws Exception { } @Test - @FailureExpected( jiraKey = "none", reason = "Problem with caching, specifically managing SoftLocks" ) public void testConfiguration() throws Exception { File testPackage = buildExplicitPar(); addPackageToClasspath( testPackage ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java index 7fa975bd7d..fff1539283 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.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 . */ -package org.hibernate.test.bytecode.enhancement.lazy.HHH_10708; +package org.hibernate.orm.test.bytecode.enhancement.lazy.HHH_10708; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -66,7 +66,7 @@ public void test() { // --- // - @Entity + @Entity(name = "Bar") @Table( name = "BAR" ) private static class Bar { @@ -79,7 +79,7 @@ private static class Bar { Foo foo; } - @Entity + @Entity(name = "Foo") @Table( name = "FOO" ) private static class Foo { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java index 882ecbec8b..6b87214b68 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.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 . */ -package org.hibernate.test.bytecode.enhancement.lazy.HHH_10708; +package org.hibernate.orm.test.bytecode.enhancement.lazy.HHH_10708; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; @@ -70,7 +70,7 @@ public void test() { // --- // - @Entity + @Entity(name = "Bar") @Table( name = "BAR" ) private static class Bar { @@ -82,7 +82,7 @@ private static class Bar { Set foos = new HashSet<>(); } - @Entity + @Entity(name = "Foo") @Table( name = "FOO" ) private static class Foo { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java index 28205ed5ab..2c201d65f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.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 . */ -package org.hibernate.test.bytecode.enhancement.lazy.HHH_10708; +package org.hibernate.orm.test.bytecode.enhancement.lazy.HHH_10708; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java index 6b0ecd704b..decab9a008 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java @@ -82,7 +82,7 @@ public void test() { additionalDetails.details = "New data"; s.persist( additionalDetails ); - // additionalDetais.post.tags get deleted on commit + // additionalDetails.post.tags get deleted on commit } ); doInHibernate( this::sessionFactory, s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java index 4e4a3baca0..c837e05c18 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/CacheAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/CacheAnnotationTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java index 4c6340623c..b879997689 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/CacheAnnotationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/CacheableItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheableItem.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/cache/CacheableItem.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheableItem.java index f5e8b983dd..3d05245d26 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/CacheableItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheableItem.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/CollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cache/CollectionCacheEvictionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java index be02ce32fd..e61b1b6f98 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/CollectionCacheEvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import org.hibernate.ObjectNotFoundException; import org.hibernate.Session; @@ -78,8 +78,8 @@ protected void cleanupTest() throws Exception { Session s = openSession(); s.beginTransaction(); - s.createQuery( "delete from org.hibernate.test.cache.User" ).executeUpdate(); - s.createQuery( "delete from org.hibernate.test.cache.Company" ).executeUpdate(); + s.createQuery( "delete from org.hibernate.orm.test.cache.User" ).executeUpdate(); + s.createQuery( "delete from org.hibernate.orm.test.cache.Company" ).executeUpdate(); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/CollectionCacheEvictionWithoutMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/CollectionCacheEvictionWithoutMappedByTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java index 96822c7fc1..26647f655b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/CollectionCacheEvictionWithoutMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.ArrayList; import java.util.List; @@ -162,7 +162,7 @@ public void testCollectionCacheEvictionUpdate() { session.close(); } - @Entity + @Entity(name = "People") @Table(name = "people_group") @Cacheable @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) @@ -176,7 +176,7 @@ public static class People { private List people = new ArrayList(); } - @Entity + @Entity(name = "Person") @Table(name = "person") @Cacheable @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/cache/Company.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java index fadf5f9a4a..293ab78885 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java @@ -5,22 +5,18 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.OneToMany; -import javax.persistence.Version; import java.util.ArrayList; import java.util.List; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; @Entity public class Company { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/Continent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/cache/Continent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java index 0602978c0f..9b797bc467 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/Continent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import javax.persistence.Cacheable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cache/Country.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java index 33c07f7fcc..4edc8a22b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import javax.persistence.Cacheable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/EnhancedProxyCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EnhancedProxyCacheTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cache/EnhancedProxyCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/EnhancedProxyCacheTest.java index ac7b976c0f..d93bf041b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/EnhancedProxyCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EnhancedProxyCacheTest.java @@ -4,14 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.concurrent.atomic.AtomicLong; import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor; -import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor; import org.hibernate.cache.spi.CacheImplementor; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.PersistentAttributeInterceptable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/EntityUpdateCacheModeIgnoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cache/EntityUpdateCacheModeIgnoreTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java index 37e45047c8..c7edc56b10 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/EntityUpdateCacheModeIgnoreTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java index 73c34502dc..7bc5890d60 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import org.hibernate.Session; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cache/LockModeTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java index 0029c5e2bd..976cedd000 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/LockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java @@ -1,16 +1,15 @@ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.hibernate.Hibernate; import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.cache.internal.CollectionCacheInvalidator; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.engine.spi.SessionFactoryImplementor; + import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -68,8 +67,8 @@ protected void prepareTest() { protected void cleanupTest() { inTransaction( s -> { - s.createQuery( "delete from org.hibernate.test.cache.User" ).executeUpdate(); - s.createQuery( "delete from org.hibernate.test.cache.Company" ).executeUpdate(); + s.createQuery( "delete from org.hibernate.orm.test.cache.User" ).executeUpdate(); + s.createQuery( "delete from org.hibernate.orm.test.cache.Company" ).executeUpdate(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/ManyToManyCollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/cache/ManyToManyCollectionCacheEvictionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java index 9cae234fcd..a8e0ad1f52 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/ManyToManyCollectionCacheEvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.ArrayList; import java.util.List; @@ -86,7 +86,7 @@ public void testManyToManyPersist() { s.close(); } - @Entity + @Entity(name = "Customer") @Table(name = "customer") @Cacheable public static class Customer { @@ -98,7 +98,7 @@ public static class Customer { private List applications = new ArrayList(); } - @Entity + @Entity(name = "Application") @Table(name = "application") @Cacheable public static class Application { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/NoCachingRegionFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cache/NoCachingRegionFactoryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java index 5937836ed8..9ba8ad3eed 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/NoCachingRegionFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NoCachingRegionFactoryTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import org.hibernate.cache.internal.NoCachingRegionFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/NonRootEntityWithCacheAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/NonRootEntityWithCacheAnnotationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java index 8af2f60ee4..330e4b3fac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/NonRootEntityWithCacheAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/NonRootEntityWithCacheableAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/NonRootEntityWithCacheableAnnotationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java index f613fdd511..98361c12e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/NonRootEntityWithCacheableAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/QualifiedRegionNameHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QualifiedRegionNameHandlingTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cache/QualifiedRegionNameHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/QualifiedRegionNameHandlingTest.java index b5130f3db2..a5b9d47809 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/QualifiedRegionNameHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/QualifiedRegionNameHandlingTest.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.cache; +package org.hibernate.orm.test.cache; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/ReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/ReferenceCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java index 204f07aee7..8ab2ad3bda 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/ReferenceCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import javax.persistence.Cacheable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/RefreshUpdatedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/RefreshUpdatedDataTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java index 379cbdb508..d81fec4602 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/RefreshUpdatedDataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.ArrayList; import java.util.List; @@ -49,7 +49,7 @@ protected void configure(Configuration cfg) { super.configure( cfg ); Properties properties = Environment.getProperties(); if ( H2Dialect.class.getName().equals( properties.get( Environment.DIALECT ) ) ) { - cfg.setProperty( Environment.URL, "jdbc:h2:mem:db-mvcc;MVCC=true" ); + cfg.setProperty( Environment.URL, "jdbc:h2:mem:db-mvcc" ); } cfg.setProperty( Environment.CACHE_REGION_PREFIX, "" ); cfg.setProperty( Environment.GENERATE_STATISTICS, "true" ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/RegionNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RegionNameTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cache/RegionNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/RegionNameTest.java index e936cfae84..909ba940a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/RegionNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RegionNameTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.List; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/SharedDomainDataAndQueryResultsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cache/SharedDomainDataAndQueryResultsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java index 5de7a14cb6..14ab4db991 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/SharedDomainDataAndQueryResultsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import java.util.HashSet; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/SharedRegionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/SharedRegionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java index ffcef3594e..93b8623e59 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/SharedRegionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.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 . */ -package org.hibernate.test.cache; +package org.hibernate.orm.test.cache; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/SingleRegisteredProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cache/SingleRegisteredProviderTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.java index 6525a21ecf..29b39dc084 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/SingleRegisteredProviderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.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.cache; +package org.hibernate.orm.test.cache; import java.util.Collection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cache/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java index 5a5e938502..7afd22dbc8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java @@ -5,17 +5,13 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.cache; - -import java.util.ArrayList; -import java.util.List; +package org.hibernate.orm.test.cache; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Version; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/cid/It.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cache/cid/It.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java index 5eac46fca8..da2f079f8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/cid/It.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.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 . */ -package org.hibernate.test.cache.cid; +package org.hibernate.orm.test.cache.cid; import java.io.Serializable; import javax.persistence.Cacheable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/cid/ItWithPkClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cache/cid/ItWithPkClass.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java index 5023ca0f46..c15360cd66 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/cid/ItWithPkClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.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 . */ -package org.hibernate.test.cache.cid; +package org.hibernate.orm.test.cache.cid; import java.io.Serializable; import javax.persistence.Cacheable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/cid/NonAggregatedCompositeIdCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cache/cid/NonAggregatedCompositeIdCachingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java index aa10dfcd6c..63355033f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/cid/NonAggregatedCompositeIdCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.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 . */ -package org.hibernate.test.cache.cid; +package org.hibernate.orm.test.cache.cid; import javax.persistence.SharedCacheMode; @@ -14,7 +14,6 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java index d9dba7010c..1baeaac837 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassNonUIPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public class DiscriminatorSubclassNonUIPerson extends DiscriminatorSubclassPerson { } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.java index 03868b5be3..20de0a348e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public abstract class DiscriminatorSubclassPerson { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java index f5afb5e70b..317bfbe6a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassUIPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassUIPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public class DiscriminatorSubclassUIPerson extends DiscriminatorSubclassPerson { } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/HHH13179Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/HHH13179Test.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java index 3517c9ccf9..776fb3bb02 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/HHH13179Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; import org.hibernate.Session; import org.hibernate.Transaction; @@ -43,9 +43,9 @@ protected Class[] getAnnotatedClasses() { @Override protected String[] getMappings() { return new String[] { - "org/hibernate/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml", - "org/hibernate/test/cache/hhh13179/UnionSubclassPerson.hbm.xml", - "org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml" + "org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml", + "org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml", + "org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml" }; } @@ -71,7 +71,7 @@ public void testJoinedSubclassCaching() { Session s = openSession(); Transaction tx = s.beginTransaction(); - String regionName = "org.hibernate.test.cache.hhh13179.JoinedSubclassPerson"; + String regionName = JoinedSubclassPerson.class.getName(); // sanity check CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( @@ -105,7 +105,7 @@ public void testUnionSubclassCaching() { Session s = openSession(); Transaction tx = s.beginTransaction(); - String regionName = "org.hibernate.test.cache.hhh13179.UnionSubclassPerson"; + String regionName = UnionSubclassPerson.class.getName(); // sanity check CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( @@ -139,7 +139,7 @@ public void testDiscriminatorSubclassCaching() { Session s = openSession(); Transaction tx = s.beginTransaction(); - String regionName = "org.hibernate.test.cache.hhh13179.DiscriminatorSubclassPerson"; + String regionName = DiscriminatorSubclassPerson.class.getName(); // sanity check CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassNonUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassNonUIPerson.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassNonUIPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassNonUIPerson.java index e2665fa219..b763ed852f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassNonUIPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassNonUIPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public class JoinedSubclassNonUIPerson extends JoinedSubclassPerson { } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.java index 69320ee073..6856b3cffb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public abstract class JoinedSubclassPerson { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassUIPerson.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassUIPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassUIPerson.java index 8e46173cbb..a665d09903 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/JoinedSubclassUIPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassUIPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public class JoinedSubclassUIPerson extends JoinedSubclassPerson { } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassNonUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassNonUIPerson.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassNonUIPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassNonUIPerson.java index 91b050ad65..45a16e400d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassNonUIPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassNonUIPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public class UnionSubclassNonUIPerson extends UnionSubclassPerson { } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.java index b620c4abaa..8fc9cb90ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public abstract class UnionSubclassPerson { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassUIPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassUIPerson.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassUIPerson.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassUIPerson.java index fc0348e5ed..09641d571e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/hhh13179/UnionSubclassUIPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/UnionSubclassUIPerson.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 . */ -package org.hibernate.test.cache.hhh13179; +package org.hibernate.orm.test.cache.hhh13179; public class UnionSubclassUIPerson extends UnionSubclassPerson { } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/AbstractCachedItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/AbstractCachedItem.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/AbstractCachedItem.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/AbstractCachedItem.java index 015ec5d41a..f9ca691ed3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/AbstractCachedItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/AbstractCachedItem.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 . */ -package org.hibernate.test.cache.polymorphism; +package org.hibernate.orm.test.cache.polymorphism; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/CachedItem1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/CachedItem1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java index e43f417cda..988b50da73 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/CachedItem1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.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 . */ -package org.hibernate.test.cache.polymorphism; +package org.hibernate.orm.test.cache.polymorphism; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/CachedItem2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/CachedItem2.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java index 413647b841..ec81e2c967 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/CachedItem2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.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 . */ -package org.hibernate.test.cache.polymorphism; +package org.hibernate.orm.test.cache.polymorphism; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/PolymorphicCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/PolymorphicCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java index 6528a92116..f8856ca744 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cache/polymorphism/PolymorphicCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.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 . */ -package org.hibernate.test.cache.polymorphism; +package org.hibernate.orm.test.cache.polymorphism; import org.hibernate.Session; import org.hibernate.WrongClassException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshLazyOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshLazyOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java index bb7ff42c34..ed48d8489a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshLazyOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.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 . */ -package org.hibernate.test.cascade; +package org.hibernate.orm.test.cascade; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertFalse; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/ConverterBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/ConverterBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java index e07375e5c3..7b71dc5466 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/ConverterBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.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.cdi.converters; +package org.hibernate.orm.test.cdi.converters; import javax.persistence.AttributeConverter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/MonitorBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MonitorBean.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/MonitorBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MonitorBean.java index 4e5f7fe8cb..6866453156 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/MonitorBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/MonitorBean.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.cdi.converters; +package org.hibernate.orm.test.cdi.converters; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/TheEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java index fe0db74dac..72c194b552 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/TheEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.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.cdi.converters; +package org.hibernate.orm.test.cdi.converters; import javax.persistence.Convert; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java index 375009da90..e49d90653a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.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.cdi.converters.delayed; +package org.hibernate.orm.test.cdi.converters.delayed; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; @@ -19,9 +19,9 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.converters.ConverterBean; -import org.hibernate.test.cdi.converters.MonitorBean; -import org.hibernate.test.cdi.converters.TheEntity; +import org.hibernate.orm.test.cdi.converters.ConverterBean; +import org.hibernate.orm.test.cdi.converters.MonitorBean; +import org.hibernate.orm.test.cdi.converters.TheEntity; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/AddTenConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/AddTenConverter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java index 27f5363aaa..d6e70e3c12 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/AddTenConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java @@ -28,7 +28,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cdi.converters.legacy; +package org.hibernate.orm.test.cdi.converters.legacy; import javax.persistence.AttributeConverter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/BigDecimalToStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/BigDecimalToStringConverter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java index 35908fd2f8..28866aa5e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/BigDecimalToStringConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java @@ -28,7 +28,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cdi.converters.legacy; +package org.hibernate.orm.test.cdi.converters.legacy; import java.math.BigDecimal; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/ConversionAutoApplyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/ConversionAutoApplyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java index 115324f461..f81c743acb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/ConversionAutoApplyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java @@ -28,7 +28,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cdi.converters.legacy; +package org.hibernate.orm.test.cdi.converters.legacy; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/ConvertBetweenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/ConvertBetweenTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java index f39d2745dd..ecbe486da9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/ConvertBetweenTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConvertBetweenTest.java @@ -28,7 +28,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cdi.converters.legacy; +package org.hibernate.orm.test.cdi.converters.legacy; import static org.junit.Assert.*; @@ -102,7 +102,7 @@ public void testBetweenLiteral() { s.getTransaction().begin(); @SuppressWarnings("unchecked") - final List result = s.createQuery( "from Item where quantity between 9 and 11" ).list(); + final List result = s.createQuery( "select i from Item i where quantity between 9 and 11" ).list(); assertEquals( 1, result.size() ); assertEquals( 10, result.get( 0 ).getQuantity().intValue() ); @@ -115,9 +115,9 @@ public void testBetweenParameters() { final Session s = openSession(); s.getTransaction().begin(); - final Query query = s.createQuery( "from Item where quantity between :low and :high" ); - query.setParameter( "low", new Integer( 9 ) ); - query.setParameter( "high", new Integer( 11 ) ); + final Query query = s.createQuery( "select i from Item i where quantity between :low and :high" ); + query.setParameter( "low", 9 ); + query.setParameter( "high", 11 ); @SuppressWarnings("unchecked") final List result = query.list(); assertEquals( 1, result.size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/Item.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java index e2c9acb9ff..a283bee85d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java @@ -28,7 +28,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cdi.converters.legacy; +package org.hibernate.orm.test.cdi.converters.legacy; import java.math.BigDecimal; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/QueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java index 6b5615770a..d94734e004 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/legacy/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java @@ -28,7 +28,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cdi.converters.legacy; +package org.hibernate.orm.test.cdi.converters.legacy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/package-info.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/package-info.java index f1981e74a8..91f5731098 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/package-info.java @@ -9,4 +9,4 @@ * Package for testing Hibernate's support for integrating * with CDI for JPA attribute converters */ -package org.hibernate.test.cdi.converters; +package org.hibernate.orm.test.cdi.converters; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/standard/CdiHostedConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/converters/standard/CdiHostedConverterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java index 6eaac04932..8c4881bf9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/converters/standard/CdiHostedConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.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.cdi.converters.standard; +package org.hibernate.orm.test.cdi.converters.standard; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; @@ -19,9 +19,9 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.converters.ConverterBean; -import org.hibernate.test.cdi.converters.MonitorBean; -import org.hibernate.test.cdi.converters.TheEntity; +import org.hibernate.orm.test.cdi.converters.ConverterBean; +import org.hibernate.orm.test.cdi.converters.MonitorBean; +import org.hibernate.orm.test.cdi.converters.TheEntity; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/Monitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/Monitor.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/Monitor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/Monitor.java index feb9f284a5..1adaf9d8a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/Monitor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/Monitor.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.cdi.events; +package org.hibernate.orm.test.cdi.events; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/TheEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java index 746f38f9ba..1c3ef783ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/TheEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.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.cdi.events; +package org.hibernate.orm.test.cdi.events; import javax.persistence.Entity; import javax.persistence.EntityListeners; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/TheListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/TheListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java index 5430aa06c8..3727a848d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/TheListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.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.cdi.events; +package org.hibernate.orm.test.cdi.events; import javax.persistence.PrePersist; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/delayed/DelayedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/delayed/DelayedCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java index a3f171652c..db6ba852ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/delayed/DelayedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.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.cdi.events.delayed; +package org.hibernate.orm.test.cdi.events.delayed; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; @@ -19,9 +19,9 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.events.Monitor; -import org.hibernate.test.cdi.events.TheEntity; -import org.hibernate.test.cdi.events.TheListener; +import org.hibernate.orm.test.cdi.events.Monitor; +import org.hibernate.orm.test.cdi.events.TheEntity; +import org.hibernate.orm.test.cdi.events.TheListener; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java index 7d7e340206..48df53b462 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/extended/InvalidExtendedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/InvalidExtendedCdiSupportTest.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.cdi.events.extended; +package org.hibernate.orm.test.cdi.events.extended; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; @@ -13,13 +13,12 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.jpa.event.spi.jpa.ExtendedBeanManager; import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.events.Monitor; -import org.hibernate.test.cdi.events.TheEntity; -import org.hibernate.test.cdi.testsupport.TestingExtendedBeanManager; +import org.hibernate.orm.test.cdi.events.Monitor; +import org.hibernate.orm.test.cdi.events.TheEntity; +import org.hibernate.orm.test.cdi.testsupport.TestingExtendedBeanManager; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/extended/ValidExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/extended/ValidExtendedCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java index 5ebf861309..83dfe1ba5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/extended/ValidExtendedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java @@ -4,12 +4,10 @@ * 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.cdi.events.extended; +package org.hibernate.orm.test.cdi.events.extended; -import java.util.function.Consumer; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import javax.enterprise.inject.spi.BeanManager; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; @@ -18,14 +16,13 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.resource.beans.container.spi.ExtendedBeanManager; import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.events.Monitor; -import org.hibernate.test.cdi.events.TheEntity; -import org.hibernate.test.cdi.events.TheListener; -import org.hibernate.test.cdi.testsupport.TestingExtendedBeanManager; +import org.hibernate.orm.test.cdi.events.Monitor; +import org.hibernate.orm.test.cdi.events.TheEntity; +import org.hibernate.orm.test.cdi.events.TheListener; +import org.hibernate.orm.test.cdi.testsupport.TestingExtendedBeanManager; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java index 5a4820dd2f..f99cd73805 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/nocdi/InvalidNoCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/InvalidNoCdiSupportTest.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.cdi.events.nocdi; +package org.hibernate.orm.test.cdi.events.nocdi; import org.hibernate.InstantiationException; import org.hibernate.boot.MetadataSources; @@ -17,8 +17,8 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.events.Monitor; -import org.hibernate.test.cdi.events.TheEntity; +import org.hibernate.orm.test.cdi.events.Monitor; +import org.hibernate.orm.test.cdi.events.TheEntity; import org.junit.Test; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/nocdi/ValidNoCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/nocdi/ValidNoCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java index 3013d333ac..4bae7fc552 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/nocdi/ValidNoCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.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.cdi.events.nocdi; +package org.hibernate.orm.test.cdi.events.nocdi; import java.util.concurrent.atomic.AtomicInteger; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/package-info.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/package-info.java index 6ab08e624c..e5c3284774 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/package-info.java @@ -9,4 +9,4 @@ * Package for testing Hibernate's support for integrating * with CDI for JPA event listeners */ -package org.hibernate.test.cdi.events; +package org.hibernate.orm.test.cdi.events; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/standard/StandardCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/events/standard/StandardCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java index 4f7da8d76b..d968da3e43 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/events/standard/StandardCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.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.cdi.events.standard; +package org.hibernate.orm.test.cdi.events.standard; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; @@ -19,9 +19,9 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.events.Monitor; -import org.hibernate.test.cdi.events.TheEntity; -import org.hibernate.test.cdi.events.TheListener; +import org.hibernate.orm.test.cdi.events.Monitor; +import org.hibernate.orm.test.cdi.events.TheEntity; +import org.hibernate.orm.test.cdi.events.TheListener; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/DelayedMixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/DelayedMixedAccessTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java index 78e03ee78c..0dea542b13 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/DelayedMixedAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.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.cdi.general.mixed; +package org.hibernate.orm.test.cdi.general.mixed; import javax.enterprise.inject.se.SeContainer; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/ExtendedMixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/ExtendedMixedAccessTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java index 00aab0638e..a39212a91e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/ExtendedMixedAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.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.cdi.general.mixed; +package org.hibernate.orm.test.cdi.general.mixed; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.spi.BeanManager; @@ -19,7 +19,7 @@ import org.hibernate.resource.beans.spi.ManagedBeanRegistry; import org.hibernate.tool.schema.Action; -import org.hibernate.test.cdi.testsupport.TestingExtendedBeanManager; +import org.hibernate.orm.test.cdi.testsupport.TestingExtendedBeanManager; import org.junit.Test; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java similarity index 81% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/Helper.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java index 83eb74f08b..4de15fa339 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/Helper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java @@ -4,13 +4,10 @@ * 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.cdi.general.mixed; +package org.hibernate.orm.test.cdi.general.mixed; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import javax.enterprise.inject.spi.BeanManager; - -import org.hibernate.jpa.event.spi.jpa.ExtendedBeanManager; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/HostedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/HostedBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java index cc613b4316..b681150765 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/HostedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.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.cdi.general.mixed; +package org.hibernate.orm.test.cdi.general.mixed; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/ImmediateMixedAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/ImmediateMixedAccessTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java index def3cd6b8f..bb939cfd87 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/ImmediateMixedAccessTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.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.cdi.general.mixed; +package org.hibernate.orm.test.cdi.general.mixed; import javax.enterprise.inject.se.SeContainer; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/InjectedHostedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/InjectedHostedBean.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/InjectedHostedBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/InjectedHostedBean.java index 5be7308a3a..5624d018a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/InjectedHostedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/InjectedHostedBean.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.cdi.general.mixed; +package org.hibernate.orm.test.cdi.general.mixed; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/NonHostedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/NonHostedBean.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/NonHostedBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/NonHostedBean.java index 28ff230f24..bd957f03f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/mixed/NonHostedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/NonHostedBean.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.cdi.general.mixed; +package org.hibernate.orm.test.cdi.general.mixed; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/Monitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/Monitor.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/Monitor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/Monitor.java index 647ca488cb..95d7679ead 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/Monitor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/Monitor.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/NonRegistryManagedBeanConsumingIntegrator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/NonRegistryManagedBeanConsumingIntegrator.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/NonRegistryManagedBeanConsumingIntegrator.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/NonRegistryManagedBeanConsumingIntegrator.java index bc80fe1d96..1454f2cd09 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/NonRegistryManagedBeanConsumingIntegrator.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/NonRegistryManagedBeanConsumingIntegrator.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import org.hibernate.boot.Metadata; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java index 7881b1d8f4..c8f67aee28 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java index 2d8fe90241..578381475a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java index 96c00547c9..c4b6ffe9ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheDependentBean.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheDependentBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheDependentBean.java index b54137f064..3166f4f348 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheDependentBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheDependentBean.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheEntity.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheEntity.java index 7cfe12abfa..9dcbd63e33 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheEntity.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheFallbackBeanInstanceProducer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheFallbackBeanInstanceProducer.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheFallbackBeanInstanceProducer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheFallbackBeanInstanceProducer.java index 89ee23229a..6f65cf5aa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheFallbackBeanInstanceProducer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheFallbackBeanInstanceProducer.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 . */ -package org.hibernate.test.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java index 0657e56fb4..0ebcb03103 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java index 998cc1a9fc..4f6a5a2235 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNamedApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNamedApplicationScopedBean.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNamedApplicationScopedBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNamedApplicationScopedBean.java index bc615a2de9..b55ed8f91e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNamedApplicationScopedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNamedApplicationScopedBean.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; /** * @author Yoann Rodiere diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNamedDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNamedDependentBean.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNamedDependentBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNamedDependentBean.java index 535eb5e6b9..431eeed602 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNamedDependentBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNamedDependentBean.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; /** * @author Yoann Rodiere diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java index 4dc6f2f2ee..5cbeb15d3a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java index b0af702abd..430476ddd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.inject.Singleton; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java index cfdff93fb5..bd2d5dedbd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.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 . */ -package org.hibernate.test.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.enterprise.inject.Vetoed; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java index 2f0d92fcab..f723ef0c88 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.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.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java index 9933313540..32597b2915 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.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.cdi.general.nonregistrymanaged.delayed; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged.delayed; import javax.enterprise.inject.Instance; import javax.enterprise.inject.se.SeContainer; @@ -21,21 +21,21 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.general.nonregistrymanaged.Monitor; -import org.hibernate.test.cdi.general.nonregistrymanaged.NonRegistryManagedBeanConsumingIntegrator; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheAlternativeNamedApplicationScopedBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheAlternativeNamedDependentBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheApplicationScopedBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheEntity; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheFallbackBeanInstanceProducer; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheMainNamedApplicationScopedBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheMainNamedDependentBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNamedApplicationScopedBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNamedDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNestedDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNonHibernateBeanConsumer; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheSharedApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.Monitor; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.NonRegistryManagedBeanConsumingIntegrator; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheAlternativeNamedApplicationScopedBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheAlternativeNamedDependentBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheEntity; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheFallbackBeanInstanceProducer; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheMainNamedApplicationScopedBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheMainNamedDependentBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNamedApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNamedDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNestedDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNonHibernateBeanConsumer; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheSharedApplicationScopedBean; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java index bd2a601c8a..a19778c4f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.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.cdi.general.nonregistrymanaged.extended; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged.extended; import javax.enterprise.inject.Instance; import javax.enterprise.inject.se.SeContainer; @@ -21,22 +21,22 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.general.nonregistrymanaged.Monitor; -import org.hibernate.test.cdi.general.nonregistrymanaged.NonRegistryManagedBeanConsumingIntegrator; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheAlternativeNamedApplicationScopedBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheAlternativeNamedDependentBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheApplicationScopedBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheEntity; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheFallbackBeanInstanceProducer; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheMainNamedApplicationScopedBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheMainNamedDependentBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNamedApplicationScopedBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNamedDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNestedDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNonHibernateBeanConsumer; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheSharedApplicationScopedBean; -import org.hibernate.test.cdi.testsupport.TestingExtendedBeanManager; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.Monitor; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.NonRegistryManagedBeanConsumingIntegrator; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheAlternativeNamedApplicationScopedBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheAlternativeNamedDependentBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheEntity; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheFallbackBeanInstanceProducer; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheMainNamedApplicationScopedBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheMainNamedDependentBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNamedApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNamedDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNestedDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNonHibernateBeanConsumer; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheSharedApplicationScopedBean; +import org.hibernate.orm.test.cdi.testsupport.TestingExtendedBeanManager; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/package-info.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/package-info.java index 3cb9272426..476a71415a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/package-info.java @@ -15,4 +15,4 @@ * {@link org.hibernate.resource.beans.container.spi.BeanContainer} as accessed * via {@link org.hibernate.resource.beans.spi.ManagedBeanRegistry#getBeanContainer()} */ -package org.hibernate.test.cdi.general.nonregistrymanaged; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java index bcf4f7d090..b502ee96df 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.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.cdi.general.nonregistrymanaged.standard; +package org.hibernate.orm.test.cdi.general.nonregistrymanaged.standard; import javax.enterprise.inject.Instance; import javax.enterprise.inject.se.SeContainer; @@ -21,21 +21,21 @@ import org.hibernate.tool.schema.Action; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.cdi.general.nonregistrymanaged.Monitor; -import org.hibernate.test.cdi.general.nonregistrymanaged.NonRegistryManagedBeanConsumingIntegrator; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheAlternativeNamedApplicationScopedBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheAlternativeNamedDependentBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheApplicationScopedBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheEntity; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheFallbackBeanInstanceProducer; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheMainNamedApplicationScopedBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheMainNamedDependentBeanImpl; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNamedApplicationScopedBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNamedDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNestedDependentBean; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheNonHibernateBeanConsumer; -import org.hibernate.test.cdi.general.nonregistrymanaged.TheSharedApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.Monitor; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.NonRegistryManagedBeanConsumingIntegrator; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheAlternativeNamedApplicationScopedBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheAlternativeNamedDependentBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheEntity; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheFallbackBeanInstanceProducer; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheMainNamedApplicationScopedBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheMainNamedDependentBeanImpl; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNamedApplicationScopedBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNamedDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNestedDependentBean; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheNonHibernateBeanConsumer; +import org.hibernate.orm.test.cdi.general.nonregistrymanaged.TheSharedApplicationScopedBean; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/package-info.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/package-info.java index ff1df7c499..a1af30be16 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/package-info.java @@ -8,4 +8,4 @@ /** * Base package for testing Hibernate's CDI integration */ -package org.hibernate.test.cdi; +package org.hibernate.orm.test.cdi; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingExtendedBeanManager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingExtendedBeanManager.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java index 6fa6cd91ce..0242e4ba8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingExtendedBeanManager.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.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.cdi.testsupport; +package org.hibernate.orm.test.cdi.testsupport; import javax.enterprise.inject.spi.BeanManager; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java index f9072e7b7f..395e163a2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.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.cdi.testsupport; +package org.hibernate.orm.test.cdi.testsupport; import javax.enterprise.inject.spi.BeanManager; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java index 99b2e13dad..4bcf2a703b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.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.cdi.testsupport; +package org.hibernate.orm.test.cdi.testsupport; import javax.enterprise.inject.spi.BeanManager; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/AnnotationBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/AnnotationBinderTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java index 471ba21026..49a89418fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/AnnotationBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.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 . */ -package org.hibernate.test.cfg; +package org.hibernate.orm.test.cfg; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/BatchVersionedDataConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/BatchVersionedDataConfigTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java index ceefee2542..7970fd3104 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/BatchVersionedDataConfigTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cfg; +package org.hibernate.orm.test.cfg; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; @@ -99,14 +99,6 @@ public void testBatchVersionedDataForOracle9iDialect() { assertThat( sessionFactory.getSessionFactoryOptions().isJdbcBatchVersionedData(), is( false ) ); } - @Test - public void testBatchVersionedDataForOracleDialect() { - cfg.setProperty( AvailableSettings.DIALECT, OracleDialect.class.getName() ); - sessionFactory = cfg.buildSessionFactory(); - - assertThat( sessionFactory.getSessionFactoryOptions().isJdbcBatchVersionedData(), is( false ) ); - } - @Test public void testBatchVersionedDataForOracle12cDialect() { cfg.setProperty( AvailableSettings.DIALECT, Oracle12cDialect.class.getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/Cacheable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/Cacheable.hbm.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/Cacheable.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/Cacheable.hbm.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.java index 9d6ec0c831..4ede0c209c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CacheableFileTest.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 . */ -package org.hibernate.test.cfg; +package org.hibernate.orm.test.cfg; import java.io.File; @@ -24,7 +24,7 @@ * @author Steve Ebersole */ public class CacheableFileTest extends BaseUnitTestCase { - public static final String MAPPING = "org/hibernate/test/cfg/Cacheable.hbm.xml"; + public static final String MAPPING = "org/hibernate/orm/test/cfg/Cacheable.hbm.xml"; private File mappingFile; private File mappingBinFile; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/FooEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/FooEntity.hbm.xml similarity index 82% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/FooEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/FooEntity.hbm.xml index 98339c9767..a8c153f04f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/FooEntity.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/FooEntity.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/PropertyAccessTypeDetectionType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/PropertyAccessTypeDetectionType.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.java index 939931a499..5686844127 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/PropertyAccessTypeDetectionType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/PropertyAccessTypeDetectionType.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 . */ -package org.hibernate.test.cfg; +package org.hibernate.orm.test.cfg; import org.junit.Test; @@ -18,6 +18,12 @@ */ @TestForIssue(jiraKey ="HHH-12199") public class PropertyAccessTypeDetectionType extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override protected String[] getMappings() { return new String[] { "cfg/FooEntity.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/WrongCircularityDetectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/WrongCircularityDetectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java index 4f0d3ca239..eadd8443b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/WrongCircularityDetectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.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 . */ -package org.hibernate.test.cfg; +package org.hibernate.orm.test.cfg; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.hbm.xml similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.hbm.xml index 43f2b33788..a8916b5f24 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.hbm.xml @@ -10,8 +10,8 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.java index 993730a726..aea1d318b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/BaseClass.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 . */ -package org.hibernate.test.cfg.cache; +package org.hibernate.orm.test.cfg.cache; public class BaseClass { Long id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/CacheConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/CacheConfigurationTest.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/CacheConfigurationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/CacheConfigurationTest.java index 6835cca8f9..cce2e2a7c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/CacheConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/CacheConfigurationTest.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 . */ -package org.hibernate.test.cfg.cache; +package org.hibernate.orm.test.cfg.cache; import org.hibernate.cfg.Configuration; import org.hibernate.testing.junit4.BaseUnitTestCase; @@ -16,7 +16,7 @@ * @author Tair Sabirgaliev */ public class CacheConfigurationTest extends BaseUnitTestCase { - public static final String CFG_XML = "org/hibernate/test/cfg/cache/hibernate.cfg.xml"; + public static final String CFG_XML = "org/hibernate/orm/test/cfg/cache/hibernate.cfg.xml"; @Test public void testCacheConfiguration() throws Exception { diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java index eeb40feac1..91a05361a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.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 . */ -package org.hibernate.test.cfg.cache; +package org.hibernate.orm.test.cfg.cache; import javax.persistence.Cacheable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/DirectReferenceCacheEntriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/DirectReferenceCacheEntriesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java index fd91def312..3dcaeef18a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/DirectReferenceCacheEntriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.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.cfg.cache; +package org.hibernate.orm.test.cfg.cache; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.hbm.xml similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.hbm.xml index ed9a9bfdbd..4c41d5d54a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.hbm.xml @@ -12,7 +12,7 @@ - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.java index d48236c710..91a1453d85 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/Item.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 . */ -package org.hibernate.test.cfg.cache; +package org.hibernate.orm.test.cfg.cache; public class Item { Long id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.hbm.xml similarity index 75% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.hbm.xml index 546ac1c994..3951180abc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.hbm.xml @@ -10,11 +10,11 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.java index ab4dce6da3..e8430c9d79 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/SubClass.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 . */ -package org.hibernate.test.cfg.cache; +package org.hibernate.orm.test.cfg.cache; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/hibernate.cfg.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/hibernate.cfg.xml similarity index 55% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/hibernate.cfg.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/hibernate.cfg.xml index f37bf1a307..9416c49fd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/hibernate.cfg.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/hibernate.cfg.xml @@ -7,12 +7,12 @@ - - - + + + - - + + diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Gate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Gate.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java index 84a859ffb1..ecf158726a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Gate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyException.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyException.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.java index 1cf06f514e..64a05c763d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyException.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyException.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java index 53abee7c73..54330c5a2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; import java.io.Serializable; import java.sql.ResultSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Palmtree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Palmtree.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java index 4f146f79bb..4efdc2cca5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Palmtree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java index bfe422569e..944b2491da 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; import org.hibernate.MappingException; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Portal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Portal.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java index ccc5c6f238..32bcbf5806 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Portal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Tree.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java index 488498db98..de22bf0417 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Tree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Window.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Window.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java index 2ad3f79472..da9ccea3cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Window.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.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 . */ -package org.hibernate.test.cfg.persister; +package org.hibernate.orm.test.cfg.persister; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java index 4ee57367be..eb98d65280 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.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 . */ -package org.hibernate.test.cid; +package org.hibernate.orm.test.cid; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -38,6 +38,11 @@ public class CompositeIdWithGeneratorTest extends BaseCoreFunctionalTestCase { private DateFormat df = SimpleDateFormat.getDateTimeInstance( DateFormat.LONG, DateFormat.LONG ); + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "cid/PurchaseRecord.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseDetail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseDetail.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.java index 26eb95fc27..ddeca4b712 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseDetail.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.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 . */ -package org.hibernate.test.cid; +package org.hibernate.orm.test.cid; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.hbm.xml similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.hbm.xml index 67387f9a64..15510e3970 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.hbm.xml @@ -16,7 +16,7 @@ --> - + @@ -24,7 +24,7 @@ class="PurchaseRecord$Id"> - + . */ -package org.hibernate.test.cid; +package org.hibernate.orm.test.cid; import java.io.Serializable; import java.util.Date; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecordIdGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecordIdGenerator.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecordIdGenerator.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecordIdGenerator.java index 0fb3d84a35..6ff67ebc12 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecordIdGenerator.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecordIdGenerator.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 . */ -package org.hibernate.test.cid; +package org.hibernate.orm.test.cid; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.IdentifierGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java index 02a366cbc8..7e475c37e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java @@ -39,12 +39,8 @@ public void testEntityWithMultipleJoinFetchedBags() { .addAnnotatedClass( Tag.class ) .getMetadataBuilder() .build(); - try { - metadata.buildSessionFactory(); - fail( "MultipleBagFetchException should have been thrown." ); - } - catch (MultipleBagFetchException expected) { - } + // make sure that this model does not cause a MultipleBagFetchException + metadata.buildSessionFactory(); } @Entity(name = "Post") diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic/ComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java old mode 100755 new mode 100644 similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic/ComponentTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java index 15d2f516da..4377c85ba3 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic/ComponentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.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 . */ -package org.hibernate.test.component.basic; +package org.hibernate.orm.test.component.basic; import java.util.Date; import java.util.Map; @@ -23,8 +23,8 @@ import org.hibernate.mapping.Component; import org.hibernate.mapping.Formula; import org.hibernate.mapping.PersistentClass; +import org.hibernate.query.TemporalUnit; -import org.hibernate.testing.DialectChecks; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; @@ -38,6 +38,12 @@ * @author Gavin King */ public class ComponentTest extends BaseNonConfigCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "component/basic/User.hbm.xml" }; @@ -60,17 +66,9 @@ protected void afterMetadataBuilt(Metadata metadata) { Component component = ( Component ) personProperty.getValue(); Formula f = ( Formula ) component.getProperty( "yob" ).getValue().getColumnIterator().next(); -// SQLFunction yearFunction = metadata.getDatabase().getJdbcEnvironment().getDialect().getFunctions().get( "year" ); -// if ( yearFunction == null ) { -// // the dialect not know to support a year() function, so rely on the -// // ANSI SQL extract function -// f.setFormula( "extract( year from dob )"); -// } -// else { -// List args = new ArrayList(); -// args.add( "dob" ); -// f.setFormula( yearFunction.render( StandardBasicTypes.INTEGER, args, null ) ); -// } + String pattern = metadata.getDatabase().getJdbcEnvironment().getDialect().extractPattern( TemporalUnit.YEAR ); + String formula = pattern.replace( "?1", "YEAR" ).replace( "?2", "dob" ); + f.setFormula( formula ); } @Test @@ -169,7 +167,7 @@ public void testComponentQueries() { // The following fails on Sybase due to HHH-3510. When HHH-3510 // is fixed, the check for SybaseASE15Dialect should be removed. if ( ! ( getDialect() instanceof SybaseASE15Dialect ) ) { - s.createQuery( "from Employee e where e.person = ('steve', current_timestamp)" ).list(); + s.createQuery( "from Employee e where e.person = (current_timestamp, 'steve')" ).list(); } s.delete( emp ); @@ -193,7 +191,7 @@ public void testComponentQueryMethodNoParensFailureExpected() { emp.getPerson().setName( "steve" ); emp.getPerson().setDob( new Date() ); s.save( emp ); - s.createQuery( "from Employee e where e.person = ('steve', current_timestamp)" ).list(); + s.createQuery( "from Employee e where e.person = (current_timestamp, 'steve')" ).list(); s.delete( emp ); t.commit(); s.close(); @@ -215,12 +213,10 @@ public void testComponentFormulaQuery() { // .add( Property.forName("person.yob").between( new Integer(1999), new Integer(2002) ) ) // .list(); - if ( new DialectChecks.SupportsRowValueConstructorSyntaxCheck().isMatch( getDialect() ) ) { - s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')") - .setParameter("dob", new Date("March 25, 1974")).list(); - s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')") - .setParameter("dob", new Date("March 25, 1974")).list(); - } + s.createQuery("from User u where u.person = ('Peachtree Rd', 'Peachtree Rd', :dob, 34, 'gavin', 'Karbarook Ave', 1974)") + .setParameter("dob", new Date("March 25, 1974")).list(); + s.createQuery("from User where person = ('Peachtree Rd', 'Peachtree Rd', :dob, 34, 'gavin', 'Karbarook Ave', 1974)") + .setParameter("dob", new Date("March 25, 1974")).list(); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Employee.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Employee.java index 3d71fa478f..843cd7031d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Employee.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 . */ -package org.hibernate.test.component.basic; +package org.hibernate.orm.test.component.basic; import java.util.Date; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic/OptionalComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/OptionalComponent.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic/OptionalComponent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/OptionalComponent.java index e516b59a16..4256c22b70 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic/OptionalComponent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/OptionalComponent.java @@ -6,7 +6,7 @@ */ //$Id: $ -package org.hibernate.test.component.basic; +package org.hibernate.orm.test.component.basic; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Person.java old mode 100755 new mode 100644 similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Person.java index 8ac08702f4..96e15dc657 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/Person.java @@ -6,7 +6,7 @@ */ //$Id: Person.java 11345 2007-03-26 17:24:20Z steve.ebersole@jboss.com $ -package org.hibernate.test.component.basic; +package org.hibernate.orm.test.component.basic; import java.util.Date; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.hbm.xml old mode 100755 new mode 100644 similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.hbm.xml index 8aff807771..2dbca4fcd7 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.hbm.xml @@ -13,7 +13,7 @@ --> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.java old mode 100755 new mode 100644 similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.java index 6047ab97ce..1713aa88b1 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/User.java @@ -6,7 +6,7 @@ */ //$Id: User.java 11345 2007-03-26 17:24:20Z steve.ebersole@jboss.com $ -package org.hibernate.test.component.basic; +package org.hibernate.orm.test.component.basic; import java.util.Date; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic2/Component.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java index ef6cf98f9c..b1e2d3f0f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Component.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.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 . */ -package org.hibernate.test.component.basic2; +package org.hibernate.orm.test.component.basic2; import javax.persistence.*; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java index 6387f7c1dd..3d957be78b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.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 . */ -package org.hibernate.test.component.basic2; +package org.hibernate.orm.test.component.basic2; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic2/Name.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java index 8ad7147b89..53fbae5467 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Name.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.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 . */ -package org.hibernate.test.component.basic2; +package org.hibernate.orm.test.component.basic2; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/component/basic2/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java index 5dea204d1a..e47dd028f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.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 . */ -package org.hibernate.test.component.basic2; +package org.hibernate.orm.test.component.basic2; import java.io.Serializable; import javax.persistence.Embedded; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.java index f7d33c7f14..7c39581cb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/CascadeToComponentCollectionTest.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 . */ -package org.hibernate.test.component.cascading.collection; +package org.hibernate.orm.test.component.cascading.collection; import java.util.Locale; @@ -19,6 +19,13 @@ * @author Steve Ebersole */ public class CascadeToComponentCollectionTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + + @Override public String[] getMappings() { return new String[] { "component/cascading/collection/Mappings.hbm.xml" }; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.java index 7f8be39136..8e5aa097a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Definition.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 . */ -package org.hibernate.test.component.cascading.collection; +package org.hibernate.orm.test.component.cascading.collection; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.java index 25f81fcfc3..a1ef5d19f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/LocalizedStrings.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 . */ -package org.hibernate.test.component.cascading.collection; +package org.hibernate.orm.test.component.cascading.collection; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Mappings.hbm.xml similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Mappings.hbm.xml index 7c29851e93..8569db152f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Mappings.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Value.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Value.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Value.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Value.java index 6471a95c5e..8838fc1fea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Value.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/collection/Value.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 . */ -package org.hibernate.test.component.cascading.collection; +package org.hibernate.orm.test.component.cascading.collection; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Address.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Address.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Address.java index f0e799c59d..155d9f12af 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Address.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 . */ -package org.hibernate.test.component.cascading.toone; +package org.hibernate.orm.test.component.cascading.toone; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/CascadeToComponentAssociationTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/CascadeToComponentAssociationTest.java index 1d88586f31..e1f9b293bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/CascadeToComponentAssociationTest.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 . */ -package org.hibernate.test.component.cascading.toone; +package org.hibernate.orm.test.component.cascading.toone; import org.junit.Test; @@ -18,6 +18,12 @@ * @author Steve Ebersole */ public class CascadeToComponentAssociationTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "component/cascading/toone/Mappings.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Document.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Document.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Document.java index 3e6b5f88d3..c2b4b89e35 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Document.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Document.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 . */ -package org.hibernate.test.component.cascading.toone; +package org.hibernate.orm.test.component.cascading.toone; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Mappings.hbm.xml similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Mappings.hbm.xml index 93b5d0a2aa..059de0f704 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/Mappings.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/PersonalInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/PersonalInfo.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/PersonalInfo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/PersonalInfo.java index b84b6487cd..d8f3867569 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/PersonalInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/PersonalInfo.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 . */ -package org.hibernate.test.component.cascading.toone; +package org.hibernate.orm.test.component.cascading.toone; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/User.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/User.java index 769250c6f8..d641ccd712 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/cascading/toone/User.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 . */ -package org.hibernate.test.component.cascading.toone; +package org.hibernate.orm.test.component.cascading.toone; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/ComponentEmptyEmbedded.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/ComponentEmptyEmbedded.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java index 8f62de676e..d3c99a839e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/ComponentEmptyEmbedded.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/ComponentEmptyEmbeddedOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/ComponentEmptyEmbeddedOwner.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java index 8a04be0e15..8fe6f476cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/ComponentEmptyEmbeddedOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java index d176992fad..3c48789fae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyEagerTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import java.io.Serializable; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java index 22354acdff..a07f4f9de2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyLazyTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import java.io.Serializable; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeEquivalentToNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeEquivalentToNullTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeEquivalentToNullTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeEquivalentToNullTest.java index eade04dada..314581290f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeEquivalentToNullTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeEquivalentToNullTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import javax.persistence.Column; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java index 6bde31694a..8a4b241e3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import java.io.Serializable; import javax.persistence.Cacheable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeManyToOneKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeManyToOneKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyTest.java index 0962c1dba1..e0f325c136 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositeManyToOneKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositesDirtynessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositesDirtynessTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositesDirtynessTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositesDirtynessTest.java index 82615282be..0095585acb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyCompositesDirtynessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositesDirtynessTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedCompositesDirtynessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyInitializedCompositesDirtynessTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedCompositesDirtynessTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyInitializedCompositesDirtynessTest.java index f126d5982c..eada14a90f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedCompositesDirtynessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyInitializedCompositesDirtynessTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedCompositesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyInitializedCompositesTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedCompositesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyInitializedCompositesTest.java index cf2c77a4b0..a40d1c5547 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedCompositesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyInitializedCompositesTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/SelectBeforeUpdateEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/component/empty/SelectBeforeUpdateEmbeddedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java index ac852f3a1f..5c1ce14f0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/SelectBeforeUpdateEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.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 . */ -package org.hibernate.test.component.empty; +package org.hibernate.orm.test.component.empty; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/Adult.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/component/proxy/Adult.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java index 027f8c4fe4..ec73b31487 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/Adult.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.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 . */ -package org.hibernate.test.component.proxy; +package org.hibernate.orm.test.component.proxy; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/ComponentBasicProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/component/proxy/ComponentBasicProxyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java index 30e9e7a1b6..786f9b92a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/ComponentBasicProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.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 . */ -package org.hibernate.test.component.proxy; +package org.hibernate.orm.test.component.proxy; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/component/proxy/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java index 7d74686429..ee0eb1a4b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.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 . */ -package org.hibernate.test.component.proxy; +package org.hibernate.orm.test.component.proxy; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/PersonId.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/component/proxy/PersonId.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/PersonId.java index a1ce7edb2a..72de63c51f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/proxy/PersonId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/PersonId.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 . */ -package org.hibernate.test.component.proxy; +package org.hibernate.orm.test.component.proxy; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Child.java old mode 100755 new mode 100644 similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/compositeelement/Child.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Child.java index 6d9baa82d4..98181b6d5b --- a/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Child.java @@ -6,7 +6,7 @@ */ //$Id: Child.java 6978 2005-06-01 03:29:27Z oneovthafew $ -package org.hibernate.test.compositeelement; +package org.hibernate.orm.test.compositeelement; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java old mode 100755 new mode 100644 similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java index 7292245ff6..2a3919e527 --- a/hibernate-core/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java @@ -4,9 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.compositeelement; - -import java.util.ArrayList; +package org.hibernate.orm.test.compositeelement; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; @@ -18,7 +16,6 @@ import org.hibernate.mapping.Collection; import org.hibernate.mapping.Component; import org.hibernate.mapping.Formula; -import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; @@ -29,6 +26,12 @@ * @author Gavin King */ public class CompositeElementTest extends BaseNonConfigCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "compositeelement/Parent.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Parent.hbm.xml old mode 100755 new mode 100644 similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Parent.hbm.xml index 50a312de85..22a788d80d --- a/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/Parent.hbm.xml @@ -17,7 +17,7 @@ --> + package="org.hibernate.orm.test.compositeelement"> @@ -33,7 +33,7 @@ - + . */ -package org.hibernate.test.customstructures; +package org.hibernate.orm.test.customstructures; import java.util.Iterator; import java.util.Objects; diff --git a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/deletetransient/Address.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.java index 48b1b4e9ca..fca2597b8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Address.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 . */ -package org.hibernate.test.deletetransient; +package org.hibernate.orm.test.deletetransient; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java index 927ab4b2df..6c5929bfd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.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 . */ -package org.hibernate.test.deletetransient; +package org.hibernate.orm.test.deletetransient; import org.junit.Test; @@ -18,9 +18,17 @@ * @author Steve Ebersole */ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + + @Override public String[] getMappings() { return new String[] { "deletetransient/Person.hbm.xml" }; } + @Override protected boolean isCleanupTestDataRequired() { return true; diff --git a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Note.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Note.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/deletetransient/Note.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Note.java index 115084b32f..2702780b8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Note.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Note.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 . */ -package org.hibernate.test.deletetransient; +package org.hibernate.orm.test.deletetransient; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.hbm.xml similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.hbm.xml index 2470a1f6c2..1ed93efe5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.hbm.xml @@ -13,7 +13,7 @@ --> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.java index 6eafbb4250..e062354e8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Person.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 . */ -package org.hibernate.test.deletetransient; +package org.hibernate.orm.test.deletetransient; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Suite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/deletetransient/Suite.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.java index b32dfcdc56..b6c3cfcef2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Suite.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/Suite.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 . */ -package org.hibernate.test.deletetransient; +package org.hibernate.orm.test.deletetransient; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java new file mode 100644 index 0000000000..c4f81a80d8 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java @@ -0,0 +1,149 @@ +/* + * 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 . + */ +package org.hibernate.orm.test.dialect.function; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.SQLServerDialect; +import org.hibernate.dialect.SybaseDialect; +import org.hibernate.dialect.function.TrimFunction; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.metamodel.mapping.JdbcMappingContainer; +import org.hibernate.query.TrimSpec; +import org.hibernate.sql.ast.SqlAstTranslator; +import org.hibernate.sql.ast.spi.SqlAppender; +import org.hibernate.sql.ast.spi.StandardSqlAstTranslator; +import org.hibernate.sql.ast.tree.SqlAstNode; +import org.hibernate.sql.ast.tree.expression.QueryLiteral; +import org.hibernate.sql.ast.tree.expression.SelfRenderingExpression; +import org.hibernate.sql.ast.tree.expression.TrimSpecification; +import org.hibernate.sql.exec.spi.JdbcOperation; +import org.hibernate.type.CharacterType; + +import org.hibernate.testing.orm.junit.FailureExpected; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.junit.Test; + +import org.mockito.Mockito; + +import static org.junit.Assert.assertEquals; + +/** + * TODO : javadoc + * + * @author Steve Ebersole + */ +public class AnsiTrimEmulationFunctionTest { + private static final String trimSource = "a.column"; + + @Test + @FailureExpected + public void testBasicSqlServerProcessing() { + Dialect dialect = new SQLServerDialect(); + TrimFunction function = new TrimFunction( dialect ); + + performBasicSpaceTrimmingTests( dialect, function ); + + final String expectedTrimPrep = "replace(replace(a.column,' ','#%#%'),'-',' ')"; + final String expectedPostTrimPrefix = "replace(replace("; + final String expectedPostTrimSuffix = ",' ','-'),'#%#%',' ')"; + + // -> trim(LEADING '-' FROM a.column) + String rendered = render( dialect, function, TrimSpec.LEADING, '-', trimSource ); + String expected = expectedPostTrimPrefix + "ltrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; + assertEquals( expected, rendered ); + + // -> trim(TRAILING '-' FROM a.column) + rendered = render( dialect, function, TrimSpec.TRAILING, '-', trimSource ); + expected = expectedPostTrimPrefix + "rtrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; + assertEquals( expected, rendered ); + + // -> trim(BOTH '-' FROM a.column) + rendered = render( dialect, function, TrimSpec.BOTH, '-', trimSource ); + expected = expectedPostTrimPrefix + "ltrim(rtrim(" + expectedTrimPrep + "))" + expectedPostTrimSuffix; + assertEquals( expected, rendered ); + } + + @Test + @FailureExpected + public void testBasicSybaseProcessing() { + Dialect dialect = new SybaseDialect(); + TrimFunction function = new TrimFunction( dialect ); + + performBasicSpaceTrimmingTests( dialect, function ); + + final String expectedTrimPrep = "str_replace(str_replace(a.column,' ','#%#%'),'-',' ')"; + final String expectedPostTrimPrefix = "str_replace(str_replace("; + final String expectedPostTrimSuffix = ",' ','-'),'#%#%',' ')"; + + // -> trim(LEADING '-' FROM a.column) + String rendered = render( dialect, function, TrimSpec.LEADING, '-', trimSource ); + String expected = expectedPostTrimPrefix + "ltrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; + assertEquals( expected, rendered ); + + // -> trim(TRAILING '-' FROM a.column) + rendered = render( dialect, function, TrimSpec.TRAILING, '-', trimSource ); + expected = expectedPostTrimPrefix + "rtrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; + assertEquals( expected, rendered ); + + // -> trim(BOTH '-' FROM a.column) + rendered = render( dialect, function, TrimSpec.BOTH, '-', trimSource ); + expected = expectedPostTrimPrefix + "ltrim(rtrim(" + expectedTrimPrep + "))" + expectedPostTrimSuffix; + assertEquals( expected, rendered ); + } + + private void performBasicSpaceTrimmingTests(Dialect dialect, TrimFunction function) { + // -> trim(a.column) + String rendered = render( dialect, function, TrimSpec.BOTH, ' ', trimSource ); + assertEquals( "ltrim(rtrim(a.column))", rendered ); + + // -> trim(LEADING FROM a.column) + rendered = render( dialect, function, TrimSpec.LEADING, ' ', trimSource ); + assertEquals( "ltrim(a.column)", rendered ); + + // -> trim(TRAILING FROM a.column) + rendered = render( dialect, function, TrimSpec.TRAILING, ' ', trimSource ); + assertEquals( "rtrim(a.column)", rendered ); + } + + private String render( + Dialect dialect, + TrimFunction function, + TrimSpec trimSpec, + char trimCharacter, + String trimSource) { + SessionFactoryImplementor factory = Mockito.mock( SessionFactoryImplementor.class ); + JdbcServices jdbcServices = Mockito.mock( JdbcServices.class ); + Mockito.doReturn( jdbcServices ).when( factory ).getJdbcServices(); + Mockito.doReturn( dialect ).when( jdbcServices ).getDialect(); + StandardSqlAstTranslator walker = new StandardSqlAstTranslator<>( + factory, + null + ); + List sqlAstArguments = new ArrayList<>(); + sqlAstArguments.add( new TrimSpecification( trimSpec ) ); + sqlAstArguments.add( new QueryLiteral<>( trimCharacter, new CharacterType() ) ); + sqlAstArguments.add( new SelfRenderingExpression() { + @Override + public void renderToSql( + SqlAppender sqlAppender, SqlAstTranslator walker, SessionFactoryImplementor sessionFactory) { + sqlAppender.appendSql( trimSource ); + } + + @Override + public JdbcMappingContainer getExpressionType() { + return null; + } + } ); + function.render( walker, sqlAstArguments, walker ); + return walker.getSql(); + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/HANAFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/function/HANAFunctionsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java index 352eeb313c..f9f6205a57 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/HANAFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.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 . */ -package org.hibernate.test.dialect.function; +package org.hibernate.orm.test.dialect.function; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/HSQLTruncFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/function/HSQLTruncFunctionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java index 18a411fd2d..f3310b2c35 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/HSQLTruncFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.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 . */ -package org.hibernate.test.dialect.function; +package org.hibernate.orm.test.dialect.function; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java index aa72fd1cda..c2d00bb9d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.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 . */ -package org.hibernate.test.dialect.function; +package org.hibernate.orm.test.dialect.function; import java.math.BigDecimal; import org.junit.Test; @@ -23,11 +23,17 @@ */ @RequiresDialect( MySQLDialect.class ) public class MySQLRoundFunctionTest extends BaseCoreFunctionalTestCase { + @Override public String[] getMappings() { return new String[]{"dialect/function/Product.hbm.xml"}; } + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Test public void testRoundFunction(){ Product product = new Product(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.hbm.xml similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.hbm.xml index 3fb4c9012b..218f3f12f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.java index 968f048cf9..e9941a03bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/Product.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 . */ -package org.hibernate.test.dialect.function; +package org.hibernate.orm.test.dialect.function; import java.math.BigDecimal; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/SybaseASE15FunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASE15FunctionTest.java old mode 100755 new mode 100644 similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/function/SybaseASE15FunctionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASE15FunctionTest.java index 3a8aa2b7d1..fe727eac0c --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/SybaseASE15FunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASE15FunctionTest.java @@ -1,131 +1,131 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2010, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.dialect.function; - -import static java.util.Calendar.MONTH; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.math.BigDecimal; -import java.util.Calendar; -import java.util.Date; - -import org.hibernate.query.Query; -import org.hibernate.Session; -import org.hibernate.dialect.SybaseASE15Dialect; -import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; - -/** - * - * @author Richard H. Tingstad - */ -@RequiresDialect(value = { SybaseASE15Dialect.class }) -public class SybaseASE15FunctionTest extends BaseCoreFunctionalTestCase { - - private Calendar calendar = Calendar.getInstance(); - - @Override - public String[] getMappings() { - return new String[] { "dialect/function/Product.hbm.xml" }; - } - - @Override - protected void prepareTest() throws Exception { - final Session s = openSession(); - s.getTransaction().begin(); - Product product = new Product(); - product.setPrice(new BigDecimal(0.5)); - product.setDate( calendar.getTime() ); - s.save( product ); - s.getTransaction().commit(); - s.close(); - } - - @Override - protected void cleanupTest() throws Exception { - final Session s = openSession(); - s.getTransaction().begin(); - s.createQuery( "delete from Product" ).executeUpdate(); - s.getTransaction().commit(); - s.close(); - } - - @Test - public void testCharLengthFunction() { - final Session s = openSession(); - s.getTransaction().begin(); - Query query = session.createQuery( "select char_length('123456') from Product" ); - assertEquals(6, ((Number) query.uniqueResult()).intValue()); - s.getTransaction().commit(); - s.close(); - } - - @Test - @TestForIssue(jiraKey = "HHH-7070") - public void testDateaddFunction() { - final Session s = openSession(); - s.getTransaction().begin(); - Query query = session.createQuery( "select dateadd(dd, 1, p.date) from Product p" ); - assertTrue(calendar.getTime().before((Date) query.uniqueResult())); - s.getTransaction().commit(); - s.close(); - } - - @Test - @TestForIssue(jiraKey = "HHH-7070") - public void testDatepartFunction() { - final Session s = openSession(); - s.getTransaction().begin(); - Query query = session.createQuery( "select datepart(month, p.date) from Product p" ); - assertEquals(calendar.get(MONTH) + 1, ((Number) query.uniqueResult()).intValue()); - s.getTransaction().commit(); - s.close(); - } - - @Test - @TestForIssue(jiraKey = "HHH-7070") - public void testDatediffFunction() { - final Session s = openSession(); - s.getTransaction().begin(); - Query query = session.createQuery( "SELECT DATEDIFF( DAY, '1999/07/19 00:00', '1999/07/23 23:59' ) from Product" ); - assertEquals(4, ((Number) query.uniqueResult()).intValue()); - s.getTransaction().commit(); - s.close(); - } - - @Test - @TestForIssue(jiraKey = "HHH-7070") - public void testAtn2Function() { - final Session s = openSession(); - s.getTransaction().begin(); - Query query = session.createQuery("select atn2(p.price, .48) from Product p"); - assertEquals(0.805803, ((Number) query.uniqueResult()).doubleValue(), 0.000001 ); - s.getTransaction().commit(); - s.close(); - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.orm.test.dialect.function; + +import static java.util.Calendar.MONTH; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.Date; + +import org.hibernate.query.Query; +import org.hibernate.Session; +import org.hibernate.dialect.SybaseASE15Dialect; +import org.hibernate.testing.RequiresDialect; +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.junit.Test; + +/** + * + * @author Richard H. Tingstad + */ +@RequiresDialect(value = { SybaseASE15Dialect.class }) +public class SybaseASE15FunctionTest extends BaseCoreFunctionalTestCase { + + private Calendar calendar = Calendar.getInstance(); + + @Override + public String[] getMappings() { + return new String[] { "dialect/function/Product.hbm.xml" }; + } + + @Override + protected void prepareTest() throws Exception { + final Session s = openSession(); + s.getTransaction().begin(); + Product product = new Product(); + product.setPrice(new BigDecimal(0.5)); + product.setDate( calendar.getTime() ); + s.save( product ); + s.getTransaction().commit(); + s.close(); + } + + @Override + protected void cleanupTest() throws Exception { + final Session s = openSession(); + s.getTransaction().begin(); + s.createQuery( "delete from Product" ).executeUpdate(); + s.getTransaction().commit(); + s.close(); + } + + @Test + public void testCharLengthFunction() { + final Session s = openSession(); + s.getTransaction().begin(); + Query query = session.createQuery( "select char_length('123456') from Product" ); + assertEquals(6, ((Number) query.uniqueResult()).intValue()); + s.getTransaction().commit(); + s.close(); + } + + @Test + @TestForIssue(jiraKey = "HHH-7070") + public void testDateaddFunction() { + final Session s = openSession(); + s.getTransaction().begin(); + Query query = session.createQuery( "select dateadd(dd, 1, p.date) from Product p" ); + assertTrue(calendar.getTime().before((Date) query.uniqueResult())); + s.getTransaction().commit(); + s.close(); + } + + @Test + @TestForIssue(jiraKey = "HHH-7070") + public void testDatepartFunction() { + final Session s = openSession(); + s.getTransaction().begin(); + Query query = session.createQuery( "select datepart(month, p.date) from Product p" ); + assertEquals(calendar.get(MONTH) + 1, ((Number) query.uniqueResult()).intValue()); + s.getTransaction().commit(); + s.close(); + } + + @Test + @TestForIssue(jiraKey = "HHH-7070") + public void testDatediffFunction() { + final Session s = openSession(); + s.getTransaction().begin(); + Query query = session.createQuery( "SELECT DATEDIFF( DAY, '1999/07/19 00:00', '1999/07/23 23:59' ) from Product" ); + assertEquals(4, ((Number) query.uniqueResult()).intValue()); + s.getTransaction().commit(); + s.close(); + } + + @Test + @TestForIssue(jiraKey = "HHH-7070") + public void testAtn2Function() { + final Session s = openSession(); + s.getTransaction().begin(); + Query query = session.createQuery("select atn2(p.price, .48) from Product p"); + assertEquals(0.805803, ((Number) query.uniqueResult()).doubleValue(), 0.000001 ); + s.getTransaction().commit(); + s.close(); + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Category.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java index aa4d623e3b..8240bec3ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Contact.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java index e8ea30047f..636aaf15d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Contact.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Folder.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java index 11816cc11a..0a7fa28d31 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Folder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANABooleanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANABooleanTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java index fcde9e6662..96a786a595 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANABooleanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANACalcViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANACalcViewTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java index 956ae929b9..4735650770 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANACalcViewTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANADecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANADecimalTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java index 163b965af7..666c7e9011 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANADecimalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANASearchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANASearchTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java index 76d3a472d0..8ce5cabd47 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANASearchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/MariaDBExtractSequenceMatadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMatadataTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/MariaDBExtractSequenceMatadataTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMatadataTest.java index 6aaaa53e88..ce6c026fd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/MariaDBExtractSequenceMatadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/MariaDBExtractSequenceMatadataTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.sql.Connection; import java.sql.DriverManager; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/OracleSequenceInfoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/OracleSequenceInfoTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.java index 234ba4d4a6..c866ee2d63 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/OracleSequenceInfoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleSequenceInfoTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.tool.schema.extract.spi.SequenceInformation; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Product2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Product2.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java index a3560829dd..b0e3c8bc46 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Product2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectCollationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java index 9e018f00b1..bed70a79c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectCollationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; import java.sql.Connection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectSequenceInformationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.java index 1193cf8d68..a964327040 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectSequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectSequenceInformationTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.sql.Connection; import java.sql.SQLException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTempTableCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTempTableCollationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java index 399f59979f..1a8fb0ed83 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTempTableCollationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java index 2a36c6c8b0..d04a8f8b0a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java @@ -24,7 +24,6 @@ import org.hibernate.Transaction; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.dialect.SQLServer2005Dialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.exception.LockTimeoutException; import org.hibernate.query.Query; @@ -32,10 +31,6 @@ import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.test.dialect.functional.Category; -import org.hibernate.test.dialect.functional.Contact; -import org.hibernate.test.dialect.functional.Folder; -import org.hibernate.test.dialect.functional.Product2; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SequenceInformationMariaDBTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SequenceInformationMariaDBTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java index 193aaefa59..fd97a2c924 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SequenceInformationMariaDBTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.sql.Connection; import java.sql.SQLException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SequenceInformationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java index 0d2868c649..4ecc0832a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.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 . */ -package org.hibernate.test.dialect.functional; +package org.hibernate.orm.test.dialect.functional; import java.util.EnumSet; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java index 4b0d584ae6..a0f192a592 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java @@ -14,9 +14,7 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Map; import org.hibernate.LockOptions; import org.hibernate.dialect.CacheDialect; @@ -24,13 +22,11 @@ import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.dialect.Cache71Dialect; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.jdbc.Work; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.test.dialect.functional.cache.TestInterSystemsFunctionsClass; import org.hibernate.test.legacy.Blobber; import org.hibernate.test.legacy.Broken; import org.hibernate.test.legacy.Fixed; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java index a9df0c442f..5fb2d46fe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/cache/TestInterSystemsFunctionsClass.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 . */ -package org.hibernate.test.dialect.functional.cache; +package org.hibernate.orm.test.dialect.functional.cache; import java.util.Date; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/CustomDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/dirtiness/CustomDirtinessStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java index fdeb1a5c4a..971b6c45e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/CustomDirtinessStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.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 . */ -package org.hibernate.test.dirtiness; +package org.hibernate.orm.test.dirtiness; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/dirtiness/Thing.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java index 270cfdf676..d0de2d73db 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/Thing.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.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 . */ -package org.hibernate.test.dirtiness; +package org.hibernate.orm.test.dirtiness; import java.util.*; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Car.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/Car.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Car.java index 5e250e67ed..c4fb977b27 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/Car.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Car.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 . */ -package org.hibernate.test.entitymode.dom4j; +package org.hibernate.orm.test.entitymode.dom4j; /** * @author Carsten Hammer diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Component.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/Component.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Component.java index 34f85ca9b7..9d02036767 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/Component.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/Component.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 . */ -package org.hibernate.test.entitymode.dom4j; +package org.hibernate.orm.test.entitymode.dom4j; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/DeprecationLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/DeprecationLoggingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.java index bedc6722a8..d208a8c122 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/DeprecationLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.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 . */ -package org.hibernate.test.entitymode.dom4j; +package org.hibernate.orm.test.entitymode.dom4j; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; @@ -33,7 +33,7 @@ public void basicTest() { logInspection.registerListener( LogListenerImpl.INSTANCE ); MetadataSources metadataSources = new MetadataSources() - .addResource( "org/hibernate/test/entitymode/dom4j/Car.hbm.xml" ); + .addResource( "org/hibernate/orm/test/entitymode/dom4j/Car.hbm.xml" ); try { metadataSources.buildMetadata(); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/LogListenerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/LogListenerImpl.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/LogListenerImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/LogListenerImpl.java index 761d2d66f4..c39bc24e5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/entitymode/dom4j/LogListenerImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/LogListenerImpl.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 . */ -package org.hibernate.test.entitymode.dom4j; +package org.hibernate.orm.test.entitymode.dom4j; import org.hibernate.testing.logger.LogListener; diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java old mode 100755 new mode 100644 similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java index 2941b92265..9f315ab518 --- a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.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 . */ -package org.hibernate.test.entitymode.map.basic; +package org.hibernate.orm.test.entitymode.map.basic; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -29,6 +29,12 @@ * @author Gavin King */ public class DynamicClassTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "entitymode/map/basic/ProductLine.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/ProductLine.hbm.xml old mode 100755 new mode 100644 similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/ProductLine.hbm.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/Mappings.hbm.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.java index f421588dc6..74a078a31e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.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 . */ -package org.hibernate.test.entitymode.map.subclass; +package org.hibernate.orm.test.entitymode.map.subclass; import java.util.HashMap; @@ -17,6 +17,12 @@ * @author Steve Ebersole */ public class SubclassDynamicMapTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "entitymode/map/subclass/Mappings.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/BaseExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/BaseExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.java index 2c6b4520f8..56d9e9c708 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/BaseExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import java.util.Arrays; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java index 3821563406..17b171d86a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import java.net.URL; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java index 245a5a793a..5ece767e16 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/ExceptionExpectations.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/ExceptionExpectations.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java index 5f912daad9..c9e4dcf1c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/ExceptionExpectations.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import java.sql.SQLException; import javax.persistence.NoResultException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java index 729fcfd6fd..a7c031ac56 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java index 34072386cb..aae51694a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import java.sql.SQLException; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/QueryExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/QueryExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java index d408229fe7..55f4f21396 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/QueryExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java index c0c50be6ef..d9a2933aa8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StateObjectStateExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/TransactionExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/TransactionExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java index 4dc5800e8d..b742ea4170 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/TransactionExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/TransientObjectExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/TransientObjectExceptionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java index a59fd10df0..382da64508 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/exceptionhandling/TransientObjectExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.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 . */ -package org.hibernate.test.exceptionhandling; +package org.hibernate.orm.test.exceptionhandling; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.hbm.xml similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.hbm.xml index 0f97230498..e016d63b97 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.hbm.xml @@ -15,7 +15,7 @@ --> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.java index e660816cd4..839459eba2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Customer.java @@ -6,7 +6,7 @@ */ //$Id: Customer.java 5011 2004-12-19 22:01:25Z maxcsaucdk $ -package org.hibernate.test.extendshbm; +package org.hibernate.orm.test.extendshbm; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.hbm.xml similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.hbm.xml index 0b4e1c9c66..b3ffc49926 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.hbm.xml @@ -15,7 +15,7 @@ --> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.java index ed31290cdb..932e9e853c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Employee.java @@ -6,7 +6,7 @@ */ //$Id: Employee.java 5011 2004-12-19 22:01:25Z maxcsaucdk $ -package org.hibernate.test.extendshbm; +package org.hibernate.orm.test.extendshbm; import java.math.BigDecimal; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/ExtendsTest.java similarity index 72% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/ExtendsTest.java index f78530fa85..4eb98ebf5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/ExtendsTest.java @@ -6,7 +6,7 @@ */ //$Id: ExtendsTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $ -package org.hibernate.test.extendshbm; +package org.hibernate.orm.test.extendshbm; import org.hibernate.HibernateException; import org.hibernate.boot.Metadata; @@ -39,7 +39,7 @@ public void tearDown() { } private String getBaseForMappings() { - return "org/hibernate/test/"; + return "org/hibernate/orm/test/"; } @Test @@ -48,9 +48,9 @@ public void testAllInOne() { .addResource( getBaseForMappings() + "extendshbm/allinone.hbm.xml" ) .buildMetadata(); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Customer" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Person" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Employee" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Customer" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Person" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Employee" ) ); } @Test @@ -61,9 +61,9 @@ public void testOutOfOrder() { .addResource( getBaseForMappings() + "extendshbm/Employee.hbm.xml" ) .buildMetadata(); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Customer" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Person" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Employee" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Customer" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Person" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Employee" ) ); } @Test @@ -74,9 +74,9 @@ public void testNwaitingForSuper() { .addResource( getBaseForMappings() + "extendshbm/Person.hbm.xml" ) .buildMetadata(); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Customer" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Person" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Employee" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Customer" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Person" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Employee" ) ); } @Test @@ -98,9 +98,9 @@ public void testAllSeparateInOne() { .addResource( getBaseForMappings() + "extendshbm/allseparateinone.hbm.xml" ) .buildMetadata(); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Customer" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Person" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Employee" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Customer" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Person" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Employee" ) ); } @Test @@ -129,8 +129,8 @@ public void testUnionSubclass() { .addResource( getBaseForMappings() + "extendshbm/unionsubclass.hbm.xml" ) .buildMetadata(); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Person" ) ); - assertNotNull( metadata.getEntityBinding( "org.hibernate.test.extendshbm.Customer" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Person" ) ); + assertNotNull( metadata.getEntityBinding( "org.hibernate.orm.test.extendshbm.Customer" ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Person.hbm.xml similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Person.hbm.xml index ec9a2888a8..2d260f6565 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/Person.hbm.xml @@ -15,7 +15,7 @@ --> - + + package="org.hibernate.orm.test.extendshbm"> diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/allseparateinone.hbm.xml similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/allseparateinone.hbm.xml index 5fdf3cf718..83c254d2c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/allseparateinone.hbm.xml @@ -16,7 +16,7 @@ --> + package="org.hibernate.orm.test.extendshbm"> diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/entitynames.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/entitynames.hbm.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/entitynames.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/entitynames.hbm.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/packageentitynames.hbm.xml similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/packageentitynames.hbm.xml index 76ff86b4d6..ee975c4fe2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/packageentitynames.hbm.xml @@ -8,7 +8,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/unionsubclass.hbm.xml similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/unionsubclass.hbm.xml index 49b8bacecd..7f4b12b258 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extendshbm/unionsubclass.hbm.xml @@ -16,7 +16,7 @@ --> + package="org.hibernate.orm.test.extendshbm"> diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java index 71a67ad88e..2187a04ce7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.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 . */ -package org.hibernate.test.fetchprofiles; +package org.hibernate.orm.test.fetchprofiles; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java index 65d44d752f..dba8cdee6e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.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 . */ -package org.hibernate.test.fetchprofiles; +package org.hibernate.orm.test.fetchprofiles; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Course.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Course.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Course.java index d0cbba29d1..412d0dc995 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Course.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Course.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 . */ -package org.hibernate.test.fetchprofiles.join; +package org.hibernate.orm.test.fetchprofiles.join; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/CourseOffering.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/CourseOffering.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/CourseOffering.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/CourseOffering.java index 987d108fba..ffb8d19fad 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/CourseOffering.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/CourseOffering.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 . */ -package org.hibernate.test.fetchprofiles.join; +package org.hibernate.orm.test.fetchprofiles.join; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Department.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Department.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Department.java index 029fb24f58..96bcfe4941 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Department.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Department.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 . */ -package org.hibernate.test.fetchprofiles.join; +package org.hibernate.orm.test.fetchprofiles.join; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Enrollment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Enrollment.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Enrollment.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Enrollment.java index 34f148c33d..67dcbc4d8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Enrollment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Enrollment.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 . */ -package org.hibernate.test.fetchprofiles.join; +package org.hibernate.orm.test.fetchprofiles.join; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java index 0a7947e04b..6652dca22f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.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 . */ -package org.hibernate.test.fetchprofiles.join; +package org.hibernate.orm.test.fetchprofiles.join; import java.util.List; import javax.persistence.criteria.CriteriaBuilder; @@ -31,6 +31,13 @@ * @author Steve Ebersole */ public class JoinFetchProfileTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + + @Override public String[] getMappings() { return new String[] { "fetchprofiles/join/Mappings.hbm.xml" }; } @@ -324,7 +331,7 @@ public void testHQL() { int sectionCount = sections.size(); assertEquals( "unexpected CourseOffering count", 1, sectionCount ); assertEquals( 4, sessionFactory().getStatistics().getEntityLoadCount() ); - assertEquals( 2, sessionFactory().getStatistics().getEntityFetchCount() ); + assertEquals( 0, sessionFactory().getStatistics().getEntityFetchCount() ); } ) diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Mappings.hbm.xml similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Mappings.hbm.xml index a022b3451f..156e2b7994 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Mappings.hbm.xml @@ -9,7 +9,7 @@ SYSTEM "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" > - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Student.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Student.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Student.java index 6b8ec11139..d290d5c643 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/Student.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 . */ -package org.hibernate.test.fetchprofiles.join; +package org.hibernate.orm.test.fetchprofiles.join; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java index 26f7563920..bd1feab838 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.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 . */ -package org.hibernate.test.fetchprofiles.join.selfReferencing; +package org.hibernate.orm.test.fetchprofiles.join.selfReferencing; import java.util.ArrayList; import java.util.Collection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java index c773475f1a..8f58e1cf59 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.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 . */ -package org.hibernate.test.fetchprofiles.join.selfReferencing; +package org.hibernate.orm.test.fetchprofiles.join.selfReferencing; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/BatchFetchOptionsHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/BatchFetchOptionsHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java index 1310f9ee9e..18b1dc2254 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/BatchFetchOptionsHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.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 . */ -package org.hibernate.test.fetchoptionshelper; +package org.hibernate.orm.test.fetchstrategyhelper; import java.util.HashSet; import java.util.Set; @@ -32,7 +32,7 @@ /** * @author Gail Badner */ -public class BatchFetchOptionsHelperTest extends BaseCoreFunctionalTestCase { +public class BatchFetchStrategyHelperTest extends BaseCoreFunctionalTestCase { @Test public void testManyToOneDefaultFetch() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/FetchOptionsHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/FetchOptionsHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java index 369cb0a41d..b84dd4a23f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/FetchOptionsHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.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 . */ -package org.hibernate.test.fetchoptionshelper; +package org.hibernate.orm.test.fetchstrategyhelper; import java.util.HashSet; import java.util.Set; @@ -31,7 +31,7 @@ /** * @author Gail Badner */ -public class FetchOptionsHelperTest extends BaseCoreFunctionalTestCase { +public class FetchStrategyHelperTest extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/NoProxyFetchOptionsHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/NoProxyFetchStrategyHelperTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/NoProxyFetchOptionsHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/NoProxyFetchStrategyHelperTest.java index ef07e3bac8..024f5fe345 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/fetchoptionshelper/NoProxyFetchOptionsHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/NoProxyFetchStrategyHelperTest.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 . */ -package org.hibernate.test.fetchoptionshelper; +package org.hibernate.orm.test.fetchstrategyhelper; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -29,7 +29,7 @@ /** * @author Gail Badner */ -public class NoProxyFetchOptionsHelperTest extends BaseCoreFunctionalTestCase { +public class NoProxyFetchStrategyHelperTest extends BaseCoreFunctionalTestCase { @Test public void testManyToOneDefaultFetch() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java index 0bab9d96ca..a4c656a822 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java @@ -107,7 +107,6 @@ public void testSqlSyntaxOfFiltersWithUnions() { } @Test - @FailureExpected(jiraKey = "none", message = "v6 imperfection") public void testSecondLevelCachedCollectionsFiltering() { CollectionPersister persister = sessionFactory().getCollectionPersister( Salesperson.class.getName() + ".orders" ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/flush/Author.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java index 884e58d5f9..9cfde555d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/Author.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/flush/Book.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java index 616d312139..cf637ba76d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/BookStore.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/flush/BookStore.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java index 07dcef4ac6..a3fa225715 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/BookStore.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/NativeCriteriaSyncTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/flush/NativeCriteriaSyncTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java index 920d23017e..5ae3d93f0c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/NativeCriteriaSyncTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/flush/NonTransactionalDataAccessTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java index 21bf69314d..1f3a3a7ed3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/NonTransactionalDataAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/Publisher.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/flush/Publisher.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java index bf12e635a5..9b4b94cb43 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/Publisher.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java index 1a0631e80f..a712fc5ca9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import java.util.HashSet; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestClearBatchFetchQueueAfterFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/flush/TestClearBatchFetchQueueAfterFlush.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java index 9f28d23724..bddba3f6c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestClearBatchFetchQueueAfterFlush.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import java.util.Iterator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java index 67b43ea429..ca2aaa47af 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestFlushJoinTransaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/flush/TestFlushJoinTransaction.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java index c615974f76..c1b8d80e57 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestFlushJoinTransaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java index c598634a64..ab51af3709 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import javax.persistence.CascadeType; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java index ea72b04d64..b5550f0583 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestHibernateFlushModeOnThreadLocalInactiveTransaction.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/flush/UnrelatedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/flush/UnrelatedEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java index 7bbef52381..dd08d61f69 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/flush/UnrelatedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.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 . */ -package org.hibernate.test.flush; +package org.hibernate.orm.test.flush; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/HHH14230.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/HHH14230.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java index 09e1bcf378..32b259fbe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/HHH14230.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.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 . */ -package org.hibernate.test.foreignkeys; +package org.hibernate.orm.test.foreignkeys; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/DefaultConstraintModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/DefaultConstraintModeTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java index 86ab995be1..8e05fdf49f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/DefaultConstraintModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.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 . */ -package org.hibernate.test.foreignkeys.disabled; +package org.hibernate.orm.test.foreignkeys.disabled; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/DisabledForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/DisabledForeignKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.java index c29f7a1bb0..94e4596c72 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/DisabledForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DisabledForeignKeyTest.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 . */ -package org.hibernate.test.foreignkeys.disabled; +package org.hibernate.orm.test.foreignkeys.disabled; import java.util.EnumSet; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java index 7da4197f58..577743602c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.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 . */ -package org.hibernate.test.foreignkeys.disabled; +package org.hibernate.orm.test.foreignkeys.disabled; import java.time.LocalDate; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/ManyToManyOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/ManyToManyOwner.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java index 9a1ca079c8..8aaa96ca71 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/ManyToManyOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.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 . */ -package org.hibernate.test.foreignkeys.disabled; +package org.hibernate.orm.test.foreignkeys.disabled; import java.util.Set; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/ManyToManyTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/ManyToManyTarget.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java index adb3ccae4d..9768054dc0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/ManyToManyTarget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.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 . */ -package org.hibernate.test.foreignkeys.disabled; +package org.hibernate.orm.test.foreignkeys.disabled; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java index 38cd379156..3a3f776ade 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.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 . */ -package org.hibernate.test.foreignkeys.disabled; +package org.hibernate.orm.test.foreignkeys.disabled; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/package-info.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/package-info.java index 260e64ca70..494c27227e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/foreignkeys/disabled/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/package-info.java @@ -8,4 +8,4 @@ /** * Tests for disabling FK generation */ -package org.hibernate.test.foreignkeys.disabled; +package org.hibernate.orm.test.foreignkeys.disabled; diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java index e0e0b73ee8..02d594f04f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.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 . */ -package org.hibernate.test.generatedkeys.identity; +package org.hibernate.orm.test.generatedkeys.identity; import javax.persistence.PersistenceException; import javax.persistence.TransactionRequiredException; @@ -29,11 +29,19 @@ */ @RequiresDialectFeature( DialectChecks.SupportsIdentityColumns.class ) public class IdentityGeneratedKeysTest extends BaseCoreFunctionalTestCase { + + @Override public void configure(Configuration cfg) { super.configure( cfg ); cfg.setProperty( Environment.GENERATE_STATISTICS, "true" ); } + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + + @Override public String[] getMappings() { return new String[] { "generatedkeys/identity/MyEntity.hbm.xml" }; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyChild.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyChild.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyChild.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyChild.java index e18d73456c..f44c3df333 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyChild.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyChild.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 . */ -package org.hibernate.test.generatedkeys.identity; +package org.hibernate.orm.test.generatedkeys.identity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.hbm.xml similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.hbm.xml index d8dbad70ba..2a88eeb490 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.java index 6867ac0fc4..435f0e56c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MyEntity.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 . */ -package org.hibernate.test.generatedkeys.identity; +package org.hibernate.orm.test.generatedkeys.identity; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MySibling.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MySibling.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MySibling.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MySibling.java index 15586466d7..0014f44685 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MySibling.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/MySibling.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 . */ -package org.hibernate.test.generatedkeys.identity; +package org.hibernate.orm.test.generatedkeys.identity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.hbm.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.java index c84c203a1e..5233ca9809 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/MyEntity.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 . */ -package org.hibernate.test.generatedkeys.select; +package org.hibernate.orm.test.generatedkeys.select; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java index 7ded10b916..bfc188c90a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.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 . */ -package org.hibernate.test.generatedkeys.select; +package org.hibernate.orm.test.generatedkeys.select; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java index c5c505b13d..3d35fcfdae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.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 . */ -package org.hibernate.test.generatedkeys.seqidentity; +package org.hibernate.orm.test.generatedkeys.seqidentity; import java.io.Serializable; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/MyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/MyEntity.hbm.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/MyEntity.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/MyEntity.java index f389e1b464..f49e044617 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/MyEntity.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 . */ -package org.hibernate.test.generatedkeys.seqidentity; +package org.hibernate.orm.test.generatedkeys.seqidentity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/SequenceIdentityTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/SequenceIdentityTest.java index 1de5393598..cc566fd4e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/SequenceIdentityTest.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 . */ -package org.hibernate.test.generatedkeys.seqidentity; +package org.hibernate.orm.test.generatedkeys.seqidentity; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/collectionpk/CollectionPkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/collectionpk/CollectionPkTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java index 7a50687a44..1ea044f372 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/collectionpk/CollectionPkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.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 . */ -package org.hibernate.test.hbm.collectionpk; +package org.hibernate.orm.test.hbm.collectionpk; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -14,7 +14,7 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.hbm.index.JournalingSchemaToolingTarget; +import org.hibernate.orm.test.hbm.index.JournalingSchemaToolingTarget; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -43,7 +43,7 @@ public void after() { @Test public void testSet() { verifyPkNameUsed( - "org/hibernate/test/hbm/collectionpk/person_set.hbm.xml", + "org/hibernate/orm/test/hbm/collectionpk/person_set.hbm.xml", "primary key (group, name)" ); } @@ -65,7 +65,7 @@ private void verifyPkNameUsed(String mappingResource, String expectedName) { @Test public void testMap() { verifyPkNameUsed( - "org/hibernate/test/hbm/collectionpk/person_map.hbm.xml", + "org/hibernate/orm/test/hbm/collectionpk/person_map.hbm.xml", "primary key (group, locale)" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/comment/ClassCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/comment/ClassCommentTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java index ff8f01fdb7..e40e8c8a90 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/comment/ClassCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/comment/ClassCommentTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.hbm.comment; +package org.hibernate.orm.test.hbm.comment; import java.io.StringReader; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/fk/CollectionKeyFkNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/fk/CollectionKeyFkNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.java index 3532bbf5ec..1969520424 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/fk/CollectionKeyFkNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/fk/CollectionKeyFkNameTest.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 . */ -package org.hibernate.test.hbm.fk; +package org.hibernate.orm.test.hbm.fk; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -15,7 +15,7 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.hbm.index.JournalingSchemaToolingTarget; +import org.hibernate.orm.test.hbm.index.JournalingSchemaToolingTarget; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,7 +44,7 @@ public void after() { @TestForIssue( jiraKey = "HHH-10207" ) public void testExplicitFkNameOnCollectionKey() { verifyFkNameUsed( - "org/hibernate/test/hbm/fk/person_set.hbm.xml", + "org/hibernate/orm/test/hbm/fk/person_set.hbm.xml", "person_persongroup_fk" ); } @@ -73,7 +73,7 @@ private void verifyFkNameUsed(String mappingResource, String expectedName) { @TestForIssue( jiraKey = "HHH-10207" ) public void testExplicitFkNameOnManyToOne() { verifyFkNameUsed( - "org/hibernate/test/hbm/fk/person_set.hbm.xml", + "org/hibernate/orm/test/hbm/fk/person_set.hbm.xml", "person_persongroup_fk" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/index/IndexTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.java index 1438d8f686..08f6c4a6dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/IndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/IndexTest.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 . */ -package org.hibernate.test.hbm.index; +package org.hibernate.orm.test.hbm.index; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -43,7 +43,7 @@ public void after() { // @FailureExpected( jiraKey = "HHH-10208" ) public void testOneToMany() throws Exception { verifyIndexCreated( - "org/hibernate/test/hbm/index/person_manytoone.hbm.xml", + "org/hibernate/orm/test/hbm/index/person_manytoone.hbm.xml", "person_persongroup_index" ); } @@ -66,7 +66,7 @@ private void verifyIndexCreated(String mappingResource, String expectedIndexName // @FailureExpected( jiraKey = "HHH-10208" ) public void testProperty() throws Exception { verifyIndexCreated( - "org/hibernate/test/hbm/index/person_property.hbm.xml", + "org/hibernate/orm/test/hbm/index/person_property.hbm.xml", "person_name_index" ); } @@ -74,7 +74,7 @@ public void testProperty() throws Exception { @Test public void testPropertyColumn() throws Exception { verifyIndexCreated( - "org/hibernate/test/hbm/index/person_propertycolumn.hbm.xml", + "org/hibernate/orm/test/hbm/index/person_propertycolumn.hbm.xml", "person_name_index" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/JournalingSchemaToolingTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/index/JournalingSchemaToolingTarget.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.java index d83526153e..8900b6ddd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/JournalingSchemaToolingTarget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/JournalingSchemaToolingTarget.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 . */ -package org.hibernate.test.hbm.index; +package org.hibernate.orm.test.hbm.index; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/Person.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/index/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/Person.java index 48fc500fd1..d49d2d9cf5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/Person.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 . */ -package org.hibernate.test.hbm.index; +package org.hibernate.orm.test.hbm.index; public class Person { private long id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonComment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonComment.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.java index bc8c700b84..9e4917b182 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonComment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonComment.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 . */ -package org.hibernate.test.hbm.index; +package org.hibernate.orm.test.hbm.index; public class PersonComment { private String locale; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonGroup.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonGroup.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonGroup.java index 186495dde2..b542add27c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/index/PersonGroup.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/index/PersonGroup.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 . */ -package org.hibernate.test.hbm.index; +package org.hibernate.orm.test.hbm.index; import java.util.HashMap; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/package-info.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/package-info.java index d09d80b872..bf8e5ed65f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/package-info.java @@ -8,4 +8,4 @@ /** * Tests specific to {@code hbm.xml} handling/binding */ -package org.hibernate.test.hbm; +package org.hibernate.orm.test.hbm; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/query/NamedQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java index fa0b6a0f97..fd48bf4fdd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/NamedQueryTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.hbm.query; +package org.hibernate.orm.test.hbm.query; import java.io.StringReader; @@ -16,7 +16,7 @@ public class NamedQueryTest extends BaseUnitTestCase { private static String NAMED_QUERY_HBM_XML = - " "+ + " "+ " "+ " "+ " "+ diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/query/QueryReturnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/query/QueryReturnTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java index 1ffaff9e7d..b420847b81 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/query/QueryReturnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/query/QueryReturnTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.hbm.query; +package org.hibernate.orm.test.hbm.query; import java.io.StringReader; @@ -24,7 +24,7 @@ public class QueryReturnTest extends BaseUnitTestCase { private static String QUERY_RETURN_HBM_XML = - " "+ + " "+ " "+ " "+ " "+ @@ -35,7 +35,7 @@ public class QueryReturnTest extends BaseUnitTestCase { " "+ " "+ " 50]]> "+ " "+ diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/uk/UniqueDelegateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/uk/UniqueDelegateTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.java index c2bd6ba76c..a2bdc80f63 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/uk/UniqueDelegateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/uk/UniqueDelegateTest.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 . */ -package org.hibernate.test.hbm.uk; +package org.hibernate.orm.test.hbm.uk; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -23,7 +23,7 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.hbm.index.JournalingSchemaToolingTarget; +import org.hibernate.orm.test.hbm.index.JournalingSchemaToolingTarget; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -60,7 +60,7 @@ public void after() { @TestForIssue( jiraKey = "HHH-10203" ) public void testUniqueDelegateConsulted() { final Metadata metadata = new MetadataSources( ssr ) - .addResource( "org/hibernate/test/hbm/uk/person_unique.hbm.xml" ) + .addResource( "org/hibernate/orm/test/hbm/uk/person_unique.hbm.xml" ) .buildMetadata(); final JournalingSchemaToolingTarget target = new JournalingSchemaToolingTarget(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/version/GeneratedVersionBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/GeneratedVersionBindingTest.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/version/GeneratedVersionBindingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/GeneratedVersionBindingTest.java index a16186993a..bb5521f6b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/version/GeneratedVersionBindingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/GeneratedVersionBindingTest.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 . */ -package org.hibernate.test.hbm.version; +package org.hibernate.orm.test.hbm.version; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; @@ -21,7 +21,7 @@ public class GeneratedVersionBindingTest extends BaseUnitTestCase { @Test public void testIt() { MetadataSources metadataSources = new MetadataSources() - .addResource("org/hibernate/test/hbm/version/Mappings.hbm.xml"); + .addResource( "org/hibernate/orm/test/hbm/version/Mappings.hbm.xml" ); try { metadataSources.buildMetadata(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/hbm/version/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/Order.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/hbm/version/Order.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/Order.java index 983543f263..a3fd729c7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hbm/version/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/version/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 . */ -package org.hibernate.test.hbm.version; +package org.hibernate.orm.test.hbm.version; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteWithSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/hql/DeleteWithSubqueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.java index da7a83826c..73eaab2158 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteWithSubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DeleteWithSubqueryTest.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 . */ -package org.hibernate.test.hql; +package org.hibernate.orm.test.hql; import org.hibernate.Session; import org.hibernate.dialect.MySQLDialect; @@ -12,6 +12,8 @@ import org.hibernate.test.annotations.query.Attrvalue; import org.hibernate.test.annotations.query.Employee; import org.hibernate.test.annotations.query.Employeegroup; +import org.hibernate.test.hql.Panel; +import org.hibernate.test.hql.TrtPanel; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java similarity index 82% rename from hibernate-core/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java index 46f336e48a..c4ee4c654d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java @@ -4,12 +4,8 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.idprops; - +package org.hibernate.orm.test.idprops; import org.hibernate.Session; -import org.hibernate.orm.test.idprops.LineItem; -import org.hibernate.orm.test.idprops.Order; -import org.hibernate.orm.test.idprops.Person; import org.hibernate.query.Query; import org.hibernate.testing.orm.junit.DialectFeatureChecks; @@ -69,15 +65,11 @@ public void testHqlIdPropertyReferences(SessionFactoryScope scope) { count = extractCount( s, "select count(*) from LineItem l where l.id = '456'" ); assertEquals( 1, count, "LineItem by id prop (non-identifier" ); - if ( new DialectFeatureChecks.SupportsRowValueConstructorSyntaxCheck().apply( scope.getSessionFactory() - .getJdbcServices() - .getDialect() ) ) { - Query q = s.createQuery( "select count(*) from LineItem l where l.pk = (:order, :product)" ) - .setParameter( "order", o ) - .setParameter( "product", "my-product" ); - count = extractCount( q ); - assertEquals( 1, count, "LineItem by pk prop (named composite identifier" ); - } + Query q = s.createQuery( "select count(*) from LineItem l where l.pk = (:order, :product)" ) + .setParameter( "order", o ) + .setParameter( "product", "my-product" ); + count = extractCount( q ); + assertEquals( 1, count, "LineItem by pk prop (named composite identifier" ); count = extractCount( s, "select count(*) from Order o where o.orderee.id = 1" ); assertEquals( 0, count ); @@ -107,4 +99,4 @@ private long extractCount(Query query) { return ( (Long) query.list().get( 0 ) ).longValue(); } -} +} \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java index eaf3db0b58..9d3df939e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java @@ -19,7 +19,7 @@ import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; import org.hibernate.testing.orm.junit.BaseUnitTest; -import org.hibernate.test.jpa.xml.versions.JpaXsdVersionsTest; +import org.hibernate.orm.test.jpa.xml.versions.JpaXsdVersionsTest; import org.junit.jupiter.api.AfterEach; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java index f4938be09c..69c1354b6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; -import org.hibernate.test.jpa.xml.versions.JpaXsdVersionsTest; +import org.hibernate.orm.test.jpa.xml.versions.JpaXsdVersionsTest; import org.hibernate.jpa.HibernatePersistenceProvider; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java index d5c4bb11b1..4f34889849 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java @@ -19,6 +19,7 @@ import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.internal.SessionImpl; import org.hibernate.jpa.test.transaction.Book; +import org.hibernate.orm.test.jpa.txn.JtaTransactionJoiningTest; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl; import org.hibernate.testing.TestForIssue; @@ -34,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** - * Largely a copy of {@link org.hibernate.test.jpa.txn.JtaTransactionJoiningTest} + * Largely a copy of {@link JtaTransactionJoiningTest} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/JtaTransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/JtaTransactionJoiningTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/jpa/txn/JtaTransactionJoiningTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/JtaTransactionJoiningTest.java index e4dcd7a896..d2f409bd21 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/JtaTransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/JtaTransactionJoiningTest.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 . */ -package org.hibernate.test.jpa.txn; +package org.hibernate.orm.test.jpa.txn; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/ResourceLocalTransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/jpa/txn/ResourceLocalTransactionJoiningTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java index a6df5a0d1b..c4ce44f940 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/ResourceLocalTransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.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 . */ -package org.hibernate.test.jpa.txn; +package org.hibernate.orm.test.jpa.txn; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/xml/versions/JpaXsdVersionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/jpa/xml/versions/JpaXsdVersionsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java index a541e8a331..fa086230c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/xml/versions/JpaXsdVersionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.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.jpa.xml.versions; +package org.hibernate.orm.test.jpa.xml.versions; import java.net.URL; import java.util.ArrayList; @@ -38,7 +38,7 @@ public class JpaXsdVersionsTest { @Test public void testOrm1() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm1-test", "1.0" ) - .addMappingFileName( "org/hibernate/test/jpa/xml/versions/valid-orm-1_0.xml" ); + .addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml" ); HibernatePersistenceProvider hp = new HibernatePersistenceProvider(); EntityManagerFactory emf = hp.createContainerEntityManagerFactory( pui, Collections.EMPTY_MAP ); try { @@ -52,7 +52,7 @@ public void testOrm1() { @Test public void testOrm20() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm2-test", "2.0" ) - .addMappingFileName( "org/hibernate/test/jpa/xml/versions/valid-orm-2_0.xml" ); + .addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_0.xml" ); HibernatePersistenceProvider hp = new HibernatePersistenceProvider(); EntityManagerFactory emf = hp.createContainerEntityManagerFactory( pui, Collections.EMPTY_MAP ); try { @@ -66,7 +66,7 @@ public void testOrm20() { @Test public void testOrm21() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm2-test", "2.1" ) - .addMappingFileName( "org/hibernate/test/jpa/xml/versions/valid-orm-2_1.xml" ); + .addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml" ); HibernatePersistenceProvider hp = new HibernatePersistenceProvider(); EntityManagerFactory emf = hp.createContainerEntityManagerFactory( pui, Collections.EMPTY_MAP ); try { @@ -80,7 +80,7 @@ public void testOrm21() { @Test public void testOrm22() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm2-test", "2.2") - .addMappingFileName( "org/hibernate/test/jpa/xml/versions/valid-orm-2_2.xml" ); + .addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml" ); HibernatePersistenceProvider hp = new HibernatePersistenceProvider(); EntityManagerFactory emf = hp.createContainerEntityManagerFactory( pui, Collections.EMPTY_MAP ); try { @@ -94,7 +94,7 @@ public void testOrm22() { @Test public void testInvalidOrm1() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "invalid-orm1-test", "1.0" ) - .addMappingFileName( "org/hibernate/test/jpa/xml/versions/invalid-orm-1_0.xml" ); + .addMappingFileName( "org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml" ); HibernatePersistenceProvider hp = new HibernatePersistenceProvider(); EntityManagerFactory emf = null; try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java index 92f15c7766..dfd995a2ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java @@ -154,7 +154,7 @@ public void testNaturalIdDeleteUsingCache(SessionFactoryScope scope) { } ); - assertEquals( 0, statistics.getNaturalIdQueryExecutionCount() ); + assertEquals( 1, statistics.getNaturalIdQueryExecutionCount() ); assertEquals( 0, statistics.getNaturalIdCacheHitCount() ); assertEquals( 0, statistics.getNaturalIdCachePutCount() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java index 2ac284b5e1..22e87e187e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneErrorTest.java @@ -15,8 +15,8 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.test.annotations.onetoone.Show; -import org.hibernate.test.annotations.onetoone.ShowDescription; +import org.hibernate.orm.test.annotations.onetoone.Show; +import org.hibernate.orm.test.annotations.onetoone.ShowDescription; import org.junit.Assert; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java index fd8b26d14a..3e688e01db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/MySQLSetVariableEscapeColonTest.java @@ -11,6 +11,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.RequiresDialect; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -24,6 +25,7 @@ @RequiresDialect(MySQLDialect.class) @TestForIssue( jiraKey = "HHH-1237") @SessionFactory +@DomainModel public class MySQLSetVariableEscapeColonTest { @Test public void testBoundedLongStringAccess(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java index 2a061abc37..178e12cd16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java @@ -12,7 +12,6 @@ import javax.persistence.OneToOne; import org.hibernate.testing.orm.junit.DomainModel; -import org.hibernate.testing.orm.junit.NotImplementedYet; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.Test; @@ -39,7 +38,7 @@ public void testGet(SessionFactoryScope scope) { session -> { Person p = new Person(); - p.setId( 0 ); + p.setId( PERSON_ID ); p.setName( "Alfio" ); PersonInfo pi = new PersonInfo(); pi.setId( p ); @@ -56,7 +55,7 @@ public void testGet(SessionFactoryScope scope) { } ); } - @Entity(name="Person") + @Entity(name = "Person") public static class Person { @Id private Integer id; @@ -92,7 +91,7 @@ public void setPersonInfo(PersonInfo personInfo) { } } - @Entity(name="PersonInfo") + @Entity(name = "PersonInfo") public static class PersonInfo { @Id @OneToOne diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java index e39de0b493..dfab54e877 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java @@ -13,7 +13,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.query.sqm.ParsingException; +import org.hibernate.query.SemanticException; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; @@ -76,7 +76,7 @@ public void testWithoutCommaFail() { } ); } catch ( Exception e ) { - assertEquals( ParsingException.class, e.getCause().getClass() ); + assertEquals( SemanticException.class, e.getCause().getClass() ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java deleted file mode 100644 index 367702a781..0000000000 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java +++ /dev/null @@ -1,130 +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 . - */ -package org.hibernate.test.dialect.function; - -import org.hibernate.NotYetImplementedFor6Exception; - -import org.hibernate.testing.orm.junit.FailureExpected; -import org.junit.Test; - -/** - * TODO : javadoc - * - * @author Steve Ebersole - */ -public class AnsiTrimEmulationFunctionTest { - private static final String trimSource = "a.column"; - - @Test - @FailureExpected - public void testBasicSqlServerProcessing() { - throw new NotYetImplementedFor6Exception( getClass() ); -// AnsiTrimEmulationFunction function = new AnsiTrimEmulationFunction(); -// -// performBasicSpaceTrimmingTests( function ); -// -// final String expectedTrimPrep = "replace(replace(a.column,' ','${space}$'),'-',' ')"; -// final String expectedPostTrimPrefix = "replace(replace("; -// final String expectedPostTrimSuffix = ",' ','-'),'${space}$',' ')"; -// -// // -> trim(LEADING '-' FROM a.column) -// String rendered = function.render( null, argList( "LEADING", "'-'", "FROM", trimSource ), null ); -// String expected = expectedPostTrimPrefix + "ltrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); -// -// // -> trim(TRAILING '-' FROM a.column) -// rendered = function.render( null, argList( "TRAILING", "'-'", "FROM", trimSource ), null ); -// expected = expectedPostTrimPrefix + "rtrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); -// -// // -> trim(BOTH '-' FROM a.column) -// rendered = function.render( null, argList( "BOTH", "'-'", "FROM", trimSource ), null ); -// expected = expectedPostTrimPrefix + "ltrim(rtrim(" + expectedTrimPrep + "))" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); -// -// // -> trim('-' FROM a.column) -// rendered = function.render( null, argList( "'-'", "FROM", trimSource ), null ); -// expected = expectedPostTrimPrefix + "ltrim(rtrim(" + expectedTrimPrep + "))" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); - } - - @Test - @FailureExpected - public void testBasicSybaseProcessing() { - throw new NotYetImplementedFor6Exception( getClass() ); -// AnsiTrimEmulationFunction function = new AnsiTrimEmulationFunction( -// AnsiTrimEmulationFunction.LTRIM, -// AnsiTrimEmulationFunction.RTRIM, -// "str_replace" -// ); -// -// performBasicSpaceTrimmingTests( function ); -// -// final String expectedTrimPrep = "str_replace(str_replace(a.column,' ','${space}$'),'-',' ')"; -// final String expectedPostTrimPrefix = "str_replace(str_replace("; -// final String expectedPostTrimSuffix = ",' ','-'),'${space}$',' ')"; -// -// // -> trim(LEADING '-' FROM a.column) -// String rendered = function.render( null, argList( "LEADING", "'-'", "FROM", trimSource ), null ); -// String expected = expectedPostTrimPrefix + "ltrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); -// -// // -> trim(TRAILING '-' FROM a.column) -// rendered = function.render( null, argList( "TRAILING", "'-'", "FROM", trimSource ), null ); -// expected = expectedPostTrimPrefix + "rtrim(" + expectedTrimPrep + ")" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); -// -// // -> trim(BOTH '-' FROM a.column) -// rendered = function.render( null, argList( "BOTH", "'-'", "FROM", trimSource ), null ); -// expected = expectedPostTrimPrefix + "ltrim(rtrim(" + expectedTrimPrep + "))" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); -// -// // -> trim('-' FROM a.column) -// rendered = function.render( null, argList( "'-'", "FROM", trimSource ), null ); -// expected = expectedPostTrimPrefix + "ltrim(rtrim(" + expectedTrimPrep + "))" + expectedPostTrimSuffix; -// assertEquals( expected, rendered ); - } - -// private void performBasicSpaceTrimmingTests(AnsiTrimEmulation function) { -// // -> trim(a.column) -// String rendered = function.render( null, argList( trimSource ), null ); -// assertEquals( "ltrim(rtrim(a.column))", rendered ); -// -// // -> trim(FROM a.column) -// rendered = function.render( null, argList( "FROM", trimSource ), null ); -// assertEquals( "ltrim(rtrim(a.column))", rendered ); -// -// // -> trim(BOTH FROM a.column) -// rendered = function.render( null, argList( "BOTH", "FROM", trimSource ), null ); -// assertEquals( "ltrim(rtrim(a.column))", rendered ); -// -// // -> trim(BOTH ' ' FROM a.column) -// rendered = function.render( null, argList( "BOTH", "' '", "FROM", trimSource ), null ); -// assertEquals( "ltrim(rtrim(a.column))", rendered ); -// -// // -> trim(LEADING FROM a.column) -// rendered = function.render( null, argList( "LEADING", "FROM", trimSource ), null ); -// assertEquals( "ltrim(a.column)", rendered ); -// -// // -> trim(LEADING ' ' FROM a.column) -// rendered = function.render( null, argList( "LEADING", "' '", "FROM", trimSource ), null ); -// assertEquals( "ltrim(a.column)", rendered ); -// -// // -> trim(TRAILING FROM a.column) -// rendered = function.render( null, argList( "TRAILING", "FROM", trimSource ), null ); -// assertEquals( "rtrim(a.column)", rendered ); -// -// // -> trim(TRAILING ' ' FROM a.column) -// rendered = function.render( null, argList( "TRAILING", "' '", "FROM", trimSource ), null ); -// assertEquals( "rtrim(a.column)", rendered ); -// } -// -// private List argList(String... args) { -// return Arrays.asList( args ); -// } - -} diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java index 4155316005..e00625f83d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java @@ -22,7 +22,7 @@ import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.resource.transaction.spi.TransactionStatus; -import org.hibernate.test.exceptionhandling.BaseJpaOrNativeBootstrapFunctionalTestCase; +import org.hibernate.orm.test.exceptionhandling.BaseJpaOrNativeBootstrapFunctionalTestCase; import org.hibernate.testing.junit4.CustomParameterized; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java index 4fb8f06da5..45ebf6b98d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java @@ -21,7 +21,6 @@ import javax.persistence.ManyToOne; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Fetch; import javax.persistence.criteria.Join; import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Root; @@ -34,7 +33,6 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.annotations.naturalid.State; import org.junit.Test; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/tm/InterceptorTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/test/tm/InterceptorTransactionTest.java index d20d110c51..985a566232 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tm/InterceptorTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/tm/InterceptorTransactionTest.java @@ -25,7 +25,7 @@ import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.junit4.CustomParameterized; -import org.hibernate.test.exceptionhandling.BaseJpaOrNativeBootstrapFunctionalTestCase; +import org.hibernate.orm.test.exceptionhandling.BaseJpaOrNativeBootstrapFunctionalTestCase; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/onetomany/orm.xml similarity index 89% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/onetomany/orm.xml index 2ca8d74141..f7bf46adb5 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/onetomany/orm.xml @@ -9,7 +9,7 @@ - org.hibernate.test.annotations.onetomany + org.hibernate.orm.test.annotations.onetomany diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/onetoone/orm.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/onetoone/orm.xml index 022c09278f..37b2a53c19 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/onetoone/orm.xml @@ -9,7 +9,7 @@ - org.hibernate.test.annotations.onetoone + org.hibernate.orm.test.annotations.onetoone diff --git a/hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml similarity index 66% rename from hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml index b21ee92445..f2dc19dc6f 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + @@ -19,10 +19,10 @@ - + - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml similarity index 67% rename from hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml index 67d10b0a61..7594619d5e 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml @@ -10,19 +10,19 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + - + - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/UnionSubclassPerson.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml similarity index 66% rename from hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/UnionSubclassPerson.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml index 1b5b18ef72..80306215cb 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/cache/hhh13179/UnionSubclassPerson.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml @@ -10,17 +10,17 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + - + - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/entitymode/dom4j/Car.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/entitymode/dom4j/Car.hbm.xml similarity index 88% rename from hibernate-core/src/test/resources/org/hibernate/test/entitymode/dom4j/Car.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/entitymode/dom4j/Car.hbm.xml index d47a28c1ff..cdb352b9ef 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/entitymode/dom4j/Car.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/entitymode/dom4j/Car.hbm.xml @@ -5,9 +5,9 @@ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later. ~ See the lgpl.txt file in the root directory or . --> - + - + cat_id_sequence diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/collectionpk/person_map.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/collectionpk/person_map.hbm.xml similarity index 90% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/collectionpk/person_map.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/collectionpk/person_map.hbm.xml index bbe5825688..3a02bd4a79 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/collectionpk/person_map.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/collectionpk/person_map.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/collectionpk/person_set.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/collectionpk/person_set.hbm.xml similarity index 90% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/collectionpk/person_set.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/collectionpk/person_set.hbm.xml index 3dde017764..b390962a67 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/collectionpk/person_set.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/collectionpk/person_set.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/fk/person_manytoone.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/fk/person_manytoone.hbm.xml similarity index 91% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/fk/person_manytoone.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/fk/person_manytoone.hbm.xml index d43ec0c9ac..61c75503fe 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/fk/person_manytoone.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/fk/person_manytoone.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/fk/person_set.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/fk/person_set.hbm.xml similarity index 90% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/fk/person_set.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/fk/person_set.hbm.xml index f19dc7145d..ce979f4ac5 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/fk/person_set.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/fk/person_set.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_manytoone.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_manytoone.hbm.xml similarity index 91% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_manytoone.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_manytoone.hbm.xml index 1eb5b36b3d..b5b267400a 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_manytoone.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_manytoone.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_property.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_property.hbm.xml similarity index 88% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_property.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_property.hbm.xml index 5a1143dfd4..4649c70ce1 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_property.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_property.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_propertycolumn.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_propertycolumn.hbm.xml similarity index 89% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_propertycolumn.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_propertycolumn.hbm.xml index 5e2d540b77..36c5dd9a59 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/index/person_propertycolumn.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/index/person_propertycolumn.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/uk/person_unique.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/uk/person_unique.hbm.xml similarity index 88% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/uk/person_unique.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/uk/person_unique.hbm.xml index 78bfbd601f..f0dc6ab670 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/uk/person_unique.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/uk/person_unique.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/hbm/version/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/version/Mappings.hbm.xml similarity index 78% rename from hibernate-core/src/test/resources/org/hibernate/test/hbm/version/Mappings.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/version/Mappings.hbm.xml index dd9533f67e..7ba015e63e 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/hbm/version/Mappings.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/hbm/version/Mappings.hbm.xml @@ -11,14 +11,14 @@ - + - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/invalid-orm-1_0.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/invalid-orm-1_0.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-1_0.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-1_0.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-2_0.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_0.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-2_0.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_0.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-2_1.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-2_1.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-2_2.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-orm-2_2.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-persistence-1_0.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-persistence-1_0.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/jpa/xml/versions/valid-persistence-1_0.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-persistence-1_0.xml diff --git a/hibernate-jcache/src/test/java/org/hibernate/jcache/test/RefreshUpdatedDataTest.java b/hibernate-jcache/src/test/java/org/hibernate/jcache/test/RefreshUpdatedDataTest.java index 9b84faf34f..00555e07f7 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/jcache/test/RefreshUpdatedDataTest.java +++ b/hibernate-jcache/src/test/java/org/hibernate/jcache/test/RefreshUpdatedDataTest.java @@ -52,7 +52,7 @@ public void acquireResources() { .configure( "hibernate-config/hibernate.cfg.xml" ); if ( H2Dialect.class.equals( Dialect.getDialect().getClass() ) ) { - ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc;MVCC=true" ); + ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc" ); } ssrb.applySetting( AvailableSettings.GENERATE_STATISTICS, "true" );