You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/05/26 22:32:10 UTC
svn commit: r1486469 [2/2] - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/
cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/
cayenne-jdk1.5-unpublished/src/test/java/org/apache/c...
Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilter_InRuntime_Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilter_InRuntime_Test.java?rev=1486469&r1=1486468&r2=1486469&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilter_InRuntime_Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilter_InRuntime_Test.java Sun May 26 20:32:09 2013
@@ -104,7 +104,7 @@ public class AuditableFilter_InRuntime_T
ChangeSetFilter changeSetFilter = new ChangeSetFilter();
domain.addFilter(changeSetFilter);
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
Auditable1 a2 = Cayenne.objectForPK(context, Auditable1.class, 2);
AuditableChild2 a21 = Cayenne.objectForPK(context, AuditableChild2.class, 1);
@@ -143,7 +143,7 @@ public class AuditableFilter_InRuntime_T
ChangeSetFilter changeSetFilter = new ChangeSetFilter();
domain.addFilter(changeSetFilter);
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
Auditable1 a2 = Cayenne.objectForPK(context, Auditable1.class, 2);
AuditableChild1 a21 = Cayenne.objectForPK(context, AuditableChild1.class, 1);
@@ -175,7 +175,7 @@ public class AuditableFilter_InRuntime_T
ChangeSetFilter changeSetFilter = new ChangeSetFilter();
domain.addFilter(changeSetFilter);
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
Auditable2 a1 = Cayenne.objectForPK(context, Auditable2.class, 1);
Auditable2 a2 = Cayenne.objectForPK(context, Auditable2.class, 2);
@@ -210,7 +210,7 @@ public class AuditableFilter_InRuntime_T
ChangeSetFilter changeSetFilter = new ChangeSetFilter();
domain.addFilter(changeSetFilter);
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
AuditableChild3 ac1 = Cayenne.objectForPK(context, AuditableChild3.class, 1);
@@ -240,7 +240,7 @@ public class AuditableFilter_InRuntime_T
ChangeSetFilter changeSetFilter = new ChangeSetFilter();
domain.addFilter(changeSetFilter);
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
AuditableChildUuid ac = Cayenne.objectForPK(context, AuditableChildUuid.class, 1);
Auditable1 a1 = Cayenne.objectForPK(context, Auditable1.class, 1);
IdCoder refHandler = new IdCoder(domain.getEntityResolver());
Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java?rev=1486469&r1=1486468&r2=1486469&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/id/StringIdQueryTest.java Sun May 26 20:32:09 2013
@@ -73,7 +73,7 @@ public class StringIdQueryTest extends T
e1Helper.insert(3).insert(4);
StringIdQuery query = new StringIdQuery("E1:3", "E1:4", "E1:5");
- QueryResponse response = runtime.getContext().performGenericQuery(query);
+ QueryResponse response = runtime.newContext().performGenericQuery(query);
assertEquals(1, response.size());
assertEquals(2, response.firstList().size());
@@ -97,7 +97,7 @@ public class StringIdQueryTest extends T
e2Helper.insert(5).insert(6).insert(7);
StringIdQuery query = new StringIdQuery("E1:3", "E1:4", "E2:6", "E1:5");
- QueryResponse response = runtime.getContext().performGenericQuery(query);
+ QueryResponse response = runtime.newContext().performGenericQuery(query);
assertEquals(2, response.size());
Set<String> ids = new HashSet<String>();
Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java?rev=1486469&r1=1486468&r2=1486469&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/relationship/ObjectIdRelationshipHandlerTest.java Sun May 26 20:32:09 2013
@@ -65,7 +65,7 @@ public class ObjectIdRelationshipHandler
e1Table.insert(1);
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
E1 e1 = (E1) Cayenne.objectForQuery(context, new SelectQuery(E1.class));
UuidRoot1 r1 = context.newObject(UuidRoot1.class);
@@ -86,7 +86,7 @@ public class ObjectIdRelationshipHandler
public void testRelate_New() throws Exception {
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
E1 e1 = context.newObject(E1.class);
UuidRoot1 r1 = context.newObject(UuidRoot1.class);
@@ -112,7 +112,7 @@ public class ObjectIdRelationshipHandler
e1Table.insert(1);
rootTable.insert(1, "E1:1");
- ObjectContext context = runtime.getContext();
+ ObjectContext context = runtime.newContext();
UuidRoot1 r1 = Cayenne.objectForPK(context, UuidRoot1.class, 1);
assertEquals("E1:1", r1.getUuid());