This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 6bfad9e5a removing obsolete test mock dependency
new c241f8229 unifying CayenneTestsEnv tool
new 81d8dc5c6 Unit tests cleanup - no need to make a distinction between
ObjectContext and DataContext in the test Env
new 17ee5a32c Unit tests cleanup - no need to make a distinction between
ObjectContext and DataContext in the test Env
new cd85b57c6 Unwinding CayenneTestsEnv.getInstance() to specific getters
new dee9fab7f Unwinding CayenneTestsEnv.getInstance() to specific getters
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/cayenne/dbsync/merge/MergeCase.java | 10 +-
.../cayenne/dbsync/merge/MergerFactoryIT.java | 22 +-
.../cayenne/dbsync/merge/token/ValueForNullIT.java | 25 +-
.../merge/token/db/SetGeneratedFlagToDbIT.java | 2 +-
.../dbsync/reverse/dbload/BaseLoaderIT.java | 6 +-
.../cayenne/dbsync/reverse/dbload/DbLoaderIT.java | 6 +-
.../java/org/apache/cayenne/CDOOneToManyFKIT.java | 16 +-
.../java/org/apache/cayenne/CDOOneToOneFKIT.java | 2 +-
.../org/apache/cayenne/CDOQualifiedEntitiesIT.java | 2 +-
.../test/java/org/apache/cayenne/Cay2412IT.java | 2 +-
.../CayennePersistentObjectFlattenedRelIT.java | 26 +-
.../CayennePersistentObjectInContextIT.java | 2 +-
.../org/apache/cayenne/CircularDependencyIT.java | 2 +-
.../org/apache/cayenne/CompoundPkChangeIT.java | 28 +-
.../cayenne/DataContextMaxIdQualifierIT.java | 4 +-
.../apache/cayenne/FlattenedRelationshipsIT.java | 2 +-
.../java/org/apache/cayenne/GenericMappingIT.java | 28 +-
.../apache/cayenne/HybridPersistentObjectIT.java | 36 +--
.../java/org/apache/cayenne/PregeneratedPKIT.java | 2 +-
.../java/org/apache/cayenne/access/CAY2723IT.java | 4 +-
.../java/org/apache/cayenne/access/Cay2032IT.java | 6 +-
.../java/org/apache/cayenne/access/Cay2641IT.java | 2 +-
.../java/org/apache/cayenne/access/Cay2666IT.java | 6 +-
.../cayenne/access/DataContextArrayTypeIT.java | 2 +-
.../cayenne/access/DataContextBinaryPKIT.java | 8 +-
.../apache/cayenne/access/DataContextBlobIT.java | 6 +-
.../cayenne/access/DataContextCallbacksIT.java | 6 +-
.../apache/cayenne/access/DataContextCharPKIT.java | 6 +-
.../cayenne/access/DataContextCharTypeIT.java | 4 +-
.../apache/cayenne/access/DataContextClobIT.java | 6 +-
.../apache/cayenne/access/DataContextCommitIT.java | 6 +-
.../cayenne/access/DataContextCompoundRelIT.java | 2 +-
.../cayenne/access/DataContextCrossDBIT.java | 4 +-
.../access/DataContextDataChannelEventsIT.java | 2 +-
.../cayenne/access/DataContextDelegateIT.java | 2 +-
.../access/DataContextDelegateSharedCacheIT.java | 2 +-
.../cayenne/access/DataContextDeleteRulesIT.java | 4 +-
.../access/DataContextDisjointByIdPrefetchIT.java | 4 +-
.../DataContextDisjointByIdPrefetch_ExtrasIT.java | 4 +-
...ontextEJBQLDateTimeFunctionalExpressionsIT.java | 2 +-
.../access/DataContextEJBQLFetchJoinIT.java | 2 +-
.../DataContextEJBQLFunctionalExpressionsIT.java | 2 +-
.../cayenne/access/DataContextEJBQLIsNullIT.java | 2 +-
.../access/DataContextEJBQLQueryCompoundIT.java | 2 +-
.../cayenne/access/DataContextEJBQLQueryIT.java | 2 +-
.../cayenne/access/DataContextEJBQLSubqueryIT.java | 2 +-
...tyWithMeaningfulPKAndCustomDbRowOpSorterIT.java | 38 +--
.../DataContextEntityWithMeaningfulPKIT.java | 2 +-
.../apache/cayenne/access/DataContextExtrasIT.java | 6 +-
.../access/DataContextFlattenedAttributesIT.java | 2 +-
.../org/apache/cayenne/access/DataContextIT.java | 8 +-
.../cayenne/access/DataContextIteratedQueryIT.java | 2 +-
.../cayenne/access/DataContextLocalObjectIT.java | 4 +-
.../cayenne/access/DataContextObjectIdQueryIT.java | 24 +-
.../DataContextObjectIdQuery_PolymorphicIT.java | 4 +-
.../access/DataContextObjectTrackingIT.java | 4 +-
.../cayenne/access/DataContextOrderingIT.java | 34 +--
.../cayenne/access/DataContextOuterJoinsIT.java | 243 ++++++++-------
.../access/DataContextPaginatedQueryIT.java | 2 +-
.../access/DataContextPerformQueryAPIIT.java | 8 +-
.../cayenne/access/DataContextPrefetchIT.java | 4 +-
.../access/DataContextPrefetchMultistepIT.java | 2 +-
.../DataContextPrefetchQualifierOverlapIT.java | 6 +-
.../access/DataContextProcedureQueryIT.java | 64 ++--
.../cayenne/access/DataContextQueryCachingIT.java | 2 +-
.../cayenne/access/DataContextQueryChainIT.java | 6 +-
.../cayenne/access/DataContextRefreshQueryIT.java | 2 +-
.../cayenne/access/DataContextRefreshingIT.java | 4 +-
.../access/DataContextRelationshipQueryIT.java | 2 +-
...DataContextRelationshipQuery_PolymorphicIT.java | 4 +-
.../cayenne/access/DataContextRollbackIT.java | 64 ++--
.../access/DataContextSQLTemplateCompoundIT.java | 2 +-
.../cayenne/access/DataContextSQLTemplateIT.java | 4 +-
.../cayenne/access/DataContextSerializationIT.java | 4 +-
.../cayenne/access/DataContextSharedCacheIT.java | 4 +-
.../cayenne/access/DataContextValidationIT.java | 30 +-
.../cayenne/access/DataDomainCallbacksIT.java | 2 +-
.../org/apache/cayenne/access/DataDomainIT.java | 6 +-
.../cayenne/access/DataDomainQueryActionIT.java | 4 +-
.../java/org/apache/cayenne/access/DataNodeIT.java | 4 +-
.../apache/cayenne/access/DataNodeQueriesIT.java | 4 +-
.../cayenne/access/DataNodeQueryExceptionsIT.java | 6 +-
.../org/apache/cayenne/access/DataRowUtilsIT.java | 2 +-
.../org/apache/cayenne/access/DbGeneratorIT.java | 4 +-
.../org/apache/cayenne/access/DeleteObjectIT.java | 2 +-
.../org/apache/cayenne/access/DeleteRulesIT.java | 122 ++++----
.../apache/cayenne/access/EntityInheritanceIT.java | 24 +-
.../apache/cayenne/access/FlattenedPrefetchIT.java | 2 +-
.../access/FlattenedRelationshipInContextIT.java | 2 +-
.../apache/cayenne/access/IdentityColumnsIT.java | 4 +-
.../cayenne/access/IncrementalFaultListIT.java | 2 +-
.../org/apache/cayenne/access/JointPrefetchIT.java | 4 +-
.../org/apache/cayenne/access/MiscTypesIT.java | 2 +-
.../access/NestedDataContextLocalCacheIT.java | 10 +-
.../access/NestedDataContextParentEventsIT.java | 6 +-
.../NestedDataContextParentPeerEventsIT.java | 2 +-
.../access/NestedDataContextPeerEventsIT.java | 36 +--
.../cayenne/access/NestedDataContextReadIT.java | 4 +-
.../access/NestedDataContextRollbackIT.java | 20 +-
.../access/NestedDataContextValidationIT.java | 6 +-
.../cayenne/access/NestedDataContextWriteIT.java | 4 +-
.../access/NestedDataContext_DeadlockIT.java | 2 +-
.../org/apache/cayenne/access/NumericTypesIT.java | 2 +-
.../cayenne/access/ObjectStoreDiffRetainingIT.java | 2 +-
.../org/apache/cayenne/access/ObjectStoreGCIT.java | 6 +-
.../org/apache/cayenne/access/ObjectStoreIT.java | 40 +--
.../apache/cayenne/access/OptimisticLockingIT.java | 2 +-
.../access/PrefetchProcessorTreeBuilderIT.java | 4 +-
.../cayenne/access/PrimitiveAttributesIT.java | 6 +-
.../cayenne/access/ReturnTypesMappingIT.java | 326 ++++++++++-----------
.../SimpleIdIncrementalFaultListDataRowsIT.java | 2 +-
.../access/SimpleIdIncrementalFaultListIT.java | 2 +-
.../SimpleIdIncrementalFaultListPrefetchIT.java | 2 +-
.../cayenne/access/SingleTableInheritanceIT.java | 4 +-
.../org/apache/cayenne/access/ToManyListIT.java | 54 ++--
.../access/dbsync/SchemaUpdateStrategyBase.java | 4 +-
.../access/jdbc/BatchActionGeneratedIT.java | 2 +-
.../apache/cayenne/access/jdbc/BatchActionIT.java | 2 +-
.../cayenne/access/jdbc/BatchActionLockingIT.java | 5 +-
.../cayenne/access/jdbc/SQLTemplateActionIT.java | 37 ++-
.../apache/cayenne/access/jdbc/SelectActionIT.java | 14 +-
...SelectActionWithUnsupportedDistinctTypesIT.java | 2 +-
.../translator/batch/DeleteBatchTranslatorIT.java | 6 +-
.../translator/batch/InsertBatchTranslatorIT.java | 6 +-
.../batch/SoftDeleteBatchTranslatorIT.java | 8 +-
.../translator/batch/UpdateBatchTranslatorIT.java | 6 +-
.../batch/legacy/DefaultBatchTranslatorIT.java | 6 +-
.../translator/ejbql/EJBQLSelectTranslatorIT.java | 6 +-
.../select/DefaultObjectSelectTranslatorIT.java | 6 +-
.../select/DefaultSelectTranslatorIT.java | 130 ++++----
.../select/VerticalInheritanceJoinOrderIT.java | 4 +-
.../cayenne/access/types/DateTimeTypesIT.java | 7 +-
.../access/types/LegacyDateTimeTypesIT.java | 44 +--
.../runtime/JNDIDataSourceFactoryIT.java | 5 -
.../datasource/BasePoolingDataSourceIT.java | 4 +-
...PoolingDataSource_FailingValidationQueryIT.java | 6 +-
.../java/org/apache/cayenne/dba/AutoAdapterIT.java | 16 +-
.../cayenne/dba/ConcurrentPkGeneratorIT.java | 2 +-
.../java/org/apache/cayenne/dba/JdbcAdapterIT.java | 6 +-
.../org/apache/cayenne/dba/JdbcPkGeneratorIT.java | 6 +-
.../java/org/apache/cayenne/dba/PkGeneratorIT.java | 4 +-
.../org/apache/cayenne/dba/TypesMappingIT.java | 4 +-
.../apache/cayenne/dba/hsqldb/HSQLDBAdapterIT.java | 4 +-
.../apache/cayenne/dba/mysql/MySQLAdapterIT.java | 6 +-
.../cayenne/dba/oracle/Oracle8AdapterIT.java | 4 +-
.../apache/cayenne/dba/oracle/OracleAdapterIT.java | 2 +-
.../cayenne/dba/oracle/OraclePkGeneratorIT.java | 4 +-
.../cayenne/dba/postgres/PostgresAdapterIT.java | 2 +-
.../cayenne/dba/sqlserver/SQLServerAdapterIT.java | 2 +-
.../cayenne/dba/sqlserver/SQLServerSnifferIT.java | 6 +-
.../exp/AggregateExpInMemoryEvaluationIT.java | 2 +-
.../apache/cayenne/exp/ExpressionFactoryIT.java | 4 +-
.../java/org/apache/cayenne/exp/ExpressionIT.java | 6 +-
.../apache/cayenne/exp/TranslateExpressionIT.java | 2 +-
.../org/apache/cayenne/exp/parser/ASTExistsIT.java | 2 +-
.../apache/cayenne/exp/parser/ASTExtractIT.java | 2 +-
.../cayenne/exp/parser/ASTFunctionCallDateIT.java | 2 +-
.../exp/parser/ASTFunctionCallStringIT.java | 4 +-
.../apache/cayenne/exp/parser/ASTNotExistsIT.java | 2 +-
.../parser/ExpressionCollectionEvaluationIT.java | 2 +-
.../cayenne/exp/parser/ExpressionEvaluationIT.java | 2 +-
.../apache/cayenne/exp/property/IdPropertyIT.java | 2 +-
.../apache/cayenne/exp/property/PathAliasesIT.java | 2 +-
.../cayenne/map/EntityResolverGenericStackIT.java | 2 +-
.../org/apache/cayenne/map/EntityResolverIT.java | 2 +-
.../cayenne/map/EntityResolverInheritanceIT.java | 2 +-
.../java/org/apache/cayenne/query/CAY2541IT.java | 2 +-
.../org/apache/cayenne/query/ColumnSelectIT.java | 4 +-
.../org/apache/cayenne/query/EJBQLQueryIT.java | 4 +-
.../query/FluentSelectPrefetchRouterActionIT.java | 12 +-
...electPrefetchRouterActionQualifiedEntityIT.java | 2 +-
.../org/apache/cayenne/query/MappedQueryIT.java | 34 +--
.../cayenne/query/ObjectSelectIteratedQueryIT.java | 2 +-
.../cayenne/query/ObjectSelect_AggregateIT.java | 4 +-
.../cayenne/query/ObjectSelect_CacheKeyIT.java | 46 +--
.../query/ObjectSelect_PrimitiveColumnsIT.java | 4 +-
.../apache/cayenne/query/ObjectSelect_RunIT.java | 4 +-
.../cayenne/query/ObjectSelect_SubqueryIT.java | 2 +-
.../org/apache/cayenne/query/ProcedureCallIT.java | 40 +--
.../cayenne/query/QueryWithCompoundJoinIT.java | 2 +-
.../query/QueryWithInheritancePrefetchIT.java | 2 +-
.../java/org/apache/cayenne/query/SQLExecIT.java | 24 +-
.../java/org/apache/cayenne/query/SQLSelectIT.java | 2 +-
.../cayenne/query/SQLSelectIteratedQueryIT.java | 2 +-
.../cayenne/query/SQLTemplateCacheKeyIT.java | 14 +-
.../org/apache/cayenne/query/SQLTemplateIT.java | 6 +-
.../cayenne/query/SelectByIdIteratedQueryIT.java | 2 +-
.../org/apache/cayenne/query/SelectById_RunIT.java | 4 +-
.../apache/cayenne/query/SelectQueryClobIT.java | 10 +-
.../cayenne/query/SelectQueryReturnTypesIT.java | 8 +-
.../PersistentObjectDescriptorFactoryIT.java | 8 +-
...tObjectDescriptorFactory_InheritanceMapsIT.java | 4 +-
...ectDescriptorFactory_VerticalInheritanceIT.java | 2 +-
.../cayenne/runtime/CayenneRuntimeBuilderIT.java | 2 +-
.../template/directive/BindDirectiveIT.java | 2 +-
.../cayenne/tx/TransactionCustomConnectionIT.java | 4 +-
.../apache/cayenne/tx/TransactionIsolationIT.java | 4 +-
.../tx/TransactionPropagationRollbackIT.java | 4 +-
.../org/apache/cayenne/tx/TransactionThreadIT.java | 6 +-
.../org/apache/cayenne/tx/UserTransactionIT.java | 2 +-
.../cayenne/unit/di/runtime/CayenneTestsEnv.java | 154 +++++++---
.../cayenne/unit/di/runtime/PeopleProjectCase.java | 2 +-
.../di/runtime/RuntimeCaseDataContextProvider.java | 35 ---
.../di/runtime/RuntimeCaseDataNodeProvider.java | 38 ---
.../runtime/RuntimeCaseEntityResolverProvider.java | 36 ---
.../cayenne/unit/di/runtime/RuntimeCaseModule.java | 10 -
.../runtime/RuntimeCaseObjectContextProvider.java | 36 ---
...eakReferenceStrategyCayenneRuntimeProvider.java | 48 ---
.../WeakReferenceStrategyRuntimeCaseModule.java | 36 ---
.../di/runtime/WeakReferenceStrategyTestsEnv.java | 117 --------
.../org/apache/cayenne/unit/jira/CAY_115IT.java | 4 +-
.../org/apache/cayenne/unit/jira/CAY_191IT.java | 2 +-
.../org/apache/cayenne/unit/jira/CAY_194IT.java | 2 +-
.../apache/cayenne/util/DeepMergeOperationIT.java | 4 +-
.../util/DeepMergeOperationInheritanceIT.java | 4 +-
.../cayenne/util/ShallowMergeOperationIT.java | 4 +-
.../org/apache/cayenne/value/json/JsonTypeIT.java | 14 +-
217 files changed, 1269 insertions(+), 1615 deletions(-)
delete mode 100644
cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseDataContextProvider.java
delete mode 100644
cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseDataNodeProvider.java
delete mode 100644
cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseEntityResolverProvider.java
delete mode 100644
cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/RuntimeCaseObjectContextProvider.java
delete mode 100644
cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/WeakReferenceStrategyCayenneRuntimeProvider.java
delete mode 100644
cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/WeakReferenceStrategyRuntimeCaseModule.java
delete mode 100644
cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/WeakReferenceStrategyTestsEnv.java
