Merge Pull request #23 , commit f6640dd9033330cb863fb425160492f4873c8319
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/dd009c6d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/dd009c6d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/dd009c6d Branch: refs/heads/master Commit: dd009c6d9db3270ea6893783f1ec993043e1047b Parents: 5fdb080 fcb1d53 Author: aadamchik <[email protected]> Authored: Sun Nov 2 10:32:20 2014 +0300 Committer: aadamchik <[email protected]> Committed: Sun Nov 2 10:33:02 2014 +0300 ---------------------------------------------------------------------- .../apache/cayenne/CayenneContextCayenneIT.java | 55 ++ .../cayenne/CayenneContextCayenneTest.java | 55 -- .../CayenneContextClientChannelEventsIT.java | 345 ++++++++ .../CayenneContextClientChannelEventsTest.java | 345 -------- .../cayenne/CayenneContextDeleteRulesIT.java | 111 +++ .../cayenne/CayenneContextDeleteRulesTest.java | 111 --- .../apache/cayenne/CayenneContextEJBQLIT.java | 87 ++ .../apache/cayenne/CayenneContextEJBQLTest.java | 87 -- .../CayenneContextGraphDiffCompressorIT.java | 96 +++ .../CayenneContextGraphDiffCompressorTest.java | 96 --- .../org/apache/cayenne/CayenneContextIT.java | 351 ++++++++ .../cayenne/CayenneContextInheritanceIT.java | 151 ++++ .../cayenne/CayenneContextInheritanceTest.java | 151 ---- .../CayenneContextMapRelationshipIT.java | 112 +++ .../CayenneContextMapRelationshipTest.java | 112 --- .../cayenne/CayenneContextMergeHandlerIT.java | 90 ++ .../cayenne/CayenneContextMergeHandlerTest.java | 90 -- .../CayenneContextNamedQueryCachingIT.java | 133 +++ .../CayenneContextNamedQueryCachingTest.java | 133 --- .../CayenneContextPaginatedListCachingIT.java | 75 ++ .../CayenneContextPaginatedListCachingTest.java | 75 -- .../cayenne/CayenneContextPrimitiveIT.java | 100 +++ .../cayenne/CayenneContextPrimitiveTest.java | 100 --- .../cayenne/CayenneContextRefreshQueryIT.java | 76 ++ .../cayenne/CayenneContextRefreshQueryTest.java | 76 -- .../cayenne/CayenneContextRelationshipsIT.java | 100 +++ .../CayenneContextRelationshipsTest.java | 100 --- .../cayenne/CayenneContextSQLTemplateIT.java | 54 ++ .../cayenne/CayenneContextSQLTemplateTest.java | 54 -- .../cayenne/CayenneContextServerDiffsIT.java | 153 ++++ .../cayenne/CayenneContextServerDiffsTest.java | 153 ---- .../org/apache/cayenne/CayenneContextTest.java | 351 -------- .../cayenne/CayenneContextValidationIT.java | 89 ++ .../cayenne/CayenneContextValidationTest.java | 89 -- .../CayenneContextWithDataContextIT.java | 570 ++++++++++++ .../CayenneContextWithDataContextTest.java | 570 ------------ .../apache/cayenne/NestedCayenneContextIT.java | 864 +++++++++++++++++++ .../cayenne/NestedCayenneContextTest.java | 864 ------------------- .../cayenne/PersistentObjectInContextIT.java | 142 +++ .../cayenne/PersistentObjectInContextTest.java | 142 --- .../cayenne/access/ClientServerChannelIT.java | 260 ++++++ .../access/ClientServerChannelQueryIT.java | 239 +++++ .../access/ClientServerChannelQueryTest.java | 239 ----- .../cayenne/access/ClientServerChannelTest.java | 260 ------ .../cayenne/map/ClientEntityResolverIT.java | 62 ++ .../cayenne/map/ClientEntityResolverTest.java | 62 -- .../cayenne/query/ClientExpressionIT.java | 319 +++++++ .../cayenne/query/ClientExpressionTest.java | 319 ------- .../query/ClientSelectQueryExpressionIT.java | 71 ++ .../query/ClientSelectQueryExpressionTest.java | 71 -- .../remote/CayenneContextDeletionIT.java | 38 + .../remote/CayenneContextDeletionTest.java | 38 - .../remote/ClientChannelServerDiffsIT.java | 263 ++++++ .../remote/ClientChannelServerDiffsTest.java | 263 ------ .../cayenne/remote/LightSuperClassIT.java | 95 ++ .../cayenne/remote/LightSuperClassTest.java | 95 -- .../remote/NestedObjectContextLocalIT.java | 58 ++ .../remote/NestedObjectContextLocalTest.java | 58 -- .../NestedObjectContextParentEventsIT.java | 64 ++ .../NestedObjectContextParentEventsTest.java | 64 -- .../remote/NestedObjectContextPeerEventsIT.java | 149 ++++ .../NestedObjectContextPeerEventsTest.java | 149 ---- .../remote/NestedObjectContextRollbackIT.java | 71 ++ .../remote/NestedObjectContextRollbackTest.java | 71 -- .../cayenne/remote/ROPPrefetchToManyMapIT.java | 70 ++ .../remote/ROPPrefetchToManyMapTest.java | 70 -- .../cayenne/remote/RelationshipChangeIT.java | 60 ++ .../cayenne/remote/RelationshipChangeTest.java | 60 -- .../cayenne/remote/RemoteCallbacksIT.java | 118 +++ .../cayenne/remote/RemoteCallbacksTest.java | 118 --- .../remote/RemoteIncrementalFaultListIT.java | 266 ++++++ .../remote/RemoteIncrementalFaultListTest.java | 266 ------ .../apache/cayenne/remote/RemoteRollbackIT.java | 147 ++++ .../cayenne/remote/RemoteRollbackTest.java | 147 ---- .../apache/cayenne/remote/ValueInjectorIT.java | 73 ++ .../cayenne/remote/ValueInjectorTest.java | 73 -- .../unit/di/client/ClientCaseSelfIT.java | 46 + .../unit/di/client/ClientCaseSelfTest.java | 46 - .../cayenne/util/ObjectDetachOperationIT.java | 112 +++ .../cayenne/util/ObjectDetachOperationTest.java | 112 --- .../util/ShallowMergeOperation_ClientIT.java | 210 +++++ .../util/ShallowMergeOperation_ClientTest.java | 210 ----- 82 files changed, 6545 insertions(+), 6545 deletions(-) ----------------------------------------------------------------------
