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/07/13 18:12:59 UTC
svn commit: r1502812 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
./ configuration/web/ remote/ util/
Author: aadamchik
Date: Sat Jul 13 16:12:58 2013
New Revision: 1502812
URL: http://svn.apache.org/r1502812
Log:
replacing explicit mock with Mokito
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MockObjectContext.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/SyncMessageTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java?rev=1502812&r1=1502811&r2=1502812&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java Sat Jul 13 16:12:58 2013
@@ -19,6 +19,8 @@
package org.apache.cayenne;
+import static org.mockito.Mockito.mock;
+
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.graph.GraphEvent;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
@@ -42,10 +44,7 @@ public class CayenneContextMergeHandlerT
// 2. Another context initiated the sync:
// postedBy != context && source == channel
- GraphEvent e2 = new GraphEvent(
- context.getChannel(),
- new MockObjectContext(),
- null);
+ GraphEvent e2 = new GraphEvent(context.getChannel(), mock(ObjectContext.class), null);
assertTrue(handler.shouldProcessEvent(e2));
// 2.1 Another object initiated the sync:
@@ -59,10 +58,7 @@ public class CayenneContextMergeHandlerT
assertFalse(handler.shouldProcessEvent(e3));
// 4. inactive
- GraphEvent e4 = new GraphEvent(
- context.getChannel(),
- new MockObjectContext(),
- null);
+ GraphEvent e4 = new GraphEvent(context.getChannel(), mock(ObjectContext.class), null);
handler.active = false;
assertFalse(handler.shouldProcessEvent(e4));
}
@@ -75,35 +71,19 @@ public class CayenneContextMergeHandlerT
assertNull(o1.getGlobalAttribute1Direct());
- handler.nodePropertyChanged(
- o1.getObjectId(),
- ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY,
- null,
- "abc");
+ handler.nodePropertyChanged(o1.getObjectId(), ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, null, "abc");
assertEquals("abc", o1.getGlobalAttribute1Direct());
- handler.nodePropertyChanged(
- o1.getObjectId(),
- ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY,
- "abc",
- "xyz");
+ handler.nodePropertyChanged(o1.getObjectId(), ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, "abc", "xyz");
assertEquals("xyz", o1.getGlobalAttribute1Direct());
// block if old value is different
- handler.nodePropertyChanged(
- o1.getObjectId(),
- ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY,
- "123",
- "mnk");
+ handler.nodePropertyChanged(o1.getObjectId(), ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, "123", "mnk");
assertEquals("xyz", o1.getGlobalAttribute1Direct());
- handler.nodePropertyChanged(
- o1.getObjectId(),
- ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY,
- "xyz",
- null);
+ handler.nodePropertyChanged(o1.getObjectId(), ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, "xyz", null);
assertNull(o1.getGlobalAttribute1Direct());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectTest.java?rev=1502812&r1=1502811&r2=1502812&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistentObjectTest.java Sat Jul 13 16:12:58 2013
@@ -19,6 +19,8 @@
package org.apache.cayenne;
+import static org.mockito.Mockito.mock;
+
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -26,7 +28,7 @@ import org.apache.cayenne.unit.di.server
public class PersistentObjectTest extends ServerCase {
public void testObjectContext() {
- MockObjectContext context = new MockObjectContext();
+ ObjectContext context = mock(ObjectContext.class);
PersistentObject object = new MockPersistentObject();
assertNull(object.getObjectContext());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java?rev=1502812&r1=1502811&r2=1502812&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java Sat Jul 13 16:12:58 2013
@@ -18,12 +18,12 @@
****************************************************************/
package org.apache.cayenne.configuration.web;
+import static org.mockito.Mockito.mock;
import junit.framework.TestCase;
import org.apache.cayenne.BaseContext;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.MockDataChannel;
-import org.apache.cayenne.MockObjectContext;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.di.Binder;
@@ -48,11 +48,11 @@ public class ServletContextHandlerTest e
new ObjectContextFactory() {
public ObjectContext createContext(DataChannel parent) {
- return new MockObjectContext();
+ return mock(ObjectContext.class);
}
public ObjectContext createContext() {
- return new MockObjectContext();
+ return mock(ObjectContext.class);
}
});
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/SyncMessageTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/SyncMessageTest.java?rev=1502812&r1=1502811&r2=1502812&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/SyncMessageTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/SyncMessageTest.java Sat Jul 13 16:12:58 2013
@@ -19,22 +19,21 @@
package org.apache.cayenne.remote;
+import static org.mockito.Mockito.mock;
import junit.framework.TestCase;
import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.MockObjectContext;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.graph.CompoundDiff;
import org.apache.cayenne.graph.GraphDiff;
import org.apache.cayenne.graph.NodeCreateOperation;
import org.apache.cayenne.map.EntityResolver;
-import org.apache.cayenne.remote.SyncMessage;
import org.apache.cayenne.remote.hessian.service.HessianUtil;
public class SyncMessageTest extends TestCase {
public void testConstructor() {
- ObjectContext source = new MockObjectContext();
+ ObjectContext source = mock(ObjectContext.class);
GraphDiff diff = new CompoundDiff();
SyncMessage message = new SyncMessage(source, DataChannel.FLUSH_NOCASCADE_SYNC, diff);
@@ -45,7 +44,7 @@ public class SyncMessageTest extends Tes
public void testHessianSerialization() throws Exception {
// id must be a serializable object; source doesn't have to be
- ObjectContext source = new MockObjectContext();
+ ObjectContext source = mock(ObjectContext.class);
GraphDiff diff = new NodeCreateOperation("id-string");
SyncMessage message = new SyncMessage(source, DataChannel.FLUSH_NOCASCADE_SYNC, diff);
@@ -60,7 +59,7 @@ public class SyncMessageTest extends Tes
}
public void testConstructorInvalid() {
- ObjectContext source = new MockObjectContext();
+ ObjectContext source = mock(ObjectContext.class);
new SyncMessage(source, DataChannel.FLUSH_NOCASCADE_SYNC, new CompoundDiff());
new SyncMessage(source, DataChannel.FLUSH_CASCADE_SYNC, new CompoundDiff());
new SyncMessage(null, DataChannel.ROLLBACK_CASCADE_SYNC, new CompoundDiff());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java?rev=1502812&r1=1502811&r2=1502812&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java Sat Jul 13 16:12:58 2013
@@ -19,11 +19,11 @@
package org.apache.cayenne.util;
+import static org.mockito.Mockito.mock;
import junit.framework.TestCase;
-import org.apache.cayenne.MockObjectContext;
+import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
-import org.apache.cayenne.graph.GraphMap;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.ClientMtTable2;
@@ -31,14 +31,12 @@ public class PersistentObjectHolderTest
public void testSetInitialValue() {
- MockObjectContext context = new MockObjectContext(new GraphMap());
+ ObjectContext context = mock(ObjectContext.class);
ClientMtTable2 o = new ClientMtTable2();
o.setPersistenceState(PersistenceState.COMMITTED);
o.setObjectContext(context);
- PersistentObjectHolder holder = new PersistentObjectHolder(
- o,
- ClientMtTable2.TABLE1_PROPERTY);
+ PersistentObjectHolder holder = new PersistentObjectHolder(o, ClientMtTable2.TABLE1_PROPERTY);
assertTrue(holder.isFault());
ClientMtTable1 o1 = new ClientMtTable1();
@@ -50,14 +48,12 @@ public class PersistentObjectHolderTest
}
public void testInvalidate() {
- MockObjectContext context = new MockObjectContext(new GraphMap());
+ ObjectContext context = mock(ObjectContext.class);
ClientMtTable2 o = new ClientMtTable2();
o.setPersistenceState(PersistenceState.COMMITTED);
o.setObjectContext(context);
- PersistentObjectHolder holder = new PersistentObjectHolder(
- o,
- ClientMtTable2.TABLE1_PROPERTY);
+ PersistentObjectHolder holder = new PersistentObjectHolder(o, ClientMtTable2.TABLE1_PROPERTY);
assertTrue(holder.isFault());
ClientMtTable1 o1 = new ClientMtTable1();