Apply JUnit4 instead of JUnit3 in IT
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b62c9d01 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b62c9d01 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b62c9d01 Branch: refs/heads/master Commit: b62c9d018a1b98f47e25a683a7f1c9f748f4e098 Parents: e1ad29f Author: Savva Kolbechev <s.kolbac...@gmail.com> Authored: Tue Nov 4 13:42:27 2014 +0300 Committer: Savva Kolbechev <s.kolbac...@gmail.com> Committed: Tue Nov 4 13:42:28 2014 +0300 ---------------------------------------------------------------------- .../apache/cayenne/CayenneContextCayenneIT.java | 4 ++ .../CayenneContextClientChannelEventsIT.java | 12 +++++ .../cayenne/CayenneContextDeleteRulesIT.java | 5 ++ .../apache/cayenne/CayenneContextEJBQLIT.java | 4 ++ .../CayenneContextGraphDiffCompressorIT.java | 4 ++ .../org/apache/cayenne/CayenneContextIT.java | 12 ++++- .../cayenne/CayenneContextInheritanceIT.java | 7 ++- .../CayenneContextMapRelationshipIT.java | 5 +- .../cayenne/CayenneContextMergeHandlerIT.java | 5 +- .../CayenneContextNamedQueryCachingIT.java | 8 ++- .../CayenneContextPaginatedListCachingIT.java | 4 +- .../cayenne/CayenneContextPrimitiveIT.java | 5 +- .../cayenne/CayenneContextRefreshQueryIT.java | 2 + .../cayenne/CayenneContextRelationshipsIT.java | 5 ++ .../cayenne/CayenneContextSQLTemplateIT.java | 5 ++ .../cayenne/CayenneContextServerDiffsIT.java | 5 ++ .../cayenne/CayenneContextValidationIT.java | 4 ++ .../CayenneContextWithDataContextIT.java | 34 ++++++++++-- .../apache/cayenne/NestedCayenneContextIT.java | 47 ++++++++++++++-- .../cayenne/PersistentObjectInContextIT.java | 6 ++- .../cayenne/access/ClientServerChannelIT.java | 11 +++- .../access/ClientServerChannelQueryIT.java | 15 +++++- .../cayenne/map/ClientEntityResolverIT.java | 4 +- .../cayenne/query/ClientExpressionIT.java | 33 ++++++++---- .../query/ClientSelectQueryExpressionIT.java | 4 +- .../query/SelectQueryAbstractEntityIT.java | 12 +++-- .../remote/CayenneContextDeletionIT.java | 23 ++++++++ .../remote/ClientChannelServerDiffsIT.java | 4 ++ .../cayenne/remote/LightSuperClassIT.java | 35 ++++++++---- .../remote/NestedObjectContextLocalIT.java | 28 ++++++++-- .../NestedObjectContextParentEventsIT.java | 23 ++++++++ .../remote/NestedObjectContextPeerEventsIT.java | 26 +++++++++ .../remote/NestedObjectContextRollbackIT.java | 26 ++++++++- .../cayenne/remote/ROPPrefetchToManyMapIT.java | 27 +++++++++- .../cayenne/remote/RelationshipChangeIT.java | 26 ++++++++- .../cayenne/remote/RemoteCallbacksIT.java | 27 +++++++++- .../cayenne/remote/RemoteCayenneCase.java | 17 +----- .../remote/RemoteIncrementalFaultListIT.java | 14 +++++ .../apache/cayenne/remote/RemoteRollbackIT.java | 30 ++++++++++- .../apache/cayenne/remote/ValueInjectorIT.java | 24 +++++++++ .../di/client/ClientCaseLifecycleManager.java | 10 ++-- .../unit/di/client/ClientCaseSelfIT.java | 2 + .../cayenne/util/ObjectDetachOperationIT.java | 5 ++ .../util/ShallowMergeOperation_ClientIT.java | 4 ++ .../cayenne/CDOCollectionRelationshipIT.java | 6 +++ .../java/org/apache/cayenne/CDOMany2OneIT.java | 10 ++++ .../org/apache/cayenne/CDOMany2OneNoRevIT.java | 2 + .../apache/cayenne/CDOMapRelationshipIT.java | 8 +++ .../java/org/apache/cayenne/CDOOne2ManyIT.java | 8 +++ .../org/apache/cayenne/CDOOne2OneDepIT.java | 6 +++ .../org/apache/cayenne/CDOOneDep2OneIT.java | 4 ++ .../org/apache/cayenne/CDOOneToManyFKIT.java | 2 + .../org/apache/cayenne/CDOOneToOneFKIT.java | 8 +++ .../apache/cayenne/CDOQualifiedEntitiesIT.java | 3 ++ .../apache/cayenne/CDOReflexiveRelDeleteIT.java | 5 ++ .../org/apache/cayenne/CDOReflexiveRelIT.java | 7 +++ .../apache/cayenne/CDOSetRelationshipIT.java | 6 +++ .../CayenneDataObjectFlattenedRelIT.java | 9 ++++ .../org/apache/cayenne/CayenneDataObjectIT.java | 16 ++++-- .../cayenne/CayenneDataObjectInContextIT.java | 17 ++++++ .../CayenneDataObjectRelationshipsIT.java | 16 ++++++ .../cayenne/CayenneDataObjectValidationIT.java | 4 ++ .../test/java/org/apache/cayenne/CayenneIT.java | 26 ++++++++- .../org/apache/cayenne/CompoundPkChangeIT.java | 3 ++ .../cayenne/DataContextMaxIdQualifierIT.java | 10 +++- .../cayenne/DataObjectSerializationIT.java | 5 ++ .../cayenne/FlattenedRelationshipsIT.java | 8 +++ .../org/apache/cayenne/GenericMappingIT.java | 5 ++ .../org/apache/cayenne/ManyToManyNoJoinIT.java | 2 + .../java/org/apache/cayenne/MeaningfulFKIT.java | 3 ++ .../apache/cayenne/OneWayRelationshipsIT.java | 8 +++ .../cayenne/PersistenceByReachabilityIT.java | 7 +++ .../org/apache/cayenne/PersistentObjectIT.java | 4 ++ .../org/apache/cayenne/PregeneratedPKIT.java | 2 + .../cayenne/access/DataContextBinaryPKIT.java | 3 ++ .../cayenne/access/DataContextBlobIT.java | 9 +++- .../cayenne/access/DataContextCallbacksIT.java | 4 ++ .../cayenne/access/DataContextCharPKIT.java | 4 ++ .../cayenne/access/DataContextCharTypeIT.java | 4 +- .../cayenne/access/DataContextClobIT.java | 6 +++ .../cayenne/access/DataContextCommitIT.java | 2 + .../access/DataContextCompoundRelIT.java | 4 ++ .../cayenne/access/DataContextCrossDBIT.java | 2 + .../access/DataContextDataChannelEventsIT.java | 6 +++ .../access/DataContextDecoratedStackIT.java | 3 ++ .../cayenne/access/DataContextDelegateIT.java | 5 ++ .../DataContextDelegateSharedCacheIT.java | 5 ++ .../access/DataContextDeleteRulesIT.java | 8 +++ .../DataContextDisjointByIdPrefetchIT.java | 5 ++ ...ataContextDisjointByIdPrefetch_ExtrasIT.java | 7 +++ .../access/DataContextEJBQLArrayResultIT.java | 4 ++ .../access/DataContextEJBQLConditionsIT.java | 20 +++++++ .../DataContextEJBQLConditionsPeopleIT.java | 4 ++ .../access/DataContextEJBQLDeleteIT.java | 5 ++ .../access/DataContextEJBQLFetchJoinIT.java | 6 +++ ...ataContextEJBQLFlattenedRelationshipsIT.java | 11 ++++ .../DataContextEJBQLFunctionalExpressions.java | 26 +++++++-- .../access/DataContextEJBQLGroupByHavingIT.java | 12 +++++ .../access/DataContextEJBQLInheritanceIT.java | 2 + .../access/DataContextEJBQLIsNullIT.java | 8 +++ .../cayenne/access/DataContextEJBQLJoinsIT.java | 9 ++++ .../access/DataContextEJBQLOrderByIT.java | 7 +++ .../cayenne/access/DataContextEJBQLQueryIT.java | 28 ++++++++++ .../access/DataContextEJBQLSubqueryIT.java | 7 +++ .../access/DataContextEJBQLUpdateIT.java | 9 ++++ .../DataContextEntityWithMeaningfulPKIT.java | 6 +++ .../DataContextExtendedTypeOperationsIT.java | 4 ++ .../cayenne/access/DataContextExtrasIT.java | 20 +++++++ .../DataContextFlattenedAttributesIT.java | 13 +++++ .../apache/cayenne/access/DataContextIT.java | 37 +++++++++++++ .../access/DataContextJoinAliasesIT.java | 2 + .../access/DataContextLocalObjectIT.java | 7 +++ .../cayenne/access/DataContextNoPkIT.java | 3 ++ .../access/DataContextObjectIdQueryIT.java | 4 ++ .../access/DataContextObjectTrackingIT.java | 3 ++ .../cayenne/access/DataContextOrderingIT.java | 3 ++ .../cayenne/access/DataContextOuterJoinsIT.java | 5 ++ .../access/DataContextPaginatedQueryIT.java | 2 + .../access/DataContextPerformQueryAPIIT.java | 9 ++++ .../access/DataContextPrefetchExtras1IT.java | 2 + .../access/DataContextPrefetchExtrasIT.java | 4 ++ .../cayenne/access/DataContextPrefetchIT.java | 26 ++++++++- .../access/DataContextPrefetchMultistepIT.java | 11 +++- .../DataContextPrefetchQualifierOverlapIT.java | 4 ++ .../access/DataContextProcedureQueryIT.java | 12 +++++ .../access/DataContextQualifiedEntityIT.java | 3 ++ .../access/DataContextQueryCachingIT.java | 5 ++ .../cayenne/access/DataContextQueryChainIT.java | 2 + .../access/DataContextRefreshQueryIT.java | 13 ++++- .../cayenne/access/DataContextRefreshingIT.java | 15 ++++++ .../access/DataContextRelationshipQueryIT.java | 3 ++ .../cayenne/access/DataContextRollbackIT.java | 11 +++- .../access/DataContextSQLTemplateIT.java | 29 +++++++++- .../DataContextSelectQuerySplitAliasesIT.java | 3 ++ .../access/DataContextSerializationIT.java | 17 ++++-- .../access/DataContextSharedCacheEmpiricIT.java | 4 ++ .../access/DataContextSharedCacheIT.java | 29 +++++++--- .../cayenne/access/DataContextValidationIT.java | 4 ++ .../cayenne/access/DataDomainCallbacksIT.java | 15 +++++- .../cayenne/access/DataDomainFiltersIT.java | 5 ++ .../org/apache/cayenne/access/DataDomainIT.java | 15 ++++++ .../cayenne/access/DataDomainQueryActionIT.java | 2 + .../org/apache/cayenne/access/DataNodeIT.java | 6 +++ .../cayenne/access/DataNodeQueriesIT.java | 9 ++++ .../apache/cayenne/access/DataRowStoreIT.java | 13 +++-- .../apache/cayenne/access/DataRowUtilsIT.java | 4 ++ .../apache/cayenne/access/DateTimeTypesIT.java | 8 +++ .../apache/cayenne/access/DbGeneratorIT.java | 7 +++ .../org/apache/cayenne/access/DbLoaderIT.java | 5 ++ .../cayenne/access/DbLoaderPartialIT.java | 2 + .../apache/cayenne/access/DeleteObjectIT.java | 8 +++ .../apache/cayenne/access/DeleteRulesIT.java | 12 +++++ .../org/apache/cayenne/access/EmbeddingIT.java | 5 ++ .../java/org/apache/cayenne/access/EnumIT.java | 4 ++ .../cayenne/access/FlattenedArcKeyIT.java | 4 ++ .../cayenne/access/FlattenedPrefetchIT.java | 5 ++ .../FlattenedRelationshipInContextIT.java | 2 + .../cayenne/access/IdentityColumnsIT.java | 11 ++++ .../cayenne/access/IncrementalFaultListIT.java | 2 + .../apache/cayenne/access/JointPrefetchIT.java | 10 ++++ .../org/apache/cayenne/access/MiscTypesIT.java | 9 +++- .../access/NestedDataContextLocalCacheIT.java | 2 + .../access/NestedDataContextParentEventsIT.java | 2 + .../NestedDataContextParentPeerEventsIT.java | 4 ++ .../access/NestedDataContextPeerEventsIT.java | 5 ++ .../cayenne/access/NestedDataContextReadIT.java | 17 ++++-- .../access/NestedDataContextRollbackIT.java | 3 ++ .../access/NestedDataContextValidationIT.java | 2 + .../access/NestedDataContextWriteIT.java | 12 +++++ .../access/NestedDataContext_DeadlockIT.java | 8 +-- .../apache/cayenne/access/NumericTypesIT.java | 20 +++++-- .../access/ObjectStoreDiffRetainingIT.java | 3 ++ .../apache/cayenne/access/ObjectStoreGCIT.java | 4 ++ .../apache/cayenne/access/ObjectStoreIT.java | 4 ++ .../cayenne/access/OptimisticLockingIT.java | 26 +++++++-- .../access/PrefetchProcessorTreeBuilderIT.java | 3 ++ .../cayenne/access/PrimitiveAttributesIT.java | 2 + .../cayenne/access/QuotedIdentifiersIT.java | 13 +++-- .../cayenne/access/ReturnTypesMappingIT.java | 50 ++++++++++++++++- .../SimpleIdIncrementalFaultListDataRowsIT.java | 13 +++-- .../access/SimpleIdIncrementalFaultListIT.java | 23 ++++++-- .../SimpleIdIncrementalFaultListPrefetchIT.java | 5 ++ .../access/SingleTableInheritance1IT.java | 3 ++ .../access/SingleTableInheritanceIT.java | 18 +++++++ .../org/apache/cayenne/access/ToManyListIT.java | 7 +++ .../cayenne/access/TransactionThreadIT.java | 6 ++- .../java/org/apache/cayenne/access/UUIDIT.java | 4 ++ .../cayenne/access/UserTransactionIT.java | 2 + .../cayenne/access/VerticalInheritanceIT.java | 11 ++++ .../access/dbsync/SchemaUpdateStrategyIT.java | 9 ++-- ...hrowOnPartialOrCreateSchemaStrategyTest.java | 14 +++-- .../ThrowOnPartialSchemaStrategyTest.java | 8 ++- .../cayenne/access/jdbc/BatchActionIT.java | 3 ++ .../access/jdbc/BatchActionLockingIT.java | 3 ++ .../access/jdbc/SQLTemplateActionIT.java | 10 ++++ .../cayenne/access/jdbc/SelectActionIT.java | 2 + .../batch/DefaultBatchTranslatorIT.java | 4 ++ .../batch/DeleteBatchTranslatorIT.java | 6 +++ .../batch/InsertBatchTranslatorIT.java | 4 ++ .../batch/SoftDeleteBatchTranslatorIT.java | 5 ++ .../batch/UpdateBatchTranslatorIT.java | 6 +++ .../ejbql/EJBQLSelectTranslatorIT.java | 24 +++++++++ .../translator/select/OrderingTranslatorIT.java | 7 +++ .../select/QualifierTranslatorIT.java | 7 +++ .../translator/select/QueryAssemblerIT.java | 4 ++ .../translator/select/SelectTranslatorIT.java | 22 ++++++++ .../access/util/DefaultOperationObserverIT.java | 3 ++ .../cayenne/ashwood/AshwoodEntitySorterIT.java | 2 + .../org/apache/cayenne/cache/QueryCacheIT.java | 4 +- .../server/JNDIDataSourceFactoryIT.java | 4 ++ .../ServerRuntimeBuilder_InAction_IT.java | 3 ++ .../org/apache/cayenne/conn/PoolManagerIT.java | 7 +++ .../org/apache/cayenne/dba/AutoAdapterIT.java | 3 ++ .../cayenne/dba/ConcurrentPkGeneratorIT.java | 2 + .../org/apache/cayenne/dba/JdbcAdapterIT.java | 3 ++ .../apache/cayenne/dba/JdbcPkGeneratorIT.java | 2 + .../org/apache/cayenne/dba/PkGeneratorIT.java | 2 + .../org/apache/cayenne/dba/TypesMappingIT.java | 5 ++ .../cayenne/dba/hsqldb/HSQLDBAdapterIT.java | 5 +- .../cayenne/dba/mysql/MySQLAdapterIT.java | 2 + .../cayenne/dba/oracle/Oracle8AdapterIT.java | 3 ++ .../cayenne/dba/oracle/OracleAdapterIT.java | 3 ++ .../cayenne/dba/oracle/OraclePkGeneratorIT.java | 4 ++ .../cayenne/dba/postgres/PostgresAdapterIT.java | 4 +- .../dba/sqlserver/SQLServerAdapterIT.java | 4 +- .../dba/sqlserver/SQLServerSnifferIT.java | 2 + .../ejbql/EJBQLCompiledExpressionIT.java | 6 +++ .../exp/ExpressionFactory_InContextIT.java | 28 ++++++++++ .../cayenne/exp/Expression_InContextIT.java | 3 ++ .../cayenne/exp/ParsedExpQualifierCompatIT.java | 24 +++++++++ .../parser/ExpressionEvaluateInMemoryIT.java | 56 ++++++++++++++++---- .../cayenne/map/ClientEntityResolverIT.java | 10 ++-- .../java/org/apache/cayenne/map/DbEntityIT.java | 17 ++++++ .../apache/cayenne/map/DbRelationshipIT.java | 5 ++ .../java/org/apache/cayenne/map/EntityIT.java | 17 ++++-- .../map/EntityResolverClassDescriptorIT.java | 4 ++ .../map/EntityResolverGenericStackIT.java | 2 + .../apache/cayenne/map/EntityResolverIT.java | 10 ++++ .../map/EntityResolverInheritanceIT.java | 5 ++ .../org/apache/cayenne/map/ObjEntityIT.java | 36 +++++++++++-- .../apache/cayenne/map/ObjRelationshipIT.java | 21 ++++++++ .../cayenne/merge/AddColumnToModelIT.java | 2 + .../cayenne/merge/CreateTableToModelIT.java | 2 + .../cayenne/merge/DropColumnToModelIT.java | 3 ++ .../merge/DropRelationshipToModelIT.java | 2 + .../cayenne/merge/DropTableToModelIT.java | 2 + .../apache/cayenne/merge/MergerFactoryIT.java | 7 +++ .../cayenne/merge/SetAllowNullToDbIT.java | 2 + .../apache/cayenne/merge/SetNotNullToDbIT.java | 6 ++- .../cayenne/merge/SetPrimaryKeyToDbIT.java | 6 ++- .../apache/cayenne/merge/ValueForNullIT.java | 2 + .../org/apache/cayenne/query/EJBQLQueryIT.java | 39 ++++++++++++-- .../cayenne/query/ProcedureQueryCacheKeyIT.java | 6 +++ .../org/apache/cayenne/query/QueryChainIT.java | 3 ++ .../org/apache/cayenne/query/SQLSelectIT.java | 20 ++++++- .../cayenne/query/SQLTemplateCacheKeyIT.java | 6 +++ .../org/apache/cayenne/query/SQLTemplateIT.java | 16 ++++-- .../org/apache/cayenne/query/SelectByIdIT.java | 12 +++-- .../cayenne/query/SelectQueryCacheKeyIT.java | 12 ++++- .../query/SelectQueryFetchLimitOrderingIT.java | 2 + .../org/apache/cayenne/query/SelectQueryIT.java | 51 +++++++++++++++++- .../SelectQueryPrefetchRouterActionIT.java | 4 ++ ...ryPrefetchRouterActionQualifiedEntityIT.java | 3 ++ .../cayenne/query/StatementFetchSizeIT.java | 2 + .../reflect/LifecycleCallbackRegistryIT.java | 3 ++ ...LifecycleCallbackRegistry_InheritanceIT.java | 2 + .../reflect/MixedPersistenceStrategyIT.java | 3 ++ .../generic/DataObjectDescriptorFactoryIT.java | 3 ++ ...jectDescriptorFactory_InheritanceMapsIT.java | 2 + .../cayenne/tx/DefaultTransactionManagerIT.java | 3 ++ .../java/org/apache/cayenne/unit/di/DICase.java | 16 +++--- .../apache/cayenne/unit/di/DICaseSelfIT.java | 2 + .../di/DefaultUnitTestLifecycleManager.java | 6 +-- .../unit/di/UnitTestLifecycleManager.java | 6 +-- .../di/server/ServerCaseLifecycleManager.java | 4 +- .../unit/di/server/ServerCaseSelfIT.java | 2 + .../org/apache/cayenne/unit/jira/CAY_115IT.java | 3 ++ .../org/apache/cayenne/unit/jira/CAY_191IT.java | 6 ++- .../org/apache/cayenne/unit/jira/CAY_194IT.java | 3 ++ .../cayenne/util/DeepMergeOperationIT.java | 3 ++ .../util/DeepMergeOperationInheritanceIT.java | 3 ++ .../cayenne/util/EntityMergeSupportIT.java | 8 +-- .../cayenne/util/ShallowMergeOperationIT.java | 4 ++ .../cayenne/velocity/BindDirectiveIT.java | 31 +++++++---- .../cayenne/velocity/ResultDirectiveIT.java | 17 +++--- .../tools/CayenneGeneratorIntegrationTest.java | 18 +++++-- 286 files changed, 2378 insertions(+), 247 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java index 31c9d97..43869eb 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java @@ -24,6 +24,9 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextCayenneIT extends ClientCase { @@ -40,6 +43,7 @@ public class CayenneContextCayenneIT extends ClientCase { dbHelper.deleteAll("MT_TABLE1"); } + @Test public void testObjectForPK() throws Exception { context.performGenericQuery(new SQLTemplate( http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java index c4af230..f1caca7 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java @@ -32,6 +32,9 @@ import org.apache.cayenne.testdo.mt.ClientMtTable5; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.client.ClientRuntimeProperty; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import static org.junit.Assert.*; /** * Tests peer context synchronization via ClientChannel events. @@ -78,6 +81,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { tMtJoin45.setColumns("TABLE4_ID", "TABLE5_ID"); } + @Test public void testSyncNewObject() throws Exception { CayenneContext c1 = (CayenneContext) runtime.newContext(); @@ -103,6 +107,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertFalse(c2.internalGraphManager().hasChanges()); } + @Test public void testSyncNewDeletedObject() throws Exception { CayenneContext c1 = (CayenneContext) runtime.newContext(); @@ -128,6 +133,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertFalse(c2.internalGraphManager().hasChanges()); } + @Test public void testSyncNewObjectIntoDirtyContext() throws Exception { CayenneContext c1 = (CayenneContext) runtime.newContext(); @@ -155,6 +161,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertTrue(c2.internalGraphManager().hasChanges()); } + @Test public void testSyncSimpleProperty() throws Exception { tMtTable1.insert(1, "g1", "s1"); @@ -185,6 +192,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertFalse(c2.internalGraphManager().hasChanges()); } + @Test public void testSyncToOneRelationship() throws Exception { tMtTable1.insert(1, "g1", "s1"); @@ -220,6 +228,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertFalse(c2.internalGraphManager().hasChanges()); } + @Test public void testSyncToManyRelationship() throws Exception { tMtTable1.insert(1, "g1", "s1"); tMtTable2.insert(1, 1, "g1"); @@ -253,6 +262,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertFalse(c2.internalGraphManager().hasChanges()); } + @Test public void testSyncToManyRelationship1() throws Exception { tMtTable1.insert(1, "g1", "s1"); tMtTable2.insert(1, 1, "g1"); @@ -286,6 +296,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertEquals(2, o2.getTable2Array().size()); } + @Test public void testSyncManyToManyRelationship() throws Exception { tMtTable4.insert(1); tMtTable5.insert(1); @@ -322,6 +333,7 @@ public class CayenneContextClientChannelEventsIT extends ClientCase { assertFalse(c2.internalGraphManager().hasChanges()); } + @Test public void testSyncManyToManyRelationship1() throws Exception { CayenneContext c1 = (CayenneContext) runtime.newContext(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java index f9af40f..1c581ab 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java @@ -26,6 +26,7 @@ import org.apache.cayenne.testdo.mt.ClientMtDeleteNullify; import org.apache.cayenne.testdo.mt.ClientMtDeleteRule; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextDeleteRulesIT extends ClientCase { @@ -33,6 +34,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase { @Inject private CayenneContext context; + @Test public void testNullifyToOne() { ClientMtDeleteNullify object = context.newObject(ClientMtDeleteNullify.class); @@ -52,6 +54,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase { context.commitChanges(); } + @Test public void testDenyToOne() { ClientMtDeleteDeny object = context.newObject(ClientMtDeleteDeny.class); @@ -72,6 +75,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase { context.commitChanges(); } + @Test public void testCascadeToOne() { ClientMtDeleteCascade object = context.newObject(ClientMtDeleteCascade.class); @@ -91,6 +95,7 @@ public class CayenneContextDeleteRulesIT extends ClientCase { context.commitChanges(); } + @Test public void testCascadeToOneNewObject() { ClientMtDeleteRule related = context.newObject(ClientMtDeleteRule.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java index f9805fa..dd83141 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java @@ -25,6 +25,7 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.List; @@ -53,6 +54,7 @@ public class CayenneContextEJBQLIT extends ClientCase { tMtTable1.insert(2, "g2", "s2"); } + @Test public void testEJBQLSelect() throws Exception { createTwoRecords(); @@ -62,6 +64,7 @@ public class CayenneContextEJBQLIT extends ClientCase { assertEquals(2, results.size()); } + @Test public void testEJBQLSelectScalar() throws Exception { createTwoRecords(); @@ -71,6 +74,7 @@ public class CayenneContextEJBQLIT extends ClientCase { assertEquals(Long.valueOf(2), results.get(0)); } + @Test public void testEJBQLSelectMixed() throws Exception { createTwoRecords(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java index 1469c8b..a3d67d8 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java @@ -26,6 +26,7 @@ import org.apache.cayenne.unit.di.DataChannelSyncStats; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextGraphDiffCompressorIT extends ClientCase { @@ -36,6 +37,7 @@ public class CayenneContextGraphDiffCompressorIT extends ClientCase { @Inject protected CayenneContext context; + @Test public void testMultipleSimpleProperties() { ClientMtTable1 o1 = context.newObject(ClientMtTable1.class); @@ -54,6 +56,7 @@ public class CayenneContextGraphDiffCompressorIT extends ClientCase { assertEquals(1, stats.nodesCreated); } + @Test public void testComplimentaryArcs() { ClientMtTable1 o1 = context.newObject(ClientMtTable1.class); @@ -75,6 +78,7 @@ public class CayenneContextGraphDiffCompressorIT extends ClientCase { assertEquals(0, stats.arcsDeleted); } + @Test public void testDelete() { ClientMtTable1 o1 = context.newObject(ClientMtTable1.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java index 588d56e..c005543 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java @@ -39,6 +39,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.GenericResponse; +import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -49,7 +50,7 @@ import java.util.List; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.when;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextIT extends ClientCase { @@ -57,6 +58,7 @@ public class CayenneContextIT extends ClientCase { @Inject private ObjectContext serverContext; + @Test public void testConstructor() { CayenneContext context = new CayenneContext(); @@ -70,6 +72,7 @@ public class CayenneContextIT extends ClientCase { assertSame(channel, context.getChannel()); } + @Test public void testChannel() { MockDataChannel channel = new MockDataChannel(); CayenneContext context = new CayenneContext(channel); @@ -77,6 +80,7 @@ public class CayenneContextIT extends ClientCase { assertSame(channel, context.getChannel()); } + @Test public void testCommitUnchanged() { MockDataChannel channel = new MockDataChannel(); @@ -87,6 +91,7 @@ public class CayenneContextIT extends ClientCase { assertTrue(channel.getRequestObjects().isEmpty()); } + @Test public void testCommitCommandExecuted() { MockDataChannel channel = new MockDataChannel(new MockGraphDiff()); @@ -111,6 +116,7 @@ public class CayenneContextIT extends ClientCase { assertTrue(mainMessage instanceof GraphDiff); } + @Test public void testCommitChangesNew() { final CompoundDiff diff = new CompoundDiff(); final Object newObjectId = new ObjectId("test", "key", "generated"); @@ -157,6 +163,7 @@ public class CayenneContextIT extends ClientCase { assertSame(object, context.graphManager.getNode(newObjectId)); } + @Test public void testNewObject() { CayenneContext context = new CayenneContext(new MockDataChannel()); @@ -182,6 +189,7 @@ public class CayenneContextIT extends ClientCase { assertTrue(object.getObjectId().isTemporary()); } + @Test public void testDeleteObject() { CayenneContext context = new CayenneContext(new MockDataChannel()); @@ -238,6 +246,7 @@ public class CayenneContextIT extends ClientCase { assertEquals(PersistenceState.DELETED, committed.getPersistenceState()); } + @Test public void testBeforePropertyReadShouldInflateHollow() { ObjectId gid = new ObjectId("MtTable1", "a", "b"); @@ -303,6 +312,7 @@ public class CayenneContextIT extends ClientCase { assertEquals(PersistenceState.COMMITTED, hollow.getPersistenceState()); } + @Test public void testBeforeHollowDeleteShouldChangeStateToCommited() { ObjectId gid = new ObjectId("MtTable1", "a", "b"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java index ec8c43a..b9fbb2b 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java @@ -27,9 +27,10 @@ import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.testdo.mt.ClientMtTable1Subclass1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Types; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextInheritanceIT extends ClientCase { @@ -59,6 +60,7 @@ public class CayenneContextInheritanceIT extends ClientCase { Types.VARCHAR); } + @Test public void testInsertSubclass() throws Exception { ClientMtTable1Subclass1 object = context.newObject(ClientMtTable1Subclass1.class); @@ -74,6 +76,7 @@ public class CayenneContextInheritanceIT extends ClientCase { assertEquals("suba1", tMtTable1.getString("SUBCLASS_ATTRIBUTE1")); } + @Test public void testPerformQueryInheritanceLeaf() throws Exception { tMtTable1.insert(1, "xxx", "yyy", null); @@ -87,6 +90,7 @@ public class CayenneContextInheritanceIT extends ClientCase { assertEquals("sa1", objects.get(0).getSubclass1Attribute1()); } + @Test public void testPerformQueryInheritanceSuper() throws Exception { tMtTable1.insert(1, "a", "yyy", null); @@ -116,6 +120,7 @@ public class CayenneContextInheritanceIT extends ClientCase { assertEquals(2, checkedFields); } + @Test public void testPerformQueryWithQualifierInheritanceSuper() throws Exception { tMtTable1.insert(1, "a", "XX", null); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java index 0ff92b1..e080def 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java @@ -28,8 +28,9 @@ import org.apache.cayenne.testdo.mt.ClientMtMapToManyTarget; import org.apache.cayenne.testdo.mt.MtMapToMany; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; -import java.util.Map; +import java.util.Map;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextMapRelationshipIT extends ClientCase { @@ -60,6 +61,7 @@ public class CayenneContextMapRelationshipIT extends ClientCase { tMtMapToManyTarget.insert(1, 1).insert(2, 1).insert(3, 1).insert(4, 2); } + @Test public void testReadToMany() throws Exception { createTwoMapToManysWithTargetsDataSet(); @@ -79,6 +81,7 @@ public class CayenneContextMapRelationshipIT extends ClientCase { assertNotNull(targets.get(new Integer(3))); } + @Test public void testAddToMany() throws Exception { createTwoMapToManysWithTargetsDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java index a5b4815..7fd1c0d 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java @@ -24,8 +24,9 @@ import org.apache.cayenne.graph.GraphEvent; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; -import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mock;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextMergeHandlerIT extends ClientCase { @@ -33,6 +34,7 @@ public class CayenneContextMergeHandlerIT extends ClientCase { @Inject protected CayenneContext context; + @Test public void testShouldProcessEvent() { CayenneContextMergeHandler handler = new CayenneContextMergeHandler(context); @@ -63,6 +65,7 @@ public class CayenneContextMergeHandlerIT extends ClientCase { assertFalse(handler.shouldProcessEvent(e4)); } + @Test public void testNodePropertyChanged() { ClientMtTable1 o1 = context.newObject(ClientMtTable1.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java index f286274..ade7590 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java @@ -27,9 +27,10 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.Collections; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextNamedQueryCachingIT extends ClientCase { @@ -60,6 +61,7 @@ public class CayenneContextNamedQueryCachingIT extends ClientCase { tMtTable1.insert(3, "g3", "s3"); } + @Test public void testLocalCache() throws Exception { createThreeMtTable1sDataSet(); @@ -83,6 +85,7 @@ public class CayenneContextNamedQueryCachingIT extends ClientCase { assertEquals(3, result3.size()); } + @Test public void testLocalCacheParameterized() throws Exception { createThreeMtTable1sDataSet(); @@ -121,7 +124,8 @@ public class CayenneContextNamedQueryCachingIT extends ClientCase { }); } - + + @Test public void testParameterizedMappedToEJBQLQueries() throws Exception { createThreeMtTable1sDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java index e59bcc9..3a90802 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java @@ -27,8 +27,9 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextPaginatedListCachingIT extends ClientCase { @@ -56,6 +57,7 @@ public class CayenneContextPaginatedListCachingIT extends ClientCase { } } + @Test public void testLocalCache() throws Exception { createSevenMtTable1sDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java index e3865d0..fd3b795 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java @@ -28,9 +28,10 @@ import org.apache.cayenne.testdo.mt.MtTablePrimitives; import org.apache.cayenne.unit.UnitDbAdapter; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.sql.Types; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextPrimitiveIT extends ClientCase { @@ -64,6 +65,7 @@ public class CayenneContextPrimitiveIT extends ClientCase { tMtTablePrimitives.insert(2, accessStackAdapter.supportsBoolean() ? false : 0, 5); } + @Test public void testSelectPrimitives() throws Exception { createTwoPrimitivesDataSet(); @@ -78,6 +80,7 @@ public class CayenneContextPrimitiveIT extends ClientCase { assertEquals(5, results.get(1).getIntColumn()); } + @Test public void testCommitChangesPrimitives() throws Exception { ClientMtTablePrimitives object = context.newObject(ClientMtTablePrimitives.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java index 2100320..908abe7 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java @@ -25,6 +25,7 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextRefreshQueryIT extends ClientCase { @@ -59,6 +60,7 @@ public class CayenneContextRefreshQueryIT extends ClientCase { tMtTable2.delete().where("TABLE2_ID", 1).execute(); } + @Test public void testRefreshToMany() throws Exception { createM1AndTwoM2sDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java index fbc9f20..458b58b 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java @@ -28,6 +28,9 @@ import org.apache.cayenne.testdo.mt.MtTable1; import org.apache.cayenne.testdo.mt.MtTable2; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextRelationshipsIT extends ClientCase { @@ -59,6 +62,7 @@ public class CayenneContextRelationshipsIT extends ClientCase { tMtTable2.setColumns("TABLE2_ID", "TABLE1_ID", "GLOBAL_ATTRIBUTE"); } + @Test public void testLostUncommittedToOneModifications_Client() throws Exception { tMtTable1.insert(1, "G1", "S1"); @@ -79,6 +83,7 @@ public class CayenneContextRelationshipsIT extends ClientCase { assertSame(r2, o.getTable1()); } + @Test public void testLostUncommittedToOneModifications_Server() throws Exception { tMtTable1.insert(1, "G1", "S1"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java index 1cd129b..555dbce 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java @@ -24,6 +24,10 @@ import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextSQLTemplateIT extends ClientCase { @@ -40,6 +44,7 @@ public class CayenneContextSQLTemplateIT extends ClientCase { dbHelper.deleteAll("MT_TABLE1"); } + @Test public void testObjectRoot() throws Exception { assertNull(Cayenne.objectForPK(context, ClientMtTable1.class, 1)); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java index 4faed91..a0cfaa2 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java @@ -28,6 +28,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable2; import org.apache.cayenne.testdo.mt.MtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextServerDiffsIT extends ClientCase { @@ -38,6 +39,7 @@ public class CayenneContextServerDiffsIT extends ClientCase { @Inject private CayenneContext context; + @Test public void testReturnDiffInPrePersist() { LifecycleCallbackRegistry callbackRegistry = clientServerChannel @@ -65,6 +67,7 @@ public class CayenneContextServerDiffsIT extends ClientCase { } } + @Test public void testReturnDiffInPreUpdate() { LifecycleCallbackRegistry callbackRegistry = clientServerChannel .getEntityResolver() @@ -96,6 +99,7 @@ public class CayenneContextServerDiffsIT extends ClientCase { } } + @Test public void testReturnDiffClientArcChanges() { LifecycleCallbackRegistry callbackRegistry = clientServerChannel @@ -123,6 +127,7 @@ public class CayenneContextServerDiffsIT extends ClientCase { } } + @Test public void testReturnDiffServerArcChanges() { LifecycleCallbackRegistry callbackRegistry = clientServerChannel http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java index f8e3c78..37ff005 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java @@ -26,6 +26,9 @@ import org.apache.cayenne.testdo.mt.ClientMtTable2; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.validation.ValidationException; +import org.junit.Test; + +import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextValidationIT extends ClientCase { @@ -42,6 +45,7 @@ public class CayenneContextValidationIT extends ClientCase { dbHelper.deleteAll("MT_TABLE1"); } + @Test public void testValidate() throws Exception { ClientMtTable1 o1 = context.newObject(ClientMtTable1.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java index a5cf087..ed19ebe 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java @@ -19,10 +19,6 @@ package org.apache.cayenne; -import java.sql.Types; -import java.util.Iterator; -import java.util.List; - import org.apache.cayenne.access.ClientServerChannel; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.di.Inject; @@ -46,6 +42,19 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import java.sql.Types; +import java.util.Iterator; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class CayenneContextWithDataContextIT extends ClientCase { @@ -103,6 +112,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { } } + @Test public void testLocalCacheStaysLocal() { DataContext serverContext = (DataContext) clientServerChannel.getParentChannel(); @@ -122,6 +132,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { assertEquals(0, serverContext.getQueryCache().size()); } + @Test public void testAddToList() throws Exception { ClientMtTable1 t1 = clientContext.newObject(ClientMtTable1.class); @@ -140,6 +151,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { assertSame(t3, t4.getTable1()); } + @Test public void testSetValueHolder() throws Exception { ClientMtTable1 t1 = clientContext.newObject(ClientMtTable1.class); @@ -150,6 +162,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { assertSame(t1, t2.getTable1()); } + @Test public void testPostAddCallback() throws Exception { LifecycleCallbackRegistry callbackRegistry = clientServerChannel @@ -198,6 +211,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { } } + @Test public void testPostAddOnObjectCallback() throws Exception { final DataContext serverContext = (DataContext) clientServerChannel.getParentChannel(); @@ -235,6 +249,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { } } + @Test public void testPreRemoveCallback() throws Exception { // an exception was triggered within POST_LOAD callback @@ -288,6 +303,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { } } + @Test public void testCAY830() throws Exception { // an exception was triggered within POST_LOAD callback @@ -341,6 +357,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { } } + @Test public void testRollbackChanges() throws Exception { ClientMtTable1 o = clientContext.newObject(ClientMtTable1.class); @@ -356,6 +373,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { assertTrue(clientContext.modifiedObjects().isEmpty()); } + @Test public void testCreateFault() throws Exception { tMtTable1.insert(1, "g1", "s1"); @@ -377,6 +395,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { assertEquals(PersistenceState.COMMITTED, o.getPersistenceState()); } + @Test public void testCreateBadFault() throws Exception { tMtTable1.insert(1, "g1", "s1"); @@ -397,6 +416,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { } } + @Test public void testMeaningfulPK() throws Exception { deleteAndCreateTwoMeaningfulPKsDataSet(); @@ -407,6 +427,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { assertEquals(2, results.size()); } + @Test public void testPrefetchingToOne() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -440,6 +461,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { }); } + @Test public void testPrefetchingToOneNull() throws Exception { tMtTable2.insert(15, null, "g3"); @@ -463,6 +485,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { }); } + @Test public void testPrefetchingToMany() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -497,6 +520,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { }); } + @Test public void testPerformPaginatedQuery() throws Exception { createEightMtTable1s(); @@ -507,6 +531,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { assertTrue(objects instanceof RemoteIncrementalFaultList); } + @Test public void testPrefetchingToManyEmpty() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -530,6 +555,7 @@ public class CayenneContextWithDataContextIT extends ClientCase { }); } + @Test public void testOIDQueryInterception() throws Exception { final ClientMtTable1 o = clientContext.newObject(ClientMtTable1.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java index 937f39c..7affd25 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java @@ -18,9 +18,6 @@ ****************************************************************/ package org.apache.cayenne; -import java.util.Iterator; -import java.util.List; - import org.apache.cayenne.configuration.rop.client.ClientRuntime; import org.apache.cayenne.di.Inject; import org.apache.cayenne.graph.GraphChangeHandler; @@ -28,22 +25,31 @@ import org.apache.cayenne.graph.GraphDiff; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.query.SortOrder; import org.apache.cayenne.remote.RemoteCayenneCase; +import org.apache.cayenne.remote.service.LocalConnection; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.testdo.mt.ClientMtTable2; import org.apache.cayenne.testdo.mt.ClientMtTooneDep; import org.apache.cayenne.testdo.mt.ClientMtTooneMaster; -import org.apache.cayenne.testdo.testmap.Artist; -import org.apache.cayenne.testdo.testmap.Painting; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; /** * Tests nested object contexts */ @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) +@RunWith(value=Parameterized.class) public class NestedCayenneContextIT extends RemoteCayenneCase { @Inject @@ -55,6 +61,19 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { @Inject private DataChannelInterceptor queryInterceptor; + @Parameters + public static Collection data() { + return Arrays.asList(new Object[][]{ + {LocalConnection.HESSIAN_SERIALIZATION}, + {LocalConnection.JAVA_SERIALIZATION}, + {LocalConnection.NO_SERIALIZATION}, + }); + } + + public NestedCayenneContextIT(int serializationPolicy) { + super.serializationPolicy = serializationPolicy; + } + @Override public void setUpAfterInjection() throws Exception { super.setUpAfterInjection(); @@ -63,6 +82,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { dbHelper.deleteAll("MT_TABLE1"); } + @Test public void testChannels() { ObjectContext child = runtime.newContext(clientContext); @@ -76,6 +96,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { assertSame(child, grandchild.getChannel()); } + @Test public void testSelect() throws Exception { ObjectContext child = runtime.newContext(clientContext); @@ -113,6 +134,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { } } + @Test public void testPrefetchingToOne() throws Exception { final ClientMtTable1 mt11 = clientContext.newObject(ClientMtTable1.class); clientContext.newObject(ClientMtTable1.class); @@ -151,6 +173,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { }); } + @Test public void testPrefetchingToMany() throws Exception { ClientMtTable1 mt11 = clientContext.newObject(ClientMtTable1.class); mt11.setGlobalAttribute1("1"); @@ -204,6 +227,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { }); } + @Test public void testDeleteNew() throws Exception { ObjectContext child = runtime.newContext(clientContext); @@ -228,6 +252,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { /** * A test case for CAY-698 bug. */ + @Test public void testNullifyToOne() throws Exception { ClientMtTable1 a = clientContext.newObject(ClientMtTable1.class); ClientMtTable2 b = clientContext.newObject(ClientMtTable2.class); @@ -304,6 +329,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { }); } + @Test public void testCommitChangesToParent() throws Exception { clientContext.newObject(ClientMtTable1.class); clientContext.newObject(ClientMtTable1.class); @@ -426,6 +452,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { }); } + @Test public void testCommitChangesToParentDeleted() throws Exception { clientContext.newObject(ClientMtTable1.class); clientContext.newObject(ClientMtTable1.class); @@ -468,6 +495,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { /* * was added for CAY-1636 */ + @Test public void testCAY1636() throws Exception { ClientMtTooneMaster A = clientContext.newObject(ClientMtTooneMaster.class); @@ -506,6 +534,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { } + @Test public void testCAY1636_2() throws Exception { ClientMtTooneMaster A = clientContext.newObject(ClientMtTooneMaster.class); @@ -552,6 +581,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { } + @Test public void testCommitChanges() throws Exception { clientContext.newObject(ClientMtTable1.class); clientContext.newObject(ClientMtTable1.class); @@ -623,6 +653,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { assertNotNull(parentHollow); } + @Test public void testAddRemove() throws Exception { ObjectContext child = runtime.newContext(clientContext); @@ -647,6 +678,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { } + @Test public void testChangeRel() throws Exception { ObjectContext child = runtime.newContext(clientContext); @@ -679,6 +711,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { assertEquals(0, parentA.getTable2Array().size()); } + @Test public void testCAY1183() throws Exception { ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class); clientContext.commitChanges(); @@ -701,6 +734,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { /** * CAY1714 */ + @Test public void testQueriesOnTemporaryObject() throws Exception { ObjectContext clientContext = runtime.newContext((DataChannel) this.clientContext); ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class); @@ -717,6 +751,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { assertNull(childMt2.getTable3()); } + @Test public void testCAY1194() throws Exception { ClientMtTable1 parentMt = clientContext.newObject(ClientMtTable1.class); ObjectContext child = runtime.newContext(clientContext); @@ -740,6 +775,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { assertEquals(parentMt.getTable2Array().get(0).getObjectContext(), clientContext); } + @Test public void testCommitChangesToParentOneToMany() throws Exception { ObjectContext child = runtime.newContext(clientContext); @@ -801,6 +837,7 @@ public class NestedCayenneContextIT extends RemoteCayenneCase { assertEquals(2, arcDiffs[0]); } + @Test public void testCommitChangesToParentOneToOne() throws Exception { ObjectContext child = runtime.newContext(clientContext); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java index f9775a4..da6cac9 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java @@ -30,8 +30,9 @@ import org.apache.cayenne.testdo.mt.MtTable2; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.PersistentObjectHolder; +import org.junit.Test; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class PersistentObjectInContextIT extends ClientCase { @@ -65,6 +66,7 @@ public class PersistentObjectInContextIT extends ClientCase { tMtTable2.insert(2, 1, "g2"); } + @Test public void testResolveToManyReverseResolved() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -89,6 +91,7 @@ public class PersistentObjectInContextIT extends ClientCase { } } + @Test public void testToOneRelationship() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -107,6 +110,7 @@ public class PersistentObjectInContextIT extends ClientCase { assertEquals("g1", mtTable1.getGlobalAttribute1()); } + @Test public void testResolveToOneReverseResolved() throws Exception { createTwoMtTable1sAnd2sDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java index f5cd8f1..140f6e2 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java @@ -48,8 +48,9 @@ import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.EqualsBuilder; +import org.junit.Test; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class ClientServerChannelIT extends ClientCase { @@ -101,6 +102,7 @@ public class ClientServerChannelIT extends ClientCase { tMtTable2.insert(2, 1, "g2"); } + @Test public void testGetEntityResolver() throws Exception { EntityResolver resolver = clientServerChannel.getEntityResolver(); assertNotNull(resolver); @@ -108,6 +110,7 @@ public class ClientServerChannelIT extends ClientCase { assertNotNull(resolver.getClientEntityResolver().getObjEntity(ClientMtTable1.class)); } + @Test public void testSynchronizeCommit() throws Exception { SelectQuery query = new SelectQuery(MtTable1.class); @@ -124,6 +127,7 @@ public class ClientServerChannelIT extends ClientCase { assertEquals(1, serverContext.performQuery(query).size()); } + @Test public void testPerformQueryObjectIDInjection() throws Exception { tMtTable1.insert(55, "g1", "s1"); @@ -145,6 +149,7 @@ public class ClientServerChannelIT extends ClientCase { assertEquals(new ObjectId("MtTable1", MtTable1.TABLE1_ID_PK_COLUMN, 55), clientObject.getObjectId()); } + @Test public void testPerformQueryValuePropagation() throws Exception { byte[] bytes = new byte[] { 1, 2, 3 }; @@ -170,6 +175,7 @@ public class ClientServerChannelIT extends ClientCase { assertTrue(new EqualsBuilder().append(clientObject.getBinaryColumn(), bytes).isEquals()); } + @Test public void testPerformQueryPropagationInheritance() throws Exception { tMtTable1.insert(65, "sub1", "xyz"); @@ -191,6 +197,7 @@ public class ClientServerChannelIT extends ClientCase { assertEquals("sub1", clientObject.getGlobalAttribute1()); } + @Test public void testOnQuery() { final boolean[] genericDone = new boolean[1]; @@ -209,6 +216,7 @@ public class ClientServerChannelIT extends ClientCase { assertTrue(genericDone[0]); } + @Test public void testOnQueryPrefetchingToMany() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -234,6 +242,7 @@ public class ClientServerChannelIT extends ClientCase { }); } + @Test public void testOnQueryPrefetchingToManyEmpty() throws Exception { createTwoMtTable1sAnd2sDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java index 3210bbe..d4da266 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java @@ -35,9 +35,10 @@ import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.PersistentObjectHolder; import org.apache.cayenne.util.PersistentObjectList; +import org.junit.Test; import java.util.Collections; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class ClientServerChannelQueryIT extends ClientCase { @@ -82,6 +83,7 @@ public class ClientServerChannelQueryIT extends ClientCase { tMtTable2.insert(2, 1, "g2"); } + @Test public void testPaginatedQueryServerCacheOverflow() throws Exception { createSevenMtTable1sDataSet(); @@ -104,6 +106,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertTrue(results.get(3) instanceof ClientMtTable1); } + @Test public void testParameterizedMappedToEJBQLQueries() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -113,7 +116,8 @@ public class ClientServerChannelQueryIT extends ClientCase { assertEquals(1, r1.size()); assertTrue(r1.get(0) instanceof ClientMtTable1); } - + + @Test public void testNamedQuery() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -124,6 +128,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertTrue(results.get(0) instanceof ClientMtTable1); } + @Test public void testSelectQueryEntityNameRoot() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -135,6 +140,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertTrue(results.get(0) instanceof ClientMtTable1); } + @Test public void testSelectQueryClientClassRoot() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -145,6 +151,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertTrue(results.get(0) instanceof ClientMtTable1); } + @Test public void testSelectQuerySimpleQualifier() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -157,6 +164,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertTrue(results.get(0) instanceof ClientMtTable1); } + @Test public void testSelectQueryToManyRelationshipQualifier() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -168,6 +176,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertTrue(results.get(0) instanceof ClientMtTable1); } + @Test public void testSelectQueryOrdering() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -195,6 +204,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertTrue(o3.getGlobalAttribute1().compareTo(o4.getGlobalAttribute1()) > 0); } + @Test public void testSelectQueryPrefetchToOne() throws Exception { createTwoMtTable1sAnd2sDataSet(); @@ -217,6 +227,7 @@ public class ClientServerChannelQueryIT extends ClientCase { assertNotNull(target); } + @Test public void testSelectQueryPrefetchToMany() throws Exception { createTwoMtTable1sAnd2sDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java index b2a9549..b0add33 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java @@ -22,13 +22,15 @@ import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.Collection; -import java.util.Collections; +import java.util.Collections;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class ClientEntityResolverIT extends ClientCase { + @Test public void testSerializabilityWithHessian() throws Exception { ObjEntity entity = new ObjEntity("test_entity"); entity.setClassName(Artist.class.getName()); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java index 643de29..2c2f006 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java @@ -31,11 +31,12 @@ import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.testdo.mt.ClientMtTable2; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class ClientExpressionIT extends ClientCase { @@ -68,7 +69,8 @@ public class ClientExpressionIT extends ClientCase { tMtTable2.insert(i + 10, i, "2_global" + (i + 10)); } } - + + @Test public void testPersistentValueInExpression() throws Exception { ClientMtTable1 t1 = context.newObject(ClientMtTable1.class); ClientMtTable1 t2 = context.newObject(ClientMtTable1.class); @@ -82,7 +84,8 @@ public class ClientExpressionIT extends ClientCase { assertEquals(t1.getObjectId(), ((ASTEqual)list.getOperand(0)).getOperand(1)); assertEquals(t2.getObjectId(), ((ASTEqual)list.getOperand(1)).getOperand(1)); } - + + @Test public void testListInASTList() throws Exception { ClientMtTable1 t1 = context.newObject(ClientMtTable1.class); ClientMtTable1 t2 = context.newObject(ClientMtTable1.class); @@ -109,7 +112,8 @@ public class ClientExpressionIT extends ClientCase { assertNotSame(t1.getObjectId(), values[0]); assertNotSame(t2.getObjectId(), values[1]); } - + + @Test public void testArrayInASTList() throws Exception { ClientMtTable1 t1 = context.newObject(ClientMtTable1.class); ClientMtTable1 t2 = context.newObject(ClientMtTable1.class); @@ -140,7 +144,8 @@ public class ClientExpressionIT extends ClientCase { assertNotSame(t1.getObjectId(), values[0]); assertNotSame(t2.getObjectId(), values[1]); } - + + @Test public void testExpressionFactoryMatch() throws Exception { createDataSet(); @@ -167,7 +172,8 @@ public class ClientExpressionIT extends ClientCase { assertNotNull(table2List); assertEquals(2, table2List.size()); } - + + @Test public void testExpressionFactoryMatchAll() throws Exception { createDataSet(); @@ -186,7 +192,8 @@ public class ClientExpressionIT extends ClientCase { assertEquals(1, table1List.size()); } - + + @Test public void testExpressionFactoryMatchAny() throws Exception { createDataSet(); @@ -203,7 +210,8 @@ public class ClientExpressionIT extends ClientCase { assertEquals(2, table2List.size()); } - + + @Test public void testExpressionFactoryIn() throws Exception { createDataSet(); @@ -228,7 +236,8 @@ public class ClientExpressionIT extends ClientCase { assertEquals(4, table2List.size()); } - + + @Test public void testExpressionFactoryBetween() throws Exception { createDataSet(); @@ -253,7 +262,8 @@ public class ClientExpressionIT extends ClientCase { assertEquals(6, table2List.size()); } - + + @Test public void testExpressionFactoryOperators() throws Exception { createDataSet(); @@ -291,7 +301,8 @@ public class ClientExpressionIT extends ClientCase { assertEquals(14, table2List.size()); } - + + @Test public void testExpressionWithParameters() throws Exception { createDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java index 2eabb35..a706de1 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java @@ -27,8 +27,9 @@ import org.apache.cayenne.test.jdbc.TableHelper; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class ClientSelectQueryExpressionIT extends ClientCase { @@ -56,6 +57,7 @@ public class ClientSelectQueryExpressionIT extends ClientCase { } } + @Test public void testDoubleSelectLikeExpression() throws Exception { createMtTable1DataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java index 66d3b94..72f505d 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java @@ -28,8 +28,9 @@ import org.apache.cayenne.testdo.mt.MtTable1Subclass2; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; -import java.util.List; +import java.util.List;import static org.junit.Assert.*; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) public class SelectQueryAbstractEntityIT extends ServerCase { @@ -61,7 +62,8 @@ public class SelectQueryAbstractEntityIT extends ServerCase { } } - + + @Test public void testSublclassEntitySelect() throws Exception{ createDataSet(); @@ -76,7 +78,8 @@ public class SelectQueryAbstractEntityIT extends ServerCase { assertNotNull(sub1List); assertNotNull(sub2List); } - + + @Test public void test1AbstractEntitySelect() throws Exception{ createDataSet(); @@ -91,7 +94,8 @@ public class SelectQueryAbstractEntityIT extends ServerCase { } } } - + + @Test public void test2AbstractEntitySelect() throws Exception{ createDataSet(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java index 08df05f..c153b79 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java @@ -18,13 +18,36 @@ ****************************************************************/ package org.apache.cayenne.remote; +import org.apache.cayenne.remote.service.LocalConnection; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.util.Arrays; +import java.util.Collection; @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) +@RunWith(value=Parameterized.class) public class CayenneContextDeletionIT extends RemoteCayenneCase { + @Parameters + public static Collection data() { + return Arrays.asList(new Object[][]{ + {LocalConnection.HESSIAN_SERIALIZATION}, + {LocalConnection.JAVA_SERIALIZATION}, + {LocalConnection.NO_SERIALIZATION}, + }); + } + + public CayenneContextDeletionIT(int serializationPolicy) { + super.serializationPolicy = serializationPolicy; + } + + @Test public void testDeletion() { ClientMtTable1 object = clientContext.newObject(ClientMtTable1.class); clientContext.commitChanges(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java index d3e9e52..2fa875b 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java @@ -33,6 +33,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable2; import org.apache.cayenne.testdo.mt.MtTable1; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; import java.util.ArrayList; import java.util.List; @@ -46,6 +47,7 @@ public class ClientChannelServerDiffsIT extends ClientCase { @Inject private ClientConnection connection; + @Test public void testReturnIdDiff() { final Object[] ids = new Object[2]; @@ -91,6 +93,7 @@ public class ClientChannelServerDiffsIT extends ClientCase { assertFalse(((ObjectId) ids[1]).isTemporary()); } + @Test public void testReturnDiffInPrePersist() { final List<GenericDiff> diffs = new ArrayList<GenericDiff>(); @@ -167,6 +170,7 @@ public class ClientChannelServerDiffsIT extends ClientCase { } } + @Test public void testReturnDiffClientArcChanges() { final NoopGraphChangeHandler diffReader = new NoopGraphChangeHandler(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b62c9d01/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java index a3ff1b5..8f4f6ca 100644 --- a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java +++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java @@ -22,16 +22,25 @@ import org.apache.cayenne.ObjectContext; import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.RefreshQuery; import org.apache.cayenne.query.SelectQuery; +import org.apache.cayenne.remote.service.LocalConnection; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.persistent.Continent; import org.apache.cayenne.testdo.persistent.Country; import org.apache.cayenne.unit.di.client.ClientCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.util.Arrays; +import java.util.Collection; /** * Test for entites that are implemented in same class on client and server */ @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) +@RunWith(value=Parameterized.class) public class LightSuperClassIT extends RemoteCayenneCase { @Inject @@ -39,6 +48,21 @@ public class LightSuperClassIT extends RemoteCayenneCase { private boolean server; + @Parameters + public static Collection data() { + return Arrays.asList(new Object[][]{ + {LocalConnection.HESSIAN_SERIALIZATION, true}, + {LocalConnection.JAVA_SERIALIZATION, true}, + {LocalConnection.NO_SERIALIZATION, true}, + {LocalConnection.NO_SERIALIZATION, false}, + }); + } + + public LightSuperClassIT(int serializationPolicy, boolean server) { + super.serializationPolicy = serializationPolicy; + this.server = server; + } + @Override public void setUpAfterInjection() throws Exception { super.setUpAfterInjection(); @@ -47,16 +71,6 @@ public class LightSuperClassIT extends RemoteCayenneCase { dbHelper.deleteAll("COUNTRY"); } - @Override - public void runBare() throws Throwable { - server = true; - super.runBare(); - server = false; - - // testing ROP with all serialization policies - runBareSimple(); - } - private ObjectContext createContext() { if (server) { return serverContext; @@ -66,6 +80,7 @@ public class LightSuperClassIT extends RemoteCayenneCase { } } + @Test public void testServer() throws Exception { ObjectContext context = createContext(); Continent continent = context.newObject(Continent.class);
