From 83fba3064f373aef561e441be238c1a7b43a15ea Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Mon, 23 Aug 2021 15:38:03 +0200 Subject: [PATCH] Re-enabled envers tests --- .../test/envers}/integration/ids/CompositeIds.java | 2 +- .../integration/ids/embeddedid/EmbeddedIdGenericsTest.java | 2 +- .../embeddedid/RelationInsideEmbeddableNotAuditedTest.java | 2 +- .../ids/embeddedid/RelationInsideEmbeddableTest.java | 6 +----- .../integration/ids/idclass/IdClassWithRelationTest.java | 5 +---- 5 files changed, 5 insertions(+), 12 deletions(-) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/CompositeIds.java (99%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/EmbeddedIdGenericsTest.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java (99%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/RelationInsideEmbeddableTest.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/IdClassWithRelationTest.java (93%) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java similarity index 99% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java index 781426de07..1ddaa69cf0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java @@ -4,7 +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.envers.test.integration.ids; +package org.hibernate.orm.test.envers.integration.ids; import java.util.Arrays; import javax.persistence.EntityManager; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/EmbeddedIdGenericsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/EmbeddedIdGenericsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java index dd1578edf4..9b1dfb2c25 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/EmbeddedIdGenericsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java @@ -4,7 +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.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java similarity index 99% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java index 002cd09370..61f3d87cea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java @@ -4,7 +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.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; import java.util.Arrays; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java index 31897a5501..b350316846 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java @@ -4,17 +4,13 @@ * 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.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.orm.test.envers.integration.ids.embeddedid.Item; -import org.hibernate.orm.test.envers.integration.ids.embeddedid.ItemId; -import org.hibernate.orm.test.envers.integration.ids.embeddedid.Producer; -import org.hibernate.orm.test.envers.integration.ids.embeddedid.PurchaseOrder; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java index 49d27cc815..082de5dfe6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java @@ -4,16 +4,13 @@ * 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.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.orm.test.envers.integration.ids.idclass.ClassType; -import org.hibernate.orm.test.envers.integration.ids.idclass.RelationalClassId; -import org.hibernate.orm.test.envers.integration.ids.idclass.SampleClass; import org.hibernate.testing.TestForIssue; import org.junit.Test;