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 2c19b9ce668ab3d7aa0fa94fb598fbb0aa5d3bbb Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 16 15:23:29 2026 -0400 tests cleanup --- ...CayenneCacheInvalidationModuleProviderTest.java | 2 +- .../apache/cayenne/gen/CgenModuleProviderTest.java | 2 +- .../commitlog/CommitLogModuleProviderTest.java | 2 +- .../cayenne/crypto/CryptoModuleProviderTest.java | 2 +- .../cayenne/dbsync/DbSyncModuleProviderTest.java | 2 +- .../jcache/CayenneJCacheModuleProviderTest.java | 2 +- .../ProjectCompatibilityModuleProviderTest.java | 2 +- .../cayenne/project/ProjectModuleProviderTest.java | 2 +- .../velocity/VelocityModuleProviderTest.java | 2 +- .../apache/cayenne/CayennePersistentObjectIT.java | 8 +- .../PeopleProjectCase.java => PeopleTestBase.java} | 6 +- .../access/DataContextEJBQLConditionsPeopleIT.java | 4 +- .../access/DataContextEJBQLInheritanceIT.java | 4 +- .../DataContextObjectIdQuery_PolymorphicIT.java | 4 +- .../access/DataContextQualifiedEntityIT.java | 4 +- ...DataContextRelationshipQuery_PolymorphicIT.java | 4 +- .../cayenne/access/DataContextValidationIT.java | 26 +++--- .../cayenne/access/SingleTableInheritanceIT.java | 4 +- .../ashwood/AshwoodEntitySorter_InheritanceIT.java | 4 +- .../runtime/CoreModuleProviderTest.java | 2 +- .../apache/cayenne/exp/parser/ASTObjPathTest.java | 8 +- .../{unit => }/jira/CAY_10062004_ExpTest.java | 2 +- .../apache/cayenne/{unit => }/jira/CAY_115IT.java | 2 +- .../apache/cayenne/{unit => }/jira/CAY_191IT.java | 2 +- .../apache/cayenne/{unit => }/jira/CAY_194IT.java | 2 +- .../cayenne/{unit => }/jira/CAY_207Manager1.java | 2 +- .../cayenne/{unit => }/jira/CAY_207Manager2.java | 2 +- .../cayenne/{unit => }/jira/CAY_207String1.java | 2 +- .../cayenne/{unit => }/jira/CAY_207String2.java | 2 +- .../{unit => }/jira/CAY_207StringType1.java | 2 +- .../{unit => }/jira/CAY_207StringType2.java | 2 +- .../cayenne/{unit => }/jira/CAY_743Test.java | 2 +- .../cayenne/map/EntityResolverInheritanceIT.java | 4 +- ...electPrefetchRouterActionQualifiedEntityIT.java | 4 +- .../org/apache/cayenne/query/OrderingTest.java | 96 +++++++++++----------- .../apache/cayenne/reflect/FieldAccessorTest.java | 8 +- .../cayenne/reflect/PersistentDescriptorTest.java | 8 +- .../org/apache/cayenne/testdo/testmap/Artist.java | 13 +-- .../org/apache/cayenne/unit/CayenneTestsEnv.java | 4 +- ...voredDbHelper.java => FlavorAwareDbHelper.java} | 4 +- .../unit/{util => }/ModuleProviderChecker.java | 2 +- .../{ => telemetry}/TelemetricDataNodeFactory.java | 2 +- .../unit/{ => telemetry}/TestTelemetry.java | 4 +- .../unit/util/{TstBean.java => TestObject.java} | 34 ++------ .../cayenne/unit/util/ValidationDelegate.java | 30 ------- .../util/DeepMergeOperationInheritanceIT.java | 4 +- 46 files changed, 142 insertions(+), 193 deletions(-) diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java index 72b78dc02..b49d35a4d 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.cache.invalidation; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class CayenneCacheInvalidationModuleProviderTest { diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java index ad81c14f9..9d874e110 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.gen; import org.apache.cayenne.tools.CayenneToolsModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class CgenModuleProviderTest { diff --git a/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java b/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java index b385cebb0..0784d46d4 100644 --- a/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java +++ b/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.commitlog; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class CommitLogModuleProviderTest { diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java index 0054b2440..735791bc8 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java @@ -19,7 +19,7 @@ package org.apache.cayenne.crypto; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class CryptoModuleProviderTest { diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java index be546334f..e4320b1e4 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java @@ -19,7 +19,7 @@ package org.apache.cayenne.dbsync; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class DbSyncModuleProviderTest { diff --git a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java index c8184f705..70ef1968b 100644 --- a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java +++ b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.jcache; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class CayenneJCacheModuleProviderTest { diff --git a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java index 5a42b5123..6867f2e57 100644 --- a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java +++ b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.project.compatibility; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class ProjectCompatibilityModuleProviderTest { diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java index 4d1aa742d..beb9f4268 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java @@ -19,7 +19,7 @@ package org.apache.cayenne.project; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class ProjectModuleProviderTest { diff --git a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java index a97133f30..c7982cfc3 100644 --- a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java +++ b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.velocity; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class VelocityModuleProviderTest { diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java index e4eccd0ed..30dcae561 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java @@ -26,7 +26,7 @@ import org.apache.cayenne.testdo.testmap.ArtistExhibit; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.CayenneTestsEnv; import org.apache.cayenne.unit.CayenneProjects; -import org.apache.cayenne.unit.util.TstBean; +import org.apache.cayenne.unit.util.TestObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -88,14 +88,14 @@ public class CayennePersistentObjectIT { @Test public void readNestedPropertyNonPersistentObjectPath() { GenericPersistentObject o1 = new GenericPersistentObject(); - TstBean o2 = new TstBean(); + TestObject o2 = new TestObject(); o2.setInteger(55); o1.writePropertyDirectly("o2", o2); assertSame(o2, o1.readNestedProperty("o2")); assertEquals(55, o1.readNestedProperty("o2.integer")); - assertEquals(TstBean.class, o1.readNestedProperty("o2.class")); - assertEquals(TstBean.class.getName(), o1.readNestedProperty("o2.class.name")); + assertEquals(TestObject.class, o1.readNestedProperty("o2.class")); + assertEquals(TestObject.class.getName(), o1.readNestedProperty("o2.class.name")); } @SuppressWarnings("unchecked") diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java b/cayenne/src/test/java/org/apache/cayenne/PeopleTestBase.java similarity index 90% rename from cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java rename to cayenne/src/test/java/org/apache/cayenne/PeopleTestBase.java index 7b75b9c6a..0004f4528 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/PeopleProjectCase.java +++ b/cayenne/src/test/java/org/apache/cayenne/PeopleTestBase.java @@ -16,14 +16,16 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.unit; +package org.apache.cayenne; +import org.apache.cayenne.unit.CayenneProjects; +import org.apache.cayenne.unit.CayenneTestsEnv; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; import java.sql.Types; -public class PeopleProjectCase { +public class PeopleTestBase { @RegisterExtension protected static final CayenneTestsEnv env = CayenneTestsEnv 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 7d1401e4f..6efa46812 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java @@ -27,15 +27,15 @@ import java.util.List; import java.util.Set; import org.apache.cayenne.ObjectContext; +import org.apache.cayenne.PeopleTestBase; 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.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class DataContextEJBQLConditionsPeopleIT extends PeopleProjectCase { +public class DataContextEJBQLConditionsPeopleIT extends PeopleTestBase { private ObjectContext context; 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 e38b5c2b2..38ac89d8c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java @@ -24,16 +24,16 @@ import java.sql.Types; import java.util.List; import org.apache.cayenne.ObjectContext; +import org.apache.cayenne.PeopleTestBase; import org.apache.cayenne.query.EJBQLQuery; 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.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class DataContextEJBQLInheritanceIT extends PeopleProjectCase { +public class DataContextEJBQLInheritanceIT extends PeopleTestBase { private ObjectContext context; 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 cca109524..294421d24 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 @@ -21,12 +21,12 @@ package org.apache.cayenne.access; import org.apache.cayenne.Cayenne; import org.apache.cayenne.ObjectId; +import org.apache.cayenne.PeopleTestBase; import org.apache.cayenne.query.ObjectIdQuery; 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.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ import java.sql.Types; import static org.junit.jupiter.api.Assertions.assertInstanceOf; -public class DataContextObjectIdQuery_PolymorphicIT extends PeopleProjectCase { +public class DataContextObjectIdQuery_PolymorphicIT extends PeopleTestBase { private DataContext context1; private DataContext context2; 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 095d8beff..247e2ea09 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java @@ -23,19 +23,19 @@ import java.sql.Types; import java.util.List; import org.apache.cayenne.ObjectContext; +import org.apache.cayenne.PeopleTestBase; import org.apache.cayenne.query.ObjectSelect; import org.apache.cayenne.test.jdbc.TableHelper; 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.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -public class DataContextQualifiedEntityIT extends PeopleProjectCase { +public class DataContextQualifiedEntityIT extends PeopleTestBase { protected ObjectContext context; 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 0897a4684..9aeed4f4c 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 @@ -20,15 +20,15 @@ package org.apache.cayenne.access; import org.apache.cayenne.Cayenne; +import org.apache.cayenne.PeopleTestBase; import org.apache.cayenne.testdo.inheritance_people.Employee; import org.apache.cayenne.testdo.inheritance_people.PersonNotes; -import org.apache.cayenne.unit.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertInstanceOf; -public class DataContextRelationshipQuery_PolymorphicIT extends PeopleProjectCase { +public class DataContextRelationshipQuery_PolymorphicIT extends PeopleTestBase { private DataContext context1; private DataContext context2; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java index 18396dc82..0c4fe5647 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java @@ -24,22 +24,20 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.CayenneProjects; import org.apache.cayenne.unit.CayenneTestsEnv; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.cayenne.unit.util.ValidationDelegate; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.extension.RegisterExtension; + +import java.util.function.Consumer; + +import static org.junit.jupiter.api.Assertions.*; -/** - */ public class DataContextValidationIT { @RegisterExtension static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT); @Test - public void validatingObjectsOnCommitProperty() throws Exception { + public void validatingObjectsOnCommitProperty() { env.context().setValidatingObjectsOnCommit(true); assertTrue(env.context().isValidatingObjectsOnCommit()); @@ -48,7 +46,7 @@ public class DataContextValidationIT { } @Test - public void validatingObjectsOnCommit() throws Exception { + public void validatingObjectsOnCommit() { // test that validation is called properly env.context().setValidatingObjectsOnCommit(true); @@ -65,11 +63,9 @@ public class DataContextValidationIT { } @Test - public void validationModifyingContext() throws Exception { - - ValidationDelegate delegate = (object, validationResult) -> { + public void validationModifyingContext() { - Artist a = (Artist) object; + Consumer<Artist> callback = a -> { Painting p = a.getObjectContext().newObject(Painting.class); p.setPaintingTitle("XXX"); p.setToArtist(a); @@ -77,13 +73,13 @@ public class DataContextValidationIT { env.context().setValidatingObjectsOnCommit(true); Artist a1 = env.context().newObject(Artist.class); - a1.setValidationDelegate(delegate); + a1.setValidationCallback(callback); a1.setArtistName("a1"); // add another artist to ensure that modifying context works when more than one // object is committed Artist a2 = env.context().newObject(Artist.class); - a2.setValidationDelegate(delegate); + a2.setValidationCallback(callback); a2.setArtistName("a2"); env.context().commitChanges(); 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 f75970f50..4e9776e53 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java @@ -20,6 +20,7 @@ package org.apache.cayenne.access; import org.apache.cayenne.Cayenne; +import org.apache.cayenne.PeopleTestBase; import org.apache.cayenne.query.ObjectSelect; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.query.SortOrder; @@ -32,7 +33,6 @@ 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.PeopleProjectCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.*; -public class SingleTableInheritanceIT extends PeopleProjectCase { +public class SingleTableInheritanceIT extends PeopleTestBase { private DataContext context; private DataContext context2; 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 6363432cc..e8164b391 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.PeopleProjectCase; +import org.apache.cayenne.PeopleTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertTrue; -public class AshwoodEntitySorter_InheritanceIT extends PeopleProjectCase { +public class AshwoodEntitySorter_InheritanceIT extends PeopleTestBase { protected ObjectContext context; diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/CoreModuleProviderTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/CoreModuleProviderTest.java index a0aceb090..3a0614050 100644 --- a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/CoreModuleProviderTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/CoreModuleProviderTest.java @@ -19,7 +19,7 @@ package org.apache.cayenne.configuration.runtime; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; +import org.apache.cayenne.unit.ModuleProviderChecker; import org.junit.jupiter.api.Test; public class CoreModuleProviderTest { diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java index 68bead2e3..c9b93a087 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java @@ -23,10 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; -import org.apache.cayenne.testdo.enum_test.Enum1; -import org.apache.cayenne.testdo.enum_test.EnumEntity; import org.apache.cayenne.testdo.testmap.Artist; -import org.apache.cayenne.unit.util.TstBean; +import org.apache.cayenne.unit.util.TestObject; import org.junit.jupiter.api.Test; public class ASTObjPathTest { @@ -70,11 +68,11 @@ public class ASTObjPathTest { public void evaluate_JavaBean() { ASTObjPath node = new ASTObjPath("property2"); - TstBean b1 = new TstBean(); + TestObject b1 = new TestObject(); b1.setProperty2(1); assertEquals(1, node.evaluate(b1)); - TstBean b2 = new TstBean(); + TestObject b2 = new TestObject(); b2.setProperty2(-3); assertEquals(-3, node.evaluate(b2)); } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_10062004_ExpTest.java similarity index 98% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_10062004_ExpTest.java index b7c59b843..5ad458281 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_10062004_ExpTest.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.exp.Expression; import org.apache.cayenne.exp.ExpressionFactory; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_115IT.java similarity index 99% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_115IT.java index 49859ead3..29abaf5e7 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_115IT.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.exp.Expression; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_191IT.java similarity index 98% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_191IT.java index d58e8c6ee..43347dfc9 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_191IT.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.Cayenne; import org.apache.cayenne.access.DataContext; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_194IT.java similarity index 99% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_194IT.java index ed0b0b49b..5c4d0da00 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_194IT.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.query.ObjectSelect; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207Manager1.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager1.java similarity index 97% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207Manager1.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager1.java index 7bab9497d..5508a5497 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207Manager1.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager1.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.testdo.inheritance_people.Manager; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207Manager2.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager2.java similarity index 97% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207Manager2.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager2.java index ae6e074b0..59894a7a0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207Manager2.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager2.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.testdo.inheritance_people.Manager; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207String1.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String1.java similarity index 97% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207String1.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String1.java index 297c7c33a..aff54eb3b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207String1.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String1.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; /** */ diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207String2.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String2.java similarity index 97% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207String2.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String2.java index c17a21ba7..83c4d6a49 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207String2.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String2.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; /** */ diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType1.java similarity index 98% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType1.java index 03295040c..1ecf6d53f 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType1.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.access.types.ExtendedType; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType2.java similarity index 98% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType2.java index 974f4e847..2d7f0e12b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType2.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.access.types.ExtendedType; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java similarity index 98% rename from cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java rename to cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java index c9b3313db..c3c96b3e8 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.unit.jira; +package org.apache.cayenne.jira; import org.apache.cayenne.access.DataDomain; import org.apache.cayenne.configuration.runtime.CoreModule; 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 8bf69793a..dea4eea19 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceIT.java @@ -24,11 +24,11 @@ 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.PeopleProjectCase; +import org.apache.cayenne.PeopleTestBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; -public class EntityResolverInheritanceIT extends PeopleProjectCase { +public class EntityResolverInheritanceIT extends PeopleTestBase { private EntityResolver resolver; 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 3b2b7d2c8..8a3af0f79 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/FluentSelectPrefetchRouterActionQualifiedEntityIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/FluentSelectPrefetchRouterActionQualifiedEntityIT.java @@ -25,14 +25,14 @@ 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.PeopleProjectCase; +import org.apache.cayenne.PeopleTestBase; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import org.junit.jupiter.api.BeforeEach; -public class FluentSelectPrefetchRouterActionQualifiedEntityIT extends PeopleProjectCase { +public class FluentSelectPrefetchRouterActionQualifiedEntityIT extends PeopleTestBase { private EntityResolver resolver; diff --git a/cayenne/src/test/java/org/apache/cayenne/query/OrderingTest.java b/cayenne/src/test/java/org/apache/cayenne/query/OrderingTest.java index f6f3fc9d0..175114fa1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/OrderingTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/OrderingTest.java @@ -22,7 +22,7 @@ package org.apache.cayenne.query; import org.apache.cayenne.exp.Expression; import org.apache.cayenne.exp.FunctionExpressionFactory; import org.apache.cayenne.testdo.testmap.Painting; -import org.apache.cayenne.unit.util.TstBean; +import org.apache.cayenne.unit.util.TestObject; import org.junit.jupiter.api.Test; import java.math.BigDecimal; @@ -158,9 +158,9 @@ public class OrderingTest { @Test public void compare4() { // compare on non-persistent property - TstBean t1 = new TstBean(1000); - TstBean t2 = new TstBean(2000); - TstBean t3 = new TstBean(2000); + TestObject t1 = new TestObject(1000); + TestObject t2 = new TestObject(2000); + TestObject t3 = new TestObject(2000); Ordering ordering = new Ordering("integer", SortOrder.ASCENDING); assertTrue(ordering.compare(t1, t2) < 0); @@ -170,11 +170,11 @@ public class OrderingTest { @Test public void orderList() { - List<TstBean> list = new ArrayList<>(3); + List<TestObject> list = new ArrayList<>(3); - list.add(new TstBean(5)); - list.add(new TstBean(2)); - list.add(new TstBean(3)); + list.add(new TestObject(5)); + list.add(new TestObject(2)); + list.add(new TestObject(3)); new Ordering("integer", SortOrder.ASCENDING).orderList(list); assertEquals(2, list.get(0).getInteger().intValue()); @@ -215,21 +215,21 @@ public class OrderingTest { @Test public void orderList_Static() { - List<TstBean> list = new ArrayList<>(6); + List<TestObject> list = new ArrayList<>(6); - list.add(new TstBean("c", 1)); - list.add(new TstBean("c", 30)); - list.add(new TstBean("a", 5)); - list.add(new TstBean("b", 1)); - list.add(new TstBean("b", 2)); - list.add(new TstBean("b", 5)); + list.add(new TestObject("c", 1)); + list.add(new TestObject("c", 30)); + list.add(new TestObject("a", 5)); + list.add(new TestObject("b", 1)); + list.add(new TestObject("b", 2)); + list.add(new TestObject("b", 5)); List<Ordering> orderings = asList( new Ordering("string", SortOrder.ASCENDING), new Ordering("integer", SortOrder.DESCENDING)); // clone list and then order - List<TstBean> orderedList = new ArrayList<>(list); + List<TestObject> orderedList = new ArrayList<>(list); Ordering.orderList(orderedList, orderings); assertEquals(list.get(2), orderedList.get(0)); @@ -242,14 +242,14 @@ public class OrderingTest { @Test public void orderedList() { - Collection<TstBean> set = new HashSet<>(6); + Collection<TestObject> set = new HashSet<>(6); - TstBean shouldBe0 = new TstBean("a", 0); - TstBean shouldBe1 = new TstBean("b", 0); - TstBean shouldBe2 = new TstBean("c", 0); - TstBean shouldBe3 = new TstBean("d", 0); - TstBean shouldBe4 = new TstBean("f", 0); - TstBean shouldBe5 = new TstBean("r", 0); + TestObject shouldBe0 = new TestObject("a", 0); + TestObject shouldBe1 = new TestObject("b", 0); + TestObject shouldBe2 = new TestObject("c", 0); + TestObject shouldBe3 = new TestObject("d", 0); + TestObject shouldBe4 = new TestObject("f", 0); + TestObject shouldBe5 = new TestObject("r", 0); set.add(shouldBe1); set.add(shouldBe0); @@ -258,7 +258,7 @@ public class OrderingTest { set.add(shouldBe2); set.add(shouldBe4); - List<TstBean> orderedList = new Ordering("string", SortOrder.ASCENDING).orderedList(set); + List<TestObject> orderedList = new Ordering("string", SortOrder.ASCENDING).orderedList(set); assertEquals(shouldBe0, orderedList.get(0)); assertEquals(shouldBe1, orderedList.get(1)); @@ -270,14 +270,14 @@ public class OrderingTest { @Test public void orderedList_Static() { - Collection<TstBean> set = new HashSet<>(6); + Collection<TestObject> set = new HashSet<>(6); - TstBean shouldBe0 = new TstBean("a", 5); - TstBean shouldBe1 = new TstBean("b", 5); - TstBean shouldBe2 = new TstBean("b", 2); - TstBean shouldBe3 = new TstBean("b", 1); - TstBean shouldBe4 = new TstBean("c", 30); - TstBean shouldBe5 = new TstBean("c", 1); + TestObject shouldBe0 = new TestObject("a", 5); + TestObject shouldBe1 = new TestObject("b", 5); + TestObject shouldBe2 = new TestObject("b", 2); + TestObject shouldBe3 = new TestObject("b", 1); + TestObject shouldBe4 = new TestObject("c", 30); + TestObject shouldBe5 = new TestObject("c", 1); set.add(shouldBe0); set.add(shouldBe5); @@ -290,7 +290,7 @@ public class OrderingTest { new Ordering("string", SortOrder.ASCENDING), new Ordering("integer", SortOrder.DESCENDING)); - List<TstBean> orderedList = Ordering.orderedList(set, orderings); + List<TestObject> orderedList = Ordering.orderedList(set, orderings); assertEquals(shouldBe0, orderedList.get(0)); assertEquals(shouldBe1, orderedList.get(1)); @@ -302,14 +302,14 @@ public class OrderingTest { @Test public void orderListWithFunction() { - Collection<TstBean> set = new HashSet<>(6); + Collection<TestObject> set = new HashSet<>(6); - TstBean shouldBe0 = new TstBean("", 0); - TstBean shouldBe1 = new TstBean("", -1); - TstBean shouldBe2 = new TstBean("", -2); - TstBean shouldBe3 = new TstBean("", 5); - TstBean shouldBe4 = new TstBean("", -6); - TstBean shouldBe5 = new TstBean("", -30); + TestObject shouldBe0 = new TestObject("", 0); + TestObject shouldBe1 = new TestObject("", -1); + TestObject shouldBe2 = new TestObject("", -2); + TestObject shouldBe3 = new TestObject("", 5); + TestObject shouldBe4 = new TestObject("", -6); + TestObject shouldBe5 = new TestObject("", -30); set.add(shouldBe4); set.add(shouldBe2); @@ -318,7 +318,7 @@ public class OrderingTest { set.add(shouldBe0); set.add(shouldBe3); - List<TstBean> orderedList = new Ordering(FunctionExpressionFactory.absExp("integer"), SortOrder.ASCENDING).orderedList(set); + List<TestObject> orderedList = new Ordering(FunctionExpressionFactory.absExp("integer"), SortOrder.ASCENDING).orderedList(set); assertEquals(shouldBe0, orderedList.get(0)); assertEquals(shouldBe1, orderedList.get(1)); @@ -330,14 +330,14 @@ public class OrderingTest { @Test public void orderListWithFunction_Static() { - Collection<TstBean> set = new HashSet<>(6); + Collection<TestObject> set = new HashSet<>(6); - TstBean shouldBe0 = new TstBean("cx", -2); - TstBean shouldBe1 = new TstBean("cf", -1); - TstBean shouldBe2 = new TstBean("basa", 2); - TstBean shouldBe3 = new TstBean("abcd", -1); - TstBean shouldBe4 = new TstBean("bdsasd", -2); - TstBean shouldBe5 = new TstBean("bdsadf", 1); + TestObject shouldBe0 = new TestObject("cx", -2); + TestObject shouldBe1 = new TestObject("cf", -1); + TestObject shouldBe2 = new TestObject("basa", 2); + TestObject shouldBe3 = new TestObject("abcd", -1); + TestObject shouldBe4 = new TestObject("bdsasd", -2); + TestObject shouldBe5 = new TestObject("bdsadf", 1); set.add(shouldBe4); set.add(shouldBe2); @@ -351,7 +351,7 @@ public class OrderingTest { new Ordering(FunctionExpressionFactory.absExp("integer"), SortOrder.DESCENDING) ); - List<TstBean> orderedList = Ordering.orderedList(set, orderings); + List<TestObject> orderedList = Ordering.orderedList(set, orderings); assertEquals(shouldBe0, orderedList.get(0)); assertEquals(shouldBe1, orderedList.get(1)); diff --git a/cayenne/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java b/cayenne/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java index e1b844410..97c706d2b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java @@ -19,7 +19,7 @@ package org.apache.cayenne.reflect; -import org.apache.cayenne.unit.util.TstBean; +import org.apache.cayenne.unit.util.TestObject; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,15 +29,15 @@ public class FieldAccessorTest { @Test public void constructor() { - FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class); + FieldAccessor accessor = new FieldAccessor(TestObject.class, "string", String.class); assertEquals("string", accessor.getName()); } @Test public void get() { - FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class); + FieldAccessor accessor = new FieldAccessor(TestObject.class, "string", String.class); - TstBean object = new TstBean(); + TestObject object = new TestObject(); object.setString("abc"); assertEquals("abc", accessor.getValue(object)); } diff --git a/cayenne/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java b/cayenne/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java index 17bdc0b48..c1679273d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.reflect; import org.apache.cayenne.map.ObjAttribute; -import org.apache.cayenne.unit.util.TstBean; +import org.apache.cayenne.unit.util.TestObject; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,17 +46,17 @@ public class PersistentDescriptorTest { PersistentDescriptor d1 = new PersistentDescriptor(); ObjAttribute attribute = mock(ObjAttribute.class); - FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", + FieldAccessor accessor = new FieldAccessor(TestObject.class, "string", String.class); PropertyDescriptor property = new SimpleAttributeProperty(d1, accessor, attribute); d1.addDeclaredProperty(property); - TstBean from = new TstBean(); + TestObject from = new TestObject(); from.setString("123"); - TstBean to = new TstBean(); + TestObject to = new TestObject(); d1.shallowMerge(from, to); assertEquals("123", to.getString()); diff --git a/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/Artist.java b/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/Artist.java index 8469ebb06..2b44d43d4 100644 --- a/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/Artist.java +++ b/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/Artist.java @@ -20,15 +20,16 @@ package org.apache.cayenne.testdo.testmap; import org.apache.cayenne.testdo.testmap.annotations.Tag1; import org.apache.cayenne.testdo.testmap.auto._Artist; -import org.apache.cayenne.unit.util.ValidationDelegate; import org.apache.cayenne.validation.ValidationResult; +import java.util.function.Consumer; + @Tag1 public class Artist extends _Artist { private static final long serialVersionUID = 1L; - protected transient ValidationDelegate validationDelegate; + protected transient Consumer<Artist> validationCallback; protected boolean validateForSaveCalled; protected boolean postAdded; protected boolean prePersisted; @@ -51,8 +52,8 @@ public class Artist extends _Artist { validateForSaveCalled = false; } - public void setValidationDelegate(ValidationDelegate validationDelegate) { - this.validationDelegate = validationDelegate; + public void setValidationCallback(Consumer<Artist> validationCallback) { + this.validationCallback = validationCallback; } public void resetCallbackFlags() { @@ -69,8 +70,8 @@ public class Artist extends _Artist { @Override public void validateForSave(ValidationResult validationResult) { validateForSaveCalled = true; - if (validationDelegate != null) { - validationDelegate.validateForSave(this, validationResult); + if (validationCallback != null) { + validationCallback.accept(this); } super.validateForSave(validationResult); } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java index 6203a0d30..c29755470 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java @@ -37,6 +37,8 @@ import org.apache.cayenne.test.jdbc.DbHelper; import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.unit.datasource.DataSourceConfigLoader; import org.apache.cayenne.unit.dba.TestDbAdapter; +import org.apache.cayenne.unit.telemetry.TelemetricDataNodeFactory; +import org.apache.cayenne.unit.telemetry.TestTelemetry; import org.apache.cayenne.unit.util.SQLTemplateCustomizer; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; @@ -118,7 +120,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { this.testDbAdapter = TestDbAdapter.of(firstAdapter); tweakProcedures(runtime, testDbAdapter); - this.dbHelper = new FlavoredDbHelper( + this.dbHelper = new FlavorAwareDbHelper( COMMON_SCHEMA.dataSource(), firstAdapter.getQuotingStrategy(), context.getEntityResolver().getDataMaps().iterator().next()); diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/FlavoredDbHelper.java b/cayenne/src/test/java/org/apache/cayenne/unit/FlavorAwareDbHelper.java similarity index 91% rename from cayenne/src/test/java/org/apache/cayenne/unit/FlavoredDbHelper.java rename to cayenne/src/test/java/org/apache/cayenne/unit/FlavorAwareDbHelper.java index 405e13ee6..458ad2b2c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/FlavoredDbHelper.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/FlavorAwareDbHelper.java @@ -27,12 +27,12 @@ import javax.sql.DataSource; /** * A DbHelper that understands various supported DB flavors. */ -public class FlavoredDbHelper extends DbHelper { +class FlavorAwareDbHelper extends DbHelper { private final QuotingStrategy quotingStrategy; private final DataMap dataMap; - public FlavoredDbHelper(DataSource dataSource, QuotingStrategy quotingStrategy, DataMap dataMap) { + public FlavorAwareDbHelper(DataSource dataSource, QuotingStrategy quotingStrategy, DataMap dataMap) { super(dataSource); this.dataMap = dataMap; this.quotingStrategy = quotingStrategy; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java b/cayenne/src/test/java/org/apache/cayenne/unit/ModuleProviderChecker.java similarity index 98% rename from cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java rename to cayenne/src/test/java/org/apache/cayenne/unit/ModuleProviderChecker.java index 88e73ca67..3f6ba6024 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/util/ModuleProviderChecker.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/ModuleProviderChecker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cayenne.unit.util; +package org.apache.cayenne.unit; import org.apache.cayenne.di.spi.ModuleProvider; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/TelemetricDataNodeFactory.java b/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TelemetricDataNodeFactory.java similarity index 98% rename from cayenne/src/test/java/org/apache/cayenne/unit/TelemetricDataNodeFactory.java rename to cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TelemetricDataNodeFactory.java index 5ec032c94..579ae7a2b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/TelemetricDataNodeFactory.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TelemetricDataNodeFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.unit; +package org.apache.cayenne.unit.telemetry; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetry.java b/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TestTelemetry.java similarity index 96% rename from cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetry.java rename to cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TestTelemetry.java index 500e1705b..0b904ba2c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetry.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TestTelemetry.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.unit; +package org.apache.cayenne.unit.telemetry; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.runtime.CayenneRuntime; import java.util.Collection; -class TestTelemetry { +public class TestTelemetry { public static void runWithQueriesBlocked(CayenneRuntime runtime, Runnable task) { diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/util/TstBean.java b/cayenne/src/test/java/org/apache/cayenne/unit/util/TestObject.java similarity index 74% rename from cayenne/src/test/java/org/apache/cayenne/unit/util/TstBean.java rename to cayenne/src/test/java/org/apache/cayenne/unit/util/TestObject.java index da4d07687..55d2a113d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/util/TstBean.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/util/TestObject.java @@ -18,15 +18,10 @@ ****************************************************************/ package org.apache.cayenne.unit.util; -import java.util.ArrayList; import java.util.Collection; import java.util.Date; -/** - * A non-persistent Java Bean. Useful for testing Cayenne operations that rely on - * introspection. - */ -public class TstBean { +public class TestObject { protected Integer integer; protected String string; @@ -34,32 +29,17 @@ public class TstBean { protected int property2; protected Date dateProperty; protected Collection<?> collection; - protected TstBean relatedBean; - - public static TstBean testFixtureWithCollection( - String rootBaseName, - String childBaseName) { - TstBean root = new TstBean(rootBaseName, 0); - - Collection<TstBean> collection = new ArrayList<TstBean>(10); - for (int i = 0; i < 10; i++) { - collection.add(new TstBean(childBaseName + i, i)); - } - - root.setCollection(collection); - return root; - } - - public TstBean() { + protected TestObject relatedBean; + public TestObject() { } - public TstBean(String string, int intValue) { + public TestObject(String string, int intValue) { this.string = string; this.integer = intValue; } - public TstBean(int intValue) { + public TestObject(int intValue) { integer = intValue; } @@ -111,11 +91,11 @@ public class TstBean { this.dateProperty = dateProperty; } - public TstBean getRelatedBean() { + public TestObject getRelatedBean() { return relatedBean; } - public void setRelatedBean(TstBean relatedBean) { + public void setRelatedBean(TestObject relatedBean) { this.relatedBean = relatedBean; } } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/util/ValidationDelegate.java b/cayenne/src/test/java/org/apache/cayenne/unit/util/ValidationDelegate.java deleted file mode 100644 index 29c3fc46e..000000000 --- a/cayenne/src/test/java/org/apache/cayenne/unit/util/ValidationDelegate.java +++ /dev/null @@ -1,30 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ****************************************************************/ -package org.apache.cayenne.unit.util; - -import org.apache.cayenne.validation.ValidationResult; - -/** - * A callback interface used by unit tests to implement custom validation logic. - * - */ -public interface ValidationDelegate { - - void validateForSave(Object object, ValidationResult validationResult); -} 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 cb57efb12..706aed325 100644 --- a/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java @@ -25,13 +25,13 @@ 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.PeopleProjectCase; +import org.apache.cayenne.PeopleTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -public class DeepMergeOperationInheritanceIT extends PeopleProjectCase { +public class DeepMergeOperationInheritanceIT extends PeopleTestBase { private DataContext context; private DataContext context1;
