This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 9c48b44704cda6622b794563c1a3ac53e2821657 Author: Andrus Adamchik <[email protected]> AuthorDate: Fri May 15 17:38:01 2026 -0400 tests cleanup - proper package --- .../apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java | 2 +- .../org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java | 2 +- .../cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java | 2 +- .../org/apache/cayenne/access/DataContextQualifiedEntityIT.java | 2 +- .../access/DataContextRelationshipQuery_PolymorphicIT.java | 2 +- .../java/org/apache/cayenne/access/SingleTableInheritanceIT.java | 2 +- .../apache/cayenne/ashwood/AshwoodEntitySorter_InheritanceIT.java | 2 +- .../java/org/apache/cayenne/map/EntityResolverInheritanceIT.java | 2 +- .../query/FluentSelectPrefetchRouterActionQualifiedEntityIT.java | 2 +- .../org/apache/cayenne/unit/{runtime => }/PeopleProjectCase.java | 8 ++++---- .../org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java index f2ded4131..7d1401e4f 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java @@ -31,7 +31,7 @@ import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.testdo.inheritance_people.Address; import org.apache.cayenne.testdo.inheritance_people.Department; import org.apache.cayenne.testdo.inheritance_people.Manager; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java index c8e2ea31a..e28d482e3 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java @@ -29,7 +29,7 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.inheritance_people.CustomerRepresentative; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.Manager; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java index 97f3616c7..cb98bb546 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectIdQuery_PolymorphicIT.java @@ -26,7 +26,7 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.inheritance_people.AbstractPerson; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.Manager; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java index 9885516f1..49c22ae1f 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java @@ -29,7 +29,7 @@ import org.apache.cayenne.testdo.inheritance_people.AbstractPerson; import org.apache.cayenne.testdo.inheritance_people.CustomerRepresentative; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.Manager; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQuery_PolymorphicIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQuery_PolymorphicIT.java index 1ec2f1e4b..0897a4684 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQuery_PolymorphicIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQuery_PolymorphicIT.java @@ -22,7 +22,7 @@ package org.apache.cayenne.access; import org.apache.cayenne.Cayenne; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.PersonNotes; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java index 14477cb97..b85b11697 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java @@ -32,7 +32,7 @@ import org.apache.cayenne.testdo.inheritance_people.Department; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.Manager; import org.apache.cayenne.testdo.inheritance_people.PersonNotes; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_InheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_InheritanceIT.java index 9d1fe31eb..6363432cc 100644 --- a/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_InheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_InheritanceIT.java @@ -21,7 +21,7 @@ package org.apache.cayenne.ashwood; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java index 34093ac30..8bf69793a 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; diff --git a/cayenne/src/test/java/org/apache/cayenne/query/FluentSelectPrefetchRouterActionQualifiedEntityIT.java b/cayenne/src/test/java/org/apache/cayenne/query/FluentSelectPrefetchRouterActionQualifiedEntityIT.java index 789ee3b08..3b2b7d2c8 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/FluentSelectPrefetchRouterActionQualifiedEntityIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/FluentSelectPrefetchRouterActionQualifiedEntityIT.java @@ -25,7 +25,7 @@ import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.testdo.inheritance_people.Department; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.Manager; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/PeopleProjectCase.java b/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java similarity index 94% rename from cayenne/src/test/java/org/apache/cayenne/unit/runtime/PeopleProjectCase.java rename to cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java index 9f062634b..70dc02632 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/PeopleProjectCase.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.unit.runtime; - -import java.sql.Types; +package org.apache.cayenne.unit; import org.apache.cayenne.test.jdbc.DbHelper; -import org.apache.cayenne.unit.CayenneTestsEnv; +import org.apache.cayenne.unit.runtime.CayenneProjects; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; +import java.sql.Types; + public class PeopleProjectCase { @RegisterExtension diff --git a/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java index 580c43c37..cb57efb12 100644 --- a/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java @@ -25,7 +25,7 @@ import org.apache.cayenne.query.ObjectSelect; import org.apache.cayenne.testdo.inheritance_people.Department; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.Manager; -import org.apache.cayenne.unit.runtime.PeopleProjectCase; +import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;
