Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java Sat Nov 16 21:33:13 2013 @@ -19,9 +19,6 @@ package org.apache.cayenne.graph; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; - import junit.framework.TestCase; public class NodeDiffTest extends TestCase { @@ -32,18 +29,6 @@ public class NodeDiffTest extends TestCa assertSame(id, diff.getNodeId()); } - public void testHessianSerialization() throws Exception { - - // id must be a serializable object... - String id = "abcd"; - NodeDiff diff = new MockNodeDiff(id); - - Object d = HessianUtil.cloneViaClientServerSerialization(diff, new EntityResolver()); - assertNotNull(d); - assertNotNull(((NodeDiff) d).getNodeId()); - assertEquals(id, ((NodeDiff) d).getNodeId()); - } - public void testCompareTo() { NodeDiff d1 = new MockNodeDiff("x", 1); NodeDiff d2 = new MockNodeDiff("y", 2);
Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java Sat Nov 16 21:33:13 2013 @@ -24,15 +24,13 @@ import java.util.Collections; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.testdo.mt.MtTable1; -import org.apache.cayenne.testdo.testmap.Artist; -import org.apache.cayenne.unit.di.client.ClientCase; +import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; -@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) -public class ClientEntityResolverTest extends ClientCase { +@UseServerRuntime(ServerCase.MULTI_TIER_PROJECT) +public class ClientEntityResolverTest extends ServerCase { @Inject private EntityResolver serverResolver; @@ -46,49 +44,14 @@ public class ClientEntityResolverTest ex try { assertNotNull(clientResolver.getObjEntity("MtTable1")); - } - catch (CayenneRuntimeException e) { - fail("'MtTable1' entity is not mapped. All entities: " - + clientResolver.getObjEntities()); + } catch (CayenneRuntimeException e) { + fail("'MtTable1' entity is not mapped. All entities: " + clientResolver.getObjEntities()); } assertNotNull(clientResolver.getObjEntity(ClientMtTable1.class)); assertNull(clientResolver.getObjEntity(MtTable1.class)); } - public void testSerializabilityWithHessian() throws Exception { - ObjEntity entity = new ObjEntity("test_entity"); - entity.setClassName(Artist.class.getName()); - - DataMap dataMap = new DataMap("test"); - dataMap.addObjEntity(entity); - Collection<DataMap> maps = Collections.singleton(dataMap); - EntityResolver resolver = new EntityResolver(maps); - - // 1. simple case - Object c1 = HessianUtil.cloneViaClientServerSerialization( - resolver, - new EntityResolver()); - - assertNotNull(c1); - assertTrue(c1 instanceof EntityResolver); - EntityResolver cr1 = (EntityResolver) c1; - - assertNotSame(resolver, cr1); - assertEquals(1, cr1.getObjEntities().size()); - assertNotNull(cr1.getObjEntity(entity.getName())); - - // 2. with descriptors resolved... - assertNotNull(resolver.getClassDescriptor(entity.getName())); - - EntityResolver cr2 = (EntityResolver) HessianUtil - .cloneViaClientServerSerialization(resolver, new EntityResolver()); - assertNotNull(cr2); - assertEquals(1, cr2.getObjEntities().size()); - assertNotNull(cr2.getObjEntity(entity.getName())); - assertNotNull(cr2.getClassDescriptor(entity.getName())); - } - public void testConstructor() { ObjEntity entity = new ObjEntity("test_entity"); entity.setClassName("java.lang.String"); @@ -113,8 +76,7 @@ public class ClientEntityResolverTest ex try { subEntity.getSuperEntity(); fail("hmm... superentity can't possibly be resolved at this point."); - } - catch (CayenneRuntimeException e) { + } catch (CayenneRuntimeException e) { // expected } @@ -124,7 +86,8 @@ public class ClientEntityResolverTest ex Collection<DataMap> maps = Collections.singleton(dataMap); new EntityResolver(maps); - // after registration with resolver super entity should resolve just fine + // after registration with resolver super entity should resolve just + // fine assertSame(superEntity, subEntity.getSuperEntity()); } } Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java Sat Nov 16 21:33:13 2013 @@ -21,7 +21,6 @@ package org.apache.cayenne.map; import junit.framework.TestCase; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.util.Util; public class ClientObjectRelationshipTest extends TestCase { @@ -43,22 +42,4 @@ public class ClientObjectRelationshipTes assertEquals(r3.isReadOnly(), r4.isReadOnly()); } - public void testSerializabilityViaHessian() throws Exception { - - ClientObjRelationship r1 = new ClientObjRelationship("r1", "rr1", true, true); - ClientObjRelationship r2 = (ClientObjRelationship) HessianUtil - .cloneViaClientServerSerialization(r1, new EntityResolver()); - assertEquals(r1.getName(), r2.getName()); - assertEquals(r1.getReverseRelationship(), r2.getReverseRelationship()); - assertEquals(r1.isToMany(), r2.isToMany()); - assertEquals(r1.isReadOnly(), r2.isReadOnly()); - - ClientObjRelationship r3 = new ClientObjRelationship("r3", null, false, false); - ClientObjRelationship r4 = (ClientObjRelationship) HessianUtil - .cloneViaClientServerSerialization(r3, new EntityResolver()); - assertEquals(r3.getName(), r4.getName()); - assertNull(r4.getReverseRelationship()); - assertEquals(r3.isToMany(), r4.isToMany()); - assertEquals(r3.isReadOnly(), r4.isReadOnly()); - } } Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DataMapTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DataMapTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DataMapTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DataMapTest.java Sat Nov 16 21:33:13 2013 @@ -33,7 +33,6 @@ import junit.framework.TestCase; import org.apache.cayenne.query.AbstractQuery; import org.apache.cayenne.query.MockAbstractQuery; import org.apache.cayenne.query.Query; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.util.NamedObjectFactory; import org.apache.cayenne.util.Util; import org.apache.cayenne.util.XMLEncoder; @@ -56,18 +55,6 @@ public class DataMapTest extends TestCas assertNotNull(d2.getObjEntity(oe1.getName())); } - public void testSerializabilityWithHessian() throws Exception { - DataMap m1 = new DataMap("abc"); - DataMap d1 = (DataMap) HessianUtil.cloneViaClientServerSerialization(m1, new EntityResolver()); - assertEquals(m1.getName(), d1.getName()); - - ObjEntity oe1 = new ObjEntity("oe1"); - m1.addObjEntity(oe1); - - DataMap d2 = (DataMap) Util.cloneViaSerialization(m1); - assertNotNull(d2.getObjEntity(oe1.getName())); - } - public void testInitWithProperties() { Map<String, Object> properties = new HashMap<String, Object>(); properties.put(DataMap.CLIENT_SUPPORTED_PROPERTY, "true"); Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DbEntityTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DbEntityTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DbEntityTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/DbEntityTest.java Sat Nov 16 21:33:13 2013 @@ -24,7 +24,6 @@ import java.util.Collection; import org.apache.cayenne.configuration.server.ServerRuntime; import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.Expression; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.Util; @@ -63,34 +62,6 @@ public class DbEntityTest extends Server assertTrue(d2.getGeneratedAttributes().contains(generated2)); } - public void testSerializabilityWithHessian() throws Exception { - DbEntity entity = new DbEntity("entity"); - - DbAttribute pk = new DbAttribute("pk"); - pk.setPrimaryKey(true); - entity.addAttribute(pk); - - DbAttribute generated = new DbAttribute("generated"); - generated.setGenerated(true); - entity.addAttribute(generated); - - DbEntity d2 = (DbEntity) HessianUtil.cloneViaClientServerSerialization(entity, new EntityResolver()); - - assertNotNull(d2.getPrimaryKeys()); - assertEquals(entity.getPrimaryKeys().size(), d2.getPrimaryKeys().size()); - - DbAttribute pk2 = d2.getAttribute(pk.getName()); - assertNotNull(pk2); - assertTrue(d2.getPrimaryKeys().contains(pk2)); - - assertNotNull(d2.getGeneratedAttributes()); - assertEquals(entity.getGeneratedAttributes().size(), d2.getGeneratedAttributes().size()); - - DbAttribute generated2 = d2.getAttribute(generated.getName()); - assertNotNull(generated2); - assertTrue(d2.getGeneratedAttributes().contains(generated2)); - } - public void testConstructor1() { DbEntity ent = new DbEntity(); assertNull(ent.getName()); @@ -130,7 +101,7 @@ public class DbEntityTest extends Server e3.setCatalog("c3"); assertEquals("e3", e3.getName()); assertEquals("c3.s3.e3", e3.getFullyQualifiedName()); - + DbEntity e4 = new DbEntity("e4"); e4.setCatalog("c4"); assertEquals("e4", e4.getName()); Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java Sat Nov 16 21:33:13 2013 @@ -31,11 +31,11 @@ import org.apache.cayenne.reflect.LazyCl import org.apache.cayenne.reflect.PropertyDescriptor; 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.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; -@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT) -public class EntityResolverClassDescriptorTest extends ClientCase { +@UseServerRuntime(ServerCase.MULTI_TIER_PROJECT) +public class EntityResolverClassDescriptorTest extends ServerCase { @Inject private ServerRuntime runtime; Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/map/EntityTest.java Sat Nov 16 21:33:13 2013 @@ -26,7 +26,6 @@ import org.apache.cayenne.configuration. import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.Expression; import org.apache.cayenne.exp.ExpressionFactory; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.CayenneMapEntry; @@ -67,40 +66,6 @@ public class EntityTest extends ServerCa assertSame(d2.getRelationship("xyz"), d2.getRelationshipMap().get("xyz")); } - public void testSerializabilityWithHessian() throws Exception { - Entity entity = new MockEntity("entity"); - - Entity d1 = (Entity) HessianUtil.cloneViaClientServerSerialization( - entity, - new EntityResolver()); - assertEquals(entity.getName(), d1.getName()); - - entity.addAttribute(new MockAttribute("abc")); - entity.addRelationship(new MockRelationship("xyz")); - Entity d2 = (Entity) HessianUtil.cloneViaClientServerSerialization( - entity, - new EntityResolver()); - assertNotNull(d2.getAttribute("abc")); - assertNotNull(d2.getRelationship("xyz")); - - // test that ref collection wrappers are still working - assertNotNull(d2.getAttributes()); - assertEquals(entity.getAttributes().size(), d2.getAttributes().size()); - assertTrue(d2.getAttributes().contains(d2.getAttribute("abc"))); - - assertNotNull(d2.getRelationships()); - assertEquals(entity.getRelationships().size(), d2.getRelationships().size()); - assertTrue(d2.getAttributes().contains(d2.getAttribute("abc"))); - - assertNotNull(d2.getAttributeMap()); - assertEquals(entity.getAttributes().size(), d2.getAttributeMap().size()); - assertSame(d2.getAttribute("abc"), d2.getAttributeMap().get("abc")); - - assertNotNull(d2.getRelationshipMap()); - assertEquals(entity.getRelationships().size(), d2.getRelationshipMap().size()); - assertSame(d2.getRelationship("xyz"), d2.getRelationshipMap().get("xyz")); - } - public void testName() { Entity entity = new MockEntity(); String tstName = "tst_name"; @@ -149,8 +114,7 @@ public class EntityTest extends ServerCa entity.addAttribute(attribute); fail("Exception should have been thrown due to clashing attribute and relationship names."); - } - catch (Exception e) { + } catch (Exception e) { // Exception expected. } } @@ -166,8 +130,7 @@ public class EntityTest extends ServerCa entity.addRelationship(rel); fail("Exception should have been thrown due to clashing attribute and relationship names."); - } - catch (Exception e) { + } catch (Exception e) { // Exception expected. } } @@ -179,16 +142,14 @@ public class EntityTest extends ServerCa // itertator should be returned, but when trying to read 1st component, // it should throw an exception.... - ObjEntity galleryEnt = runtime.getDataDomain().getEntityResolver().getObjEntity( - "Gallery"); + ObjEntity galleryEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Gallery"); Iterator<CayenneMapEntry> it = galleryEnt.resolvePathComponents(pathExpr); assertTrue(it.hasNext()); try { it.next(); fail(); - } - catch (Exception ex) { + } catch (Exception ex) { // exception expected } } @@ -197,14 +158,12 @@ public class EntityTest extends ServerCa // test invalid expression type Expression badPathExpr = ExpressionFactory.expressionOfType(Expression.IN); badPathExpr.setOperand(0, "a.b.c"); - ObjEntity galleryEnt = runtime.getDataDomain().getEntityResolver().getObjEntity( - "Gallery"); + ObjEntity galleryEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Gallery"); try { galleryEnt.resolvePathComponents(badPathExpr); fail(); - } - catch (Exception ex) { + } catch (Exception ex) { // exception expected } } @@ -213,8 +172,7 @@ public class EntityTest extends ServerCa Expression pathExpr = ExpressionFactory.expressionOfType(Expression.OBJ_PATH); pathExpr.setOperand(0, "galleryName"); - ObjEntity galleryEnt = runtime.getDataDomain().getEntityResolver().getObjEntity( - "Gallery"); + ObjEntity galleryEnt = runtime.getDataDomain().getEntityResolver().getObjEntity("Gallery"); Iterator<CayenneMapEntry> it = galleryEnt.resolvePathComponents(pathExpr); // iterator must contain a single ObjAttribute Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/NamedQueryTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/NamedQueryTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/NamedQueryTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/NamedQueryTest.java Sat Nov 16 21:33:13 2013 @@ -17,13 +17,10 @@ * under the License. ****************************************************************/ - package org.apache.cayenne.query; import junit.framework.TestCase; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.util.Util; public class NamedQueryTest extends TestCase { @@ -52,45 +49,18 @@ public class NamedQueryTest extends Test assertEquals(o.getName(), c1.getName()); } - public void testSerializabilityWithHessian() throws Exception { - NamedQuery o = new NamedQuery("abc"); - Object clone = HessianUtil.cloneViaClientServerSerialization(o, new EntityResolver()); - - assertTrue(clone instanceof NamedQuery); - NamedQuery c1 = (NamedQuery) clone; - - assertNotSame(o, c1); - assertEquals(o.getName(), c1.getName()); - } - /** - * Proper 'equals' and 'hashCode' implementations are important when mapping results - * obtained in a QueryChain back to the query. + * Proper 'equals' and 'hashCode' implementations are important when mapping + * results obtained in a QueryChain back to the query. */ public void testEquals() throws Exception { - NamedQuery q1 = new NamedQuery("abc", new String[] { - "a", "b" - }, new Object[] { - "1", "2" - }); - - NamedQuery q2 = new NamedQuery("abc", new String[] { - "a", "b" - }, new Object[] { - "1", "2" - }); - - NamedQuery q3 = new NamedQuery("abc", new String[] { - "a", "b" - }, new Object[] { - "1", "3" - }); - - NamedQuery q4 = new NamedQuery("123", new String[] { - "a", "b" - }, new Object[] { - "1", "2" - }); + NamedQuery q1 = new NamedQuery("abc", new String[] { "a", "b" }, new Object[] { "1", "2" }); + + NamedQuery q2 = new NamedQuery("abc", new String[] { "a", "b" }, new Object[] { "1", "2" }); + + NamedQuery q3 = new NamedQuery("abc", new String[] { "a", "b" }, new Object[] { "1", "3" }); + + NamedQuery q4 = new NamedQuery("123", new String[] { "a", "b" }, new Object[] { "1", "2" }); assertTrue(q1.equals(q2)); assertEquals(q1.hashCode(), q2.hashCode()); Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java Sat Nov 16 21:33:13 2013 @@ -22,8 +22,6 @@ package org.apache.cayenne.query; import junit.framework.TestCase; import org.apache.cayenne.ObjectId; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.util.Util; public class ObjectIdQueryTest extends TestCase { @@ -46,19 +44,9 @@ public class ObjectIdQueryTest extends T assertEquals(oid, ((ObjectIdQuery) o).getObjectId()); } - public void testSerializabilityWithHessian() throws Exception { - ObjectId oid = new ObjectId("test", "a", "b"); - ObjectIdQuery query = new ObjectIdQuery(oid); - - Object o = HessianUtil.cloneViaClientServerSerialization(query, new EntityResolver()); - assertNotNull(o); - assertTrue(o instanceof ObjectIdQuery); - assertEquals(oid, ((ObjectIdQuery) o).getObjectId()); - } - /** - * Proper 'equals' and 'hashCode' implementations are important when mapping results - * obtained in a QueryChain back to the query. + * Proper 'equals' and 'hashCode' implementations are important when mapping + * results obtained in a QueryChain back to the query. */ public void testEquals() throws Exception { ObjectIdQuery q1 = new ObjectIdQuery(new ObjectId("abc", "a", 1)); @@ -77,10 +65,7 @@ public class ObjectIdQueryTest extends T } public void testMetadata() { - ObjectIdQuery q1 = new ObjectIdQuery( - new ObjectId("abc", "a", 1), - true, - ObjectIdQuery.CACHE_REFRESH); + ObjectIdQuery q1 = new ObjectIdQuery(new ObjectId("abc", "a", 1), true, ObjectIdQuery.CACHE_REFRESH); assertTrue(q1.isFetchAllowed()); assertTrue(q1.isFetchMandatory()); @@ -88,10 +73,7 @@ public class ObjectIdQueryTest extends T QueryMetadata md1 = q1.getMetaData(null); assertTrue(md1.isFetchingDataRows()); - ObjectIdQuery q2 = new ObjectIdQuery( - new ObjectId("abc", "a", 1), - false, - ObjectIdQuery.CACHE); + ObjectIdQuery q2 = new ObjectIdQuery(new ObjectId("abc", "a", 1), false, ObjectIdQuery.CACHE); assertTrue(q2.isFetchAllowed()); assertFalse(q2.isFetchMandatory()); @@ -99,10 +81,7 @@ public class ObjectIdQueryTest extends T QueryMetadata md2 = q2.getMetaData(null); assertFalse(md2.isFetchingDataRows()); - ObjectIdQuery q3 = new ObjectIdQuery( - new ObjectId("abc", "a", 1), - false, - ObjectIdQuery.CACHE_NOREFRESH); + ObjectIdQuery q3 = new ObjectIdQuery(new ObjectId("abc", "a", 1), false, ObjectIdQuery.CACHE_NOREFRESH); assertFalse(q3.isFetchAllowed()); assertFalse(q3.isFetchMandatory()); Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java Sat Nov 16 21:33:13 2013 @@ -21,8 +21,6 @@ package org.apache.cayenne.query; import junit.framework.TestCase; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.util.Util; public class PrefetchTreeNodeTest extends TestCase { @@ -77,38 +75,7 @@ public class PrefetchTreeNodeTest extend assertEquals("xyz", n4.getPath()); } - public void testTreeSerializationWithHessian() throws Exception { - PrefetchTreeNode n1 = new PrefetchTreeNode(); - PrefetchTreeNode n2 = n1.addPath("abc"); - - PrefetchTreeNode nc1 = (PrefetchTreeNode) HessianUtil - .cloneViaClientServerSerialization(n1, new EntityResolver()); - assertNotNull(nc1); - - PrefetchTreeNode nc2 = nc1.getNode("abc"); - assertNotNull(nc2); - assertNotSame(nc2, n2); - assertSame(nc1, nc2.getParent()); - assertEquals("abc", nc2.getName()); - } - - public void testSubtreeSerializationWithHessian() throws Exception { - PrefetchTreeNode n1 = new PrefetchTreeNode(); - PrefetchTreeNode n2 = n1.addPath("abc"); - PrefetchTreeNode n3 = n2.addPath("xyz"); - - // test that substree was serialized as independent tree, instead of sucking - PrefetchTreeNode nc2 = (PrefetchTreeNode) HessianUtil - .cloneViaClientServerSerialization(n2,new EntityResolver()); - assertNotNull(nc2); - assertNull(nc2.getParent()); - - PrefetchTreeNode nc3 = nc2.getNode("xyz"); - assertNotNull(nc3); - assertNotSame(nc3, n3); - assertSame(nc2, nc3.getParent()); - assertEquals("xyz", nc3.getName()); - } + public void testTreeSerialization() throws Exception { PrefetchTreeNode n1 = new PrefetchTreeNode(); Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java Sat Nov 16 21:33:13 2013 @@ -25,8 +25,6 @@ import junit.framework.TestCase; import org.apache.cayenne.MockPersistentObject; import org.apache.cayenne.Persistent; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; public class RefreshQueryTest extends TestCase { @@ -75,9 +73,7 @@ public class RefreshQueryTest extends Te } public void testGroupKeysConstructor() { - String[] groupKeys = new String[] { - "a", "b" - }; + String[] groupKeys = new String[] { "a", "b" }; RefreshQuery q = new RefreshQuery(groupKeys); assertNull(q.getObjects()); @@ -85,15 +81,4 @@ public class RefreshQueryTest extends Te assertSame(groupKeys, q.getGroupKeys()); } - public void testSerializabilityWithHessian() throws Exception { - RefreshQuery o = new RefreshQuery(); - Object clone = HessianUtil.cloneViaClientServerSerialization( - o, - new EntityResolver()); - - assertTrue(clone instanceof RefreshQuery); - RefreshQuery c1 = (RefreshQuery) clone; - - assertNotSame(o, c1); - } } Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java Sat Nov 16 21:33:13 2013 @@ -22,12 +22,8 @@ package org.apache.cayenne.query; import junit.framework.TestCase; import org.apache.cayenne.ObjectId; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.util.Util; -/** - */ public class RelationshipQueryTest extends TestCase { public void testConstructorObjectId() { @@ -48,14 +44,4 @@ public class RelationshipQueryTest exten assertEquals("relX", q1.getRelationshipName()); } - public void testSerializabilityWithHessian() throws Exception { - ObjectId oid = new ObjectId("test", "a", "b"); - RelationshipQuery query = new RelationshipQuery(oid, "relX"); - - RelationshipQuery q1 = (RelationshipQuery) HessianUtil - .cloneViaClientServerSerialization(query,new EntityResolver()); - assertNotNull(q1); - assertEquals(oid, q1.getObjectId()); - assertEquals("relX", q1.getRelationshipName()); - } } Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java Sat Nov 16 21:33:13 2013 @@ -30,8 +30,6 @@ import org.apache.cayenne.DataRow; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.di.Inject; import org.apache.cayenne.map.DataMap; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; @@ -58,22 +56,15 @@ public class SQLTemplateTest extends Ser public void testBindCHARInWHERE() { // add 2 Artists DataMap testDataMap = context.getEntityResolver().getDataMap("testmap"); - SQLTemplate q1 = new SQLTemplate( - testDataMap, - "INSERT INTO ARTIST VALUES (1, 'Surikov', null)", - true); - SQLTemplate q2 = new SQLTemplate( - testDataMap, - "INSERT INTO ARTIST VALUES (2, 'Shishkin', null)", - true); + SQLTemplate q1 = new SQLTemplate(testDataMap, "INSERT INTO ARTIST VALUES (1, 'Surikov', null)", true); + SQLTemplate q2 = new SQLTemplate(testDataMap, "INSERT INTO ARTIST VALUES (2, 'Shishkin', null)", true); QueryChain chain = new QueryChain(); chain.addQuery(q1); chain.addQuery(q2); context.performNonSelectingQuery(chain); - // now select one Artist by Name, It's matter that ARTIST_NAME is CHAR not VARCHAR - SQLTemplate s1 = new SQLTemplate( - testDataMap, - "SELECT * FROM ARTIST WHERE ARTIST_NAME = #bind($ARTIST_NAME)", + // now select one Artist by Name, It's matter that ARTIST_NAME is CHAR + // not VARCHAR + SQLTemplate s1 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST WHERE ARTIST_NAME = #bind($ARTIST_NAME)", true); // whitespace after name is for reason s1.setParameters(Collections.singletonMap("ARTIST_NAME", "Surikov ")); @@ -109,12 +100,10 @@ public class SQLTemplateTest extends Ser boolean gotRuntimeException = false; try { context.performQuery(q2); - } - catch (CayenneRuntimeException e) { + } catch (CayenneRuntimeException e) { gotRuntimeException = true; } - assertTrue( - "If fetchingDataRows is false and ObjectEntity not set, shoulb be thrown exception", + assertTrue("If fetchingDataRows is false and ObjectEntity not set, shoulb be thrown exception", gotRuntimeException); } @@ -160,28 +149,6 @@ public class SQLTemplateTest extends Ser assertEquals(o.getDefaultTemplate(), c1.getDefaultTemplate()); } - public void testSerializabilityWithHessian() throws Exception { - SQLTemplate o = new SQLTemplate("Test", "DO SQL"); - Object clone = HessianUtil.cloneViaClientServerSerialization( - o, - new EntityResolver()); - - assertTrue(clone instanceof SQLTemplate); - SQLTemplate c1 = (SQLTemplate) clone; - - assertNotSame(o, c1); - assertEquals(o.getRoot(), c1.getRoot()); - assertEquals(o.getDefaultTemplate(), c1.getDefaultTemplate()); - - // set immutable parameters ... query must recast them to mutable version - Map<String, Object>[] parameters = new Map[] { - Collections.EMPTY_MAP - }; - o.setParameters(parameters); - - HessianUtil.cloneViaClientServerSerialization(o, new EntityResolver()); - } - public void testGetDefaultTemplate() { SQLTemplate query = new SQLTemplate(); query.setDefaultTemplate("AAA # BBB"); @@ -243,9 +210,7 @@ public class SQLTemplateTest extends Ser Map<String, Object> params2 = new HashMap<String, Object>(); params2.put("1", "2"); - query.setParameters(new Map[] { - params1, params2, null - }); + query.setParameters(new Map[] { params1, params2, null }); assertEquals(params1, query.getParameters()); Iterator<?> it = query.parametersIterator(); assertTrue(it.hasNext()); Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java Sat Nov 16 21:33:13 2013 @@ -19,14 +19,14 @@ package org.apache.cayenne.remote.service; +import static org.mockito.Mockito.mock; +import junit.framework.TestCase; + import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.MockDataChannel; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.remote.BootstrapMessage; -import org.apache.cayenne.remote.MockMessage; -import org.apache.cayenne.remote.service.DispatchHelper; - -import junit.framework.TestCase; +import org.apache.cayenne.remote.ClientMessage; public class DispatchHelperTest extends TestCase { @@ -40,7 +40,7 @@ public class DispatchHelperTest extends public void testUnknownMessage() { try { - DispatchHelper.dispatch(new MockDataChannel(), new MockMessage()); + DispatchHelper.dispatch(new MockDataChannel(), mock(ClientMessage.class)); fail("Unknown message must have failed"); } catch (CayenneRuntimeException e) { Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java Sat Nov 16 21:33:13 2013 @@ -38,6 +38,7 @@ public class ServerCase extends DICase { public static final String DEFAULT_PROJECT = "cayenne-default.xml"; public static final String MULTINODE_PROJECT = "cayenne-multinode.xml"; public static final String ONEWAY_PROJECT = "cayenne-oneway-rels.xml"; + public static final String MULTI_TIER_PROJECT = "cayenne-multi-tier.xml"; private static final Injector injector; Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/GenericResponseTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/GenericResponseTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/GenericResponseTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/GenericResponseTest.java Sat Nov 16 21:33:13 2013 @@ -23,11 +23,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; -import org.apache.cayenne.util.GenericResponse; -import org.apache.cayenne.util.Util; - import junit.framework.TestCase; public class GenericResponseTest extends TestCase { @@ -37,9 +32,7 @@ public class GenericResponseTest extends list.add(new HashMap()); GenericResponse r = new GenericResponse(); - r.addBatchUpdateCount(new int[] { - 1, 2, 3 - }); + r.addBatchUpdateCount(new int[] { 1, 2, 3 }); r.addResultList(list); assertEquals(2, r.size()); @@ -64,9 +57,7 @@ public class GenericResponseTest extends list.add(new HashMap()); GenericResponse r = new GenericResponse(); - r.addBatchUpdateCount(new int[] { - 1, 2, 3 - }); + r.addBatchUpdateCount(new int[] { 1, 2, 3 }); r.addResultList(list); GenericResponse sr = (GenericResponse) Util.cloneViaSerialization(r); @@ -87,33 +78,5 @@ public class GenericResponseTest extends assertFalse(sr.next()); } - - public void testSerializationWithHessian() throws Exception { - List list = new ArrayList(); - list.add(new HashMap()); - - GenericResponse r = new GenericResponse(); - r.addBatchUpdateCount(new int[] { - 1, 2, 3 - }); - r.addResultList(list); - - GenericResponse sr = (GenericResponse) HessianUtil.cloneViaClientServerSerialization(r, new EntityResolver()); - assertNotNull(sr); - assertEquals(2, sr.size()); - - assertTrue(sr.next()); - assertFalse(sr.isList()); - int[] srInt = sr.currentUpdateCount(); - assertEquals(3, srInt.length); - assertEquals(2, srInt[1]); - - assertTrue(sr.next()); - assertTrue(sr.isList()); - - assertEquals(list, sr.currentList()); - - assertFalse(sr.next()); - } } Modified: cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/ListResponseTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/ListResponseTest.java?rev=1542592&r1=1542591&r2=1542592&view=diff ============================================================================== --- cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/ListResponseTest.java (original) +++ cayenne/main/trunk/cayenne-core/src/test/java/org/apache/cayenne/util/ListResponseTest.java Sat Nov 16 21:33:13 2013 @@ -23,9 +23,6 @@ import java.util.List; import junit.framework.TestCase; -import org.apache.cayenne.map.EntityResolver; -import org.apache.cayenne.remote.hessian.service.HessianUtil; - public class ListResponseTest extends TestCase { public void testCreation() throws Exception { @@ -61,14 +58,4 @@ public class ListResponseTest extends Te assertTrue(sr.firstList().contains(new Integer(67))); } - public void testSerializationWithHessian() throws Exception { - - ListResponse r = new ListResponse(new Integer(67)); - - ListResponse sr = (ListResponse) HessianUtil.cloneViaClientServerSerialization(r, new EntityResolver()); - assertNotNull(sr); - assertEquals(1, sr.size()); - - assertTrue(sr.firstList().contains(new Integer(67))); - } }
