Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ValueInjectorTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ValueInjectorTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ValueInjectorTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ValueInjectorTest.java Sat Jun 22 19:36:53 2013 @@ -30,8 +30,7 @@ import org.apache.cayenne.unit.di.server public class ValueInjectorTest extends RemoteCayenneCase { public void test() { - ObjEntity entity = serverContext.getEntityResolver().lookupObjEntity( - MtTable1Subclass.class); + ObjEntity entity = serverContext.getEntityResolver().getObjEntity(MtTable1Subclass.class); Expression qualifier = entity.getDeclaredQualifier(); try { @@ -39,21 +38,18 @@ public class ValueInjectorTest extends R assertEquals(ee.getGlobalAttribute1(), "sub1"); // check AND - entity.setDeclaredQualifier(qualifier.andExp(Expression - .fromString("serverAttribute1 = 'sa'"))); + entity.setDeclaredQualifier(qualifier.andExp(Expression.fromString("serverAttribute1 = 'sa'"))); ee = serverContext.newObject(MtTable1Subclass.class); assertEquals(ee.getGlobalAttribute1(), "sub1"); assertEquals(ee.getServerAttribute1(), "sa"); - } - finally { + } finally { entity.setDeclaredQualifier(qualifier); } } public void testRemote() { ObjectContext context = createROPContext(); - ObjEntity entity = context.getEntityResolver().lookupObjEntity( - ClientMtTable1Subclass.class); + ObjEntity entity = context.getEntityResolver().getObjEntity(ClientMtTable1Subclass.class); Expression qualifier = entity.getDeclaredQualifier(); try { @@ -61,13 +57,11 @@ public class ValueInjectorTest extends R assertEquals(ee.getGlobalAttribute1(), "sub1"); // check AND - entity.setDeclaredQualifier(qualifier.andExp(Expression - .fromString("serverAttribute1 = 'sa'"))); + entity.setDeclaredQualifier(qualifier.andExp(Expression.fromString("serverAttribute1 = 'sa'"))); ee = context.newObject(ClientMtTable1Subclass.class); assertEquals(ee.getGlobalAttribute1(), "sub1"); assertEquals(ee.getServerAttribute1(), "sa"); - } - finally { + } finally { entity.setDeclaredQualifier(qualifier); } }
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluateInMemoryTest.java Sat Jun 22 19:36:53 2013 @@ -71,8 +71,7 @@ public class ExpressionEvaluateInMemoryT public void testEvaluateOBJ_PATH_ObjEntity() throws Exception { ASTObjPath node = new ASTObjPath("paintingArray.paintingTitle"); - ObjEntity ae = runtime.getDataDomain().getEntityResolver().lookupObjEntity( - Artist.class); + ObjEntity ae = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class); Object target = node.evaluate(ae); assertTrue(target instanceof ObjAttribute); @@ -81,8 +80,7 @@ public class ExpressionEvaluateInMemoryT public void testEvaluateDB_PATH_DbEntity() throws Exception { Expression e = Expression.fromString("db:paintingArray.PAINTING_TITLE"); - ObjEntity ae = runtime.getDataDomain().getEntityResolver().lookupObjEntity( - Artist.class); + ObjEntity ae = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class); DbEntity ade = ae.getDbEntity(); Object objTarget = e.evaluate(ae); @@ -98,8 +96,7 @@ public class ExpressionEvaluateInMemoryT BigDecimal bd3 = new BigDecimal("2.00"); BigDecimal bd4 = new BigDecimal("2.01"); - Expression equalTo = new ASTEqual(new ASTObjPath( - Painting.ESTIMATED_PRICE_PROPERTY), bd1); + Expression equalTo = new ASTEqual(new ASTObjPath(Painting.ESTIMATED_PRICE_PROPERTY), bd1); Painting p = new Painting(); p.setEstimatedPrice(bd2); @@ -172,9 +169,7 @@ public class ExpressionEvaluateInMemoryT Expression e1 = new ASTEqual(new ASTObjPath("artistName"), "abc"); Expression e2 = new ASTEqual(new ASTObjPath("artistName"), "abc"); - ASTAnd e = new ASTAnd(new Object[] { - e1, e2 - }); + ASTAnd e = new ASTAnd(new Object[] { e1, e2 }); Artist match = new Artist(); match.setArtistName("abc"); @@ -189,9 +184,7 @@ public class ExpressionEvaluateInMemoryT Expression e1 = new ASTEqual(new ASTObjPath("artistName"), "abc"); Expression e2 = new ASTEqual(new ASTObjPath("artistName"), "xyz"); - ASTOr e = new ASTOr(new Object[] { - e1, e2 - }); + ASTOr e = new ASTOr(new Object[] { e1, e2 }); Artist match1 = new Artist(); match1.setArtistName("abc"); @@ -219,8 +212,7 @@ public class ExpressionEvaluateInMemoryT } public void testEvaluateLESS_THAN() throws Exception { - Expression e = new ASTLess(new ASTObjPath("estimatedPrice"), new BigDecimal( - 10000d)); + Expression e = new ASTLess(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d)); Painting noMatch = new Painting(); noMatch.setEstimatedPrice(new BigDecimal(10001)); @@ -236,9 +228,7 @@ public class ExpressionEvaluateInMemoryT } public void testEvaluateLESS_THAN_EQUAL_TO() throws Exception { - Expression e = new ASTLessOrEqual( - new ASTObjPath("estimatedPrice"), - new BigDecimal(10000d)); + Expression e = new ASTLessOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d)); Painting noMatch = new Painting(); noMatch.setEstimatedPrice(new BigDecimal(10001)); @@ -254,8 +244,7 @@ public class ExpressionEvaluateInMemoryT } public void testEvaluateGREATER_THAN() throws Exception { - Expression e = new ASTGreater(new ASTObjPath("estimatedPrice"), new BigDecimal( - 10000d)); + Expression e = new ASTGreater(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d)); Painting noMatch = new Painting(); noMatch.setEstimatedPrice(new BigDecimal(9999)); @@ -271,9 +260,7 @@ public class ExpressionEvaluateInMemoryT } public void testEvaluateGREATER_THAN_EQUAL_TO() throws Exception { - Expression e = new ASTGreaterOrEqual( - new ASTObjPath("estimatedPrice"), - new BigDecimal(10000d)); + Expression e = new ASTGreaterOrEqual(new ASTObjPath("estimatedPrice"), new BigDecimal(10000d)); Painting noMatch = new Painting(); noMatch.setEstimatedPrice(new BigDecimal(9999)); @@ -290,13 +277,8 @@ public class ExpressionEvaluateInMemoryT public void testEvaluateBETWEEN() throws Exception { // evaluate both BETWEEN and NOT_BETWEEN - Expression between = new ASTBetween( - new ASTObjPath("estimatedPrice"), - new BigDecimal(10d), - new BigDecimal(20d)); - Expression notBetween = new ASTNotBetween( - new ASTObjPath("estimatedPrice"), - new BigDecimal(10d), + Expression between = new ASTBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d), new BigDecimal(20d)); + Expression notBetween = new ASTNotBetween(new ASTObjPath("estimatedPrice"), new BigDecimal(10d), new BigDecimal(20d)); Painting noMatch = new Painting(); @@ -321,15 +303,11 @@ public class ExpressionEvaluateInMemoryT } public void testEvaluateIN() throws Exception { - Expression in = new ASTIn(new ASTObjPath("estimatedPrice"), new ASTList( - new Object[] { - new BigDecimal("10"), new BigDecimal("20") - })); - - Expression notIn = new ASTNotIn(new ASTObjPath("estimatedPrice"), new ASTList( - new Object[] { - new BigDecimal("10"), new BigDecimal("20") - })); + Expression in = new ASTIn(new ASTObjPath("estimatedPrice"), new ASTList(new Object[] { new BigDecimal("10"), + new BigDecimal("20") })); + + Expression notIn = new ASTNotIn(new ASTObjPath("estimatedPrice"), new ASTList(new Object[] { + new BigDecimal("10"), new BigDecimal("20") })); Painting noMatch1 = new Painting(); noMatch1.setEstimatedPrice(new BigDecimal("21")); @@ -407,9 +385,7 @@ public class ExpressionEvaluateInMemoryT public void testEvaluateLIKE_IGNORE_CASE() throws Exception { Expression like = new ASTLikeIgnoreCase(new ASTObjPath("artistName"), "aBcD"); - Expression notLike = new ASTNotLikeIgnoreCase( - new ASTObjPath("artistName"), - "aBcD"); + Expression notLike = new ASTNotLikeIgnoreCase(new ASTObjPath("artistName"), "aBcD"); Artist noMatch1 = new Artist(); noMatch1.setArtistName("dabc"); @@ -428,38 +404,28 @@ public class ExpressionEvaluateInMemoryT } public void testEvaluateADD() throws Exception { - Expression add = new ASTAdd(new Object[] { - new Integer(1), new Double(5.5) - }); + Expression add = new ASTAdd(new Object[] { new Integer(1), new Double(5.5) }); assertEquals(6.5, ((Number) add.evaluate(null)).doubleValue(), 0.0001); } public void testEvaluateSubtract() throws Exception { - Expression subtract = new ASTSubtract(new Object[] { - new Integer(1), new Double(0.1), new Double(0.2) - }); + Expression subtract = new ASTSubtract(new Object[] { new Integer(1), new Double(0.1), new Double(0.2) }); assertEquals(0.7, ((Number) subtract.evaluate(null)).doubleValue(), 0.0001); } public void testEvaluateMultiply() throws Exception { - Expression multiply = new ASTMultiply(new Object[] { - new Integer(2), new Double(3.5) - }); + Expression multiply = new ASTMultiply(new Object[] { new Integer(2), new Double(3.5) }); assertEquals(7, ((Number) multiply.evaluate(null)).doubleValue(), 0.0001); } public void testEvaluateDivide() throws Exception { - Expression divide = new ASTDivide(new Object[] { - new BigDecimal("7.0"), new BigDecimal("2.0") - }); + Expression divide = new ASTDivide(new Object[] { new BigDecimal("7.0"), new BigDecimal("2.0") }); assertEquals(3.5, ((Number) divide.evaluate(null)).doubleValue(), 0.0001); } public void testEvaluateNegate() throws Exception { - assertEquals(-3, ((Number) new ASTNegate(new Integer(3)).evaluate(null)) - .intValue()); - assertEquals(5, ((Number) new ASTNegate(new Integer(-5)).evaluate(null)) - .intValue()); + assertEquals(-3, ((Number) new ASTNegate(new Integer(3)).evaluate(null)).intValue()); + assertEquals(5, ((Number) new ASTNegate(new Integer(-5)).evaluate(null)).intValue()); } public void testEvaluateTrue() throws Exception { Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ClientEntityResolverTest.java Sat Jun 22 19:36:53 2013 @@ -52,8 +52,8 @@ public class ClientEntityResolverTest ex + clientResolver.getObjEntities()); } - assertNotNull(clientResolver.lookupObjEntity(ClientMtTable1.class)); - assertNull(clientResolver.lookupObjEntity(MtTable1.class)); + assertNotNull(clientResolver.getObjEntity(ClientMtTable1.class)); + assertNull(clientResolver.getObjEntity(MtTable1.class)); } public void testSerializabilityWithHessian() throws Exception { Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java Sat Jun 22 19:36:53 2013 @@ -74,7 +74,7 @@ public class EntityInheritanceTreeTest e // creating EntityInheritanceTree via EntityResolver to ensure the entities are // indexed EntityResolver resolver = new EntityResolver(Collections.singleton(dataMap)); - EntityInheritanceTree t1 = resolver.lookupInheritanceTree("E1"); + EntityInheritanceTree t1 = resolver.getInheritanceTree("E1"); DataRow row11 = new DataRow(5); row11.put("x", 1); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackTest.java Sat Jun 22 19:36:53 2013 @@ -44,10 +44,10 @@ public class EntityResolverGenericStackT assertNotNull(g2); assertNotSame(g1, g2); - assertNull(resolver.lookupObjEntity(Object.class)); + assertNull(resolver.getObjEntity(Object.class)); try { - resolver.lookupObjEntity(CayenneDataObject.class); + resolver.getObjEntity(CayenneDataObject.class); fail("two entities mapped to the same class... resolver must have thrown."); } catch (CayenneRuntimeException e) { Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java Sat Jun 22 19:36:53 2013 @@ -29,22 +29,22 @@ public class EntityResolverInheritanceTe @Inject private EntityResolver resolver; - public void testLookupAbstractPersonTree() throws Exception { - EntityInheritanceTree tree = resolver.lookupInheritanceTree("AbstractPerson"); + public void testGetAbstractPersonTree() throws Exception { + EntityInheritanceTree tree = resolver.getInheritanceTree("AbstractPerson"); assertNotNull(tree); assertEquals(2, tree.getChildrenCount()); assertSame(resolver.getObjEntity("AbstractPerson"), tree.getEntity()); } - public void testLookupEmployeeTree() throws Exception { - EntityInheritanceTree tree = resolver.lookupInheritanceTree("Employee"); + public void testGetEmployeeTree() throws Exception { + EntityInheritanceTree tree = resolver.getInheritanceTree("Employee"); assertNotNull(tree); assertEquals(1, tree.getChildrenCount()); assertSame(resolver.getObjEntity("Employee"), tree.getEntity()); } - public void testLookupManagerTree() throws Exception { - EntityInheritanceTree tree = resolver.lookupInheritanceTree("Manager"); + public void testGetManagerTree() throws Exception { + EntityInheritanceTree tree = resolver.getInheritanceTree("Manager"); assertNotNull(tree); assertEquals(0, tree.getChildrenCount()); } @@ -67,10 +67,10 @@ public class EntityResolverInheritanceTe map.addObjEntity(sub1); map.addObjEntity(sub2); - assertNull(resolver.lookupInheritanceTree("super1")); + assertNull(resolver.getInheritanceTree("super1")); resolver.addDataMap(map); - EntityInheritanceTree tree = resolver.lookupInheritanceTree("super1"); + EntityInheritanceTree tree = resolver.getInheritanceTree("super1"); assertNotNull(tree); assertEquals(2, tree.getChildrenCount()); assertSame(super1, tree.getEntity()); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java Sat Jun 22 19:36:53 2013 @@ -44,30 +44,22 @@ public class EntityResolverTest extends private DataContext context; public void testGetObjEntity() { - EntityResolver resolver = new EntityResolver(runtime - .getDataDomain() - .getDataMaps()); + EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps()); assertIsArtistObjEntity(resolver.getObjEntity("Artist")); } public void testLookupObjEntityByClass() { - EntityResolver resolver = new EntityResolver(runtime - .getDataDomain() - .getDataMaps()); - assertIsArtistObjEntity(resolver.lookupObjEntity(Artist.class)); + EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps()); + assertIsArtistObjEntity(resolver.getObjEntity(Artist.class)); } public void testLookupObjEntityByInstance() { - EntityResolver resolver = new EntityResolver(runtime - .getDataDomain() - .getDataMaps()); + EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps()); assertIsArtistObjEntity(resolver.lookupObjEntity(new Artist())); } public void testLookupObjEntityByDataobject() { - EntityResolver resolver = new EntityResolver(runtime - .getDataDomain() - .getDataMaps()); + EntityResolver resolver = new EntityResolver(runtime.getDataDomain().getDataMaps()); Artist artist = (Artist) context.newObject("Artist"); assertIsArtistObjEntity(resolver.lookupObjEntity(artist)); } @@ -91,7 +83,7 @@ public class EntityResolverTest extends // create empty resolver EntityResolver resolver = new EntityResolver(); assertEquals(0, resolver.getDataMaps().size()); - assertNull(resolver.lookupObjEntity(Object.class)); + assertNull(resolver.getObjEntity(Object.class)); DataMap m1 = new DataMap(); ObjEntity oe1 = new ObjEntity("test"); @@ -101,7 +93,7 @@ public class EntityResolverTest extends resolver.addDataMap(m1); assertEquals(1, resolver.getDataMaps().size()); - assertSame(oe1, resolver.lookupObjEntity(Object.class)); + assertSame(oe1, resolver.getObjEntity(Object.class)); assertEquals(resolver, m1.getNamespace()); } @@ -116,12 +108,12 @@ public class EntityResolverTest extends EntityResolver resolver = new EntityResolver(list); assertEquals(1, resolver.getDataMaps().size()); - assertSame(oe1, resolver.lookupObjEntity(Object.class)); + assertSame(oe1, resolver.getObjEntity(Object.class)); resolver.removeDataMap(m1); assertEquals(0, resolver.getDataMaps().size()); - assertNull(resolver.lookupObjEntity(Object.class)); + assertNull(resolver.getObjEntity(Object.class)); } public void testAddObjEntity() { @@ -134,13 +126,13 @@ public class EntityResolverTest extends list.add(m1); EntityResolver resolver = new EntityResolver(list); - assertSame(oe1, resolver.lookupObjEntity(Object.class)); + assertSame(oe1, resolver.getObjEntity(Object.class)); ObjEntity oe2 = new ObjEntity("test2"); oe2.setClassName(String.class.getName()); m1.addObjEntity(oe2); - assertSame(oe2, resolver.lookupObjEntity(String.class)); + assertSame(oe2, resolver.getObjEntity(String.class)); } public void testGetQuery() { @@ -160,28 +152,11 @@ public class EntityResolverTest extends assertSame(q2, resolver.getQuery("query2")); } - private void assertIsArtistDbEntity(DbEntity ae) { - assertNotNull(ae); - assertEquals(ae, getDbEntity("ARTIST")); - } - private void assertIsArtistObjEntity(ObjEntity ae) { assertNotNull(ae); assertEquals(ae, getObjEntity("Artist")); } - private DbEntity getDbEntity(String dbEntityName) { - for (DataMap map : runtime.getDataDomain().getDataMaps()) { - for (DbEntity e : map.getDbEntities()) { - if (dbEntityName.equals(e.getName())) { - return e; - } - } - } - - throw new CayenneRuntimeException("No DbEntity found: " + dbEntityName); - } - private ObjEntity getObjEntity(String objEntityName) { for (DataMap map : runtime.getDataDomain().getDataMaps()) { for (ObjEntity e : map.getObjEntities()) { Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java Sat Jun 22 19:36:53 2013 @@ -92,8 +92,7 @@ public class ObjEntityTest extends Serve } public void testGetPrimaryKeys() { - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity( - "Artist"); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist"); Collection<ObjAttribute> pks = artistE.getPrimaryKeys(); assertEquals(1, pks.size()); @@ -114,10 +113,7 @@ public class ObjEntityTest extends Serve assertNull(clientPk.getEntity()); assertFalse(clientArtistE.getAttributes().contains(pk)); - ObjEntity meaningfulPKE = runtime - .getDataDomain() - .getEntityResolver() - .getObjEntity("MeaningfulPKTest1"); + ObjEntity meaningfulPKE = runtime.getDataDomain().getEntityResolver().getObjEntity("MeaningfulPKTest1"); Collection<ObjAttribute> mpks = meaningfulPKE.getPrimaryKeys(); assertEquals(1, mpks.size()); @@ -135,8 +131,7 @@ public class ObjEntityTest extends Serve public void testAttributes() { // ObjEntity artistE = getObjEntity("Artist"); - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity( - "Artist"); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist"); ObjAttribute attr = (ObjAttribute) artistE.getAttribute("artistName"); assertEquals(attr.getMaxLength(), attr.getDbAttribute().getMaxLength()); @@ -144,33 +139,28 @@ public class ObjEntityTest extends Serve } public void testLastPathComponent() { - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity( - "Artist"); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist"); Map<String, String> aliases = new HashMap<String, String>(); aliases.put("a", "paintingArray.toGallery"); - PathComponent<ObjAttribute, ObjRelationship> lastAttribute = artistE - .lastPathComponent( - Expression.fromString("paintingArray.paintingTitle"), - aliases); + PathComponent<ObjAttribute, ObjRelationship> lastAttribute = artistE.lastPathComponent( + Expression.fromString("paintingArray.paintingTitle"), aliases); assertTrue(lastAttribute.getAttribute() != null); assertEquals("paintingTitle", lastAttribute.getAttribute().getName()); - PathComponent<ObjAttribute, ObjRelationship> lastRelationship = artistE - .lastPathComponent( - Expression.fromString("paintingArray.toGallery"), - aliases); + PathComponent<ObjAttribute, ObjRelationship> lastRelationship = artistE.lastPathComponent( + Expression.fromString("paintingArray.toGallery"), aliases); assertTrue(lastRelationship.getRelationship() != null); assertEquals("toGallery", lastRelationship.getRelationship().getName()); - PathComponent<ObjAttribute, ObjRelationship> lastLeftJoinRelationship = artistE - .lastPathComponent(new ASTObjPath("paintingArray+.toGallery+"), aliases); + PathComponent<ObjAttribute, ObjRelationship> lastLeftJoinRelationship = artistE.lastPathComponent( + new ASTObjPath("paintingArray+.toGallery+"), aliases); assertTrue(lastLeftJoinRelationship.getRelationship() != null); assertEquals("toGallery", lastLeftJoinRelationship.getRelationship().getName()); - PathComponent<ObjAttribute, ObjRelationship> lastAliasedRelationship = artistE - .lastPathComponent(new ASTObjPath("a"), aliases); + PathComponent<ObjAttribute, ObjRelationship> lastAliasedRelationship = artistE.lastPathComponent( + new ASTObjPath("a"), aliases); assertTrue(lastAliasedRelationship.getRelationship() != null); assertEquals("toGallery", lastAliasedRelationship.getRelationship().getName()); } @@ -206,8 +196,7 @@ public class ObjEntityTest extends Serve public void testClientAllowed() { ObjEntity e1 = new ObjEntity("e1"); - assertFalse("No parent DataMap should have automatically disabled client.", e1 - .isClientAllowed()); + assertFalse("No parent DataMap should have automatically disabled client.", e1.isClientAllowed()); DataMap map = new DataMap("m1"); e1.setDataMap(map); @@ -339,8 +328,7 @@ public class ObjEntityTest extends Serve try { entity.getDbEntity(); fail("Without a container ObjENtity shouldn't resolve DbEntity"); - } - catch (CayenneRuntimeException ex) { + } catch (CayenneRuntimeException ex) { // expected } } @@ -363,10 +351,8 @@ public class ObjEntityTest extends Serve ObjEntity ae = runtime.getDataDomain().getEntityResolver().getObjEntity("Artist"); DbEntity dae = ae.getDbEntity(); - assertNull(ae.getAttributeForDbAttribute((DbAttribute) dae - .getAttribute("ARTIST_ID"))); - assertNotNull(ae.getAttributeForDbAttribute((DbAttribute) dae - .getAttribute("ARTIST_NAME"))); + assertNull(ae.getAttributeForDbAttribute((DbAttribute) dae.getAttribute("ARTIST_ID"))); + assertNotNull(ae.getAttributeForDbAttribute((DbAttribute) dae.getAttribute("ARTIST_NAME"))); } public void testRelationshipForDbRelationship() throws Exception { @@ -374,8 +360,7 @@ public class ObjEntityTest extends Serve DbEntity dae = ae.getDbEntity(); assertNull(ae.getRelationshipForDbRelationship(new DbRelationship())); - assertNotNull(ae.getRelationshipForDbRelationship((DbRelationship) dae - .getRelationship("paintingArray"))); + assertNotNull(ae.getRelationshipForDbRelationship((DbRelationship) dae.getRelationship("paintingArray"))); } public void testReadOnly() throws Exception { @@ -386,70 +371,46 @@ public class ObjEntityTest extends Serve } public void testTranslateToRelatedEntityIndependentPath() throws Exception { - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().lookupObjEntity( - Artist.class); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class); Expression e1 = Expression.fromString("paintingArray"); - Expression translated = artistE - .translateToRelatedEntity(e1, "artistExhibitArray"); - assertEquals("failure: " + translated, Expression - .fromString("db:toArtist.paintingArray"), translated); + Expression translated = artistE.translateToRelatedEntity(e1, "artistExhibitArray"); + assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray"), translated); } public void testTranslateToRelatedEntityTrimmedPath() throws Exception { - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().lookupObjEntity( - Artist.class); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class); Expression e1 = Expression.fromString("artistExhibitArray.toExhibit"); - Expression translated = artistE - .translateToRelatedEntity(e1, "artistExhibitArray"); - assertEquals("failure: " + translated, Expression - .fromString("db:toArtist.artistExhibitArray.toExhibit"), translated); + Expression translated = artistE.translateToRelatedEntity(e1, "artistExhibitArray"); + assertEquals("failure: " + translated, Expression.fromString("db:toArtist.artistExhibitArray.toExhibit"), + translated); } public void testTranslateToRelatedEntitySplitHalfWay() throws Exception { - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().lookupObjEntity( - Artist.class); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class); Expression e1 = Expression.fromString("paintingArray.toPaintingInfo.textReview"); - Expression translated = artistE.translateToRelatedEntity( - e1, - "paintingArray.toGallery"); - assertEquals( - "failure: " + translated, - Expression - .fromString("db:paintingArray.toArtist.paintingArray.toPaintingInfo.TEXT_REVIEW"), - translated); + Expression translated = artistE.translateToRelatedEntity(e1, "paintingArray.toGallery"); + assertEquals("failure: " + translated, + Expression.fromString("db:paintingArray.toArtist.paintingArray.toPaintingInfo.TEXT_REVIEW"), translated); } public void testTranslateToRelatedEntityMatchingPath() throws Exception { - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().lookupObjEntity( - Artist.class); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class); Expression e1 = Expression.fromString("artistExhibitArray.toExhibit"); - Expression translated = artistE.translateToRelatedEntity( - e1, - "artistExhibitArray.toExhibit"); - assertEquals( - "failure: " + translated, - Expression - .fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"), - translated); + Expression translated = artistE.translateToRelatedEntity(e1, "artistExhibitArray.toExhibit"); + assertEquals("failure: " + translated, + Expression.fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"), translated); } public void testTranslateToRelatedEntityMultiplePaths() throws Exception { - ObjEntity artistE = runtime.getDataDomain().getEntityResolver().lookupObjEntity( - Artist.class); + ObjEntity artistE = runtime.getDataDomain().getEntityResolver().getObjEntity(Artist.class); - Expression e1 = Expression - .fromString("paintingArray = $p and artistExhibitArray.toExhibit.closingDate = $d"); - Expression translated = artistE - .translateToRelatedEntity(e1, "artistExhibitArray"); - assertEquals( - "failure: " + translated, - Expression - .fromString("db:toArtist.paintingArray = $p " - + "and db:toArtist.artistExhibitArray.toExhibit.CLOSING_DATE = $d"), - translated); + Expression e1 = Expression.fromString("paintingArray = $p and artistExhibitArray.toExhibit.closingDate = $d"); + Expression translated = artistE.translateToRelatedEntity(e1, "artistExhibitArray"); + assertEquals("failure: " + translated, Expression.fromString("db:toArtist.paintingArray = $p " + + "and db:toArtist.artistExhibitArray.toExhibit.CLOSING_DATE = $d"), translated); } public void testTranslateNullArg() { Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java Sat Jun 22 19:36:53 2013 @@ -419,7 +419,7 @@ public class ObjRelationshipTest extends EntityResolver resolver = new EntityResolver( Collections.singleton(dataMap)); - ObjEntity iv2Sub1 = resolver.lookupObjEntity(Iv2Sub1.class); + ObjEntity iv2Sub1 = resolver.getObjEntity(Iv2Sub1.class); ObjRelationship x = (ObjRelationship) iv2Sub1 .getRelationship(Iv2Sub1.X_PROPERTY); assertTrue(x.isFlattened()); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityTest.java Sat Jun 22 19:36:53 2013 @@ -37,10 +37,8 @@ public class SelectQueryPrefetchRouterAc private EntityResolver resolver; public void testPrefetchEmployee() throws Exception { - ObjEntity departmentEntity = resolver.lookupObjEntity(Department.class); - SelectQuery q = new SelectQuery(Employee.class, ExpressionFactory.matchExp( - "name", - "abc")); + ObjEntity departmentEntity = resolver.getObjEntity(Department.class); + SelectQuery q = new SelectQuery(Employee.class, ExpressionFactory.matchExp("name", "abc")); q.addPrefetch(Employee.TO_DEPARTMENT_PROPERTY); @@ -53,16 +51,13 @@ public class SelectQueryPrefetchRouterAc PrefetchSelectQuery prefetch = (PrefetchSelectQuery) router.getQueries().get(0); assertSame(departmentEntity, prefetch.getRoot()); - assertEquals(Expression.fromString("db:employees.NAME = 'abc' " - + "and (db:employees.PERSON_TYPE = 'EE' " + assertEquals(Expression.fromString("db:employees.NAME = 'abc' " + "and (db:employees.PERSON_TYPE = 'EE' " + "or db:employees.PERSON_TYPE = 'EM')"), prefetch.getQualifier()); } public void testPrefetchManager() throws Exception { - ObjEntity departmentEntity = resolver.lookupObjEntity(Department.class); - SelectQuery q = new SelectQuery(Manager.class, ExpressionFactory.matchExp( - "name", - "abc")); + ObjEntity departmentEntity = resolver.getObjEntity(Department.class); + SelectQuery q = new SelectQuery(Manager.class, ExpressionFactory.matchExp("name", "abc")); q.addPrefetch(Employee.TO_DEPARTMENT_PROPERTY); @@ -74,9 +69,7 @@ public class SelectQueryPrefetchRouterAc PrefetchSelectQuery prefetch = (PrefetchSelectQuery) router.getQueries().get(0); assertSame(departmentEntity, prefetch.getRoot()); - assertEquals( - Expression - .fromString("db:employees.NAME = 'abc' and db:employees.PERSON_TYPE = 'EM'"), + assertEquals(Expression.fromString("db:employees.NAME = 'abc' and db:employees.PERSON_TYPE = 'EM'"), prefetch.getQualifier()); } } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionTest.java Sat Jun 22 19:36:53 2013 @@ -37,10 +37,8 @@ public class SelectQueryPrefetchRouterAc private EntityResolver resolver; public void testPaintings1() { - ObjEntity paintingEntity = resolver.lookupObjEntity(Painting.class); - SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp( - "artistName", - "abc")); + ObjEntity paintingEntity = resolver.getObjEntity(Painting.class); + SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp("artistName", "abc")); q.addPrefetch(Artist.PAINTING_ARRAY_PROPERTY); SelectQueryPrefetchRouterAction action = new SelectQueryPrefetchRouterAction(); @@ -52,15 +50,13 @@ public class SelectQueryPrefetchRouterAc PrefetchSelectQuery prefetch = (PrefetchSelectQuery) router.getQueries().get(0); assertSame(paintingEntity, prefetch.getRoot()); - assertEquals(Expression.fromString("db:toArtist.ARTIST_NAME = 'abc'"), prefetch - .getQualifier()); + assertEquals(Expression.fromString("db:toArtist.ARTIST_NAME = 'abc'"), prefetch.getQualifier()); } public void testPrefetchPaintings2() { - ObjEntity paintingEntity = resolver.lookupObjEntity(Painting.class); + ObjEntity paintingEntity = resolver.getObjEntity(Painting.class); - SelectQuery q = new SelectQuery(Artist.class, Expression - .fromString("artistName = 'abc' or artistName = 'xyz'")); + SelectQuery q = new SelectQuery(Artist.class, Expression.fromString("artistName = 'abc' or artistName = 'xyz'")); q.addPrefetch(Artist.PAINTING_ARRAY_PROPERTY); SelectQueryPrefetchRouterAction action = new SelectQueryPrefetchRouterAction(); @@ -71,17 +67,13 @@ public class SelectQueryPrefetchRouterAc PrefetchSelectQuery prefetch = (PrefetchSelectQuery) router.getQueries().get(0); assertSame(paintingEntity, prefetch.getRoot()); - assertEquals( - Expression - .fromString("db:toArtist.ARTIST_NAME = 'abc' or db:toArtist.ARTIST_NAME = 'xyz'"), + assertEquals(Expression.fromString("db:toArtist.ARTIST_NAME = 'abc' or db:toArtist.ARTIST_NAME = 'xyz'"), prefetch.getQualifier()); } public void testGalleries() { - ObjEntity galleryEntity = resolver.lookupObjEntity(Gallery.class); - SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp( - "artistName", - "abc")); + ObjEntity galleryEntity = resolver.getObjEntity(Gallery.class); + SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp("artistName", "abc")); q.addPrefetch("paintingArray.toGallery"); SelectQueryPrefetchRouterAction action = new SelectQueryPrefetchRouterAction(); @@ -93,8 +85,6 @@ public class SelectQueryPrefetchRouterAc PrefetchSelectQuery prefetch = (PrefetchSelectQuery) router.getQueries().get(0); assertSame(galleryEntity, prefetch.getRoot()); - assertEquals(Expression - .fromString("db:paintingArray.toArtist.ARTIST_NAME = 'abc'"), prefetch - .getQualifier()); + assertEquals(Expression.fromString("db:paintingArray.toArtist.ARTIST_NAME = 'abc'"), prefetch.getQualifier()); } } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java?rev=1495773&r1=1495772&r2=1495773&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java Sat Jun 22 19:36:53 2013 @@ -215,9 +215,7 @@ public class SelectQueryTest extends Ser public void testSelectAllObjectsRootObjEntity() throws Exception { createArtistsDataSet(); - ObjEntity artistEntity = context - .getEntityResolver() - .lookupObjEntity(Artist.class); + ObjEntity artistEntity = context.getEntityResolver().getObjEntity(Artist.class); SelectQuery query = new SelectQuery(artistEntity); List<?> objects = context.performQuery(query); @@ -245,9 +243,7 @@ public class SelectQueryTest extends Ser public void testSelectNotLikeIgnoreCaseSingleWildcardMatch() throws Exception { createArtistsDataSet(); SelectQuery query = new SelectQuery(Artist.class); - Expression qual = ExpressionFactory.notLikeIgnoreCaseExp( - "artistName", - "aRtIsT11%"); + Expression qual = ExpressionFactory.notLikeIgnoreCaseExp("artistName", "aRtIsT11%"); query.setQualifier(qual); List<?> objects = context.performQuery(query); assertEquals(19, objects.size()); @@ -333,12 +329,11 @@ public class SelectQueryTest extends Ser if (accessStackAdapter.supportsLobs()) { createClobDataSet(); - // see CAY-1539... CLOB column causes suppression of DISTINCT in SQL, and + // see CAY-1539... CLOB column causes suppression of DISTINCT in + // SQL, and // hence the offset processing is done in memory SelectQuery query = new SelectQuery(ClobTestEntity.class); - query.addOrdering( - "db:" + ClobTestEntity.CLOB_TEST_ID_PK_COLUMN, - SortOrder.ASCENDING); + query.addOrdering("db:" + ClobTestEntity.CLOB_TEST_ID_PK_COLUMN, SortOrder.ASCENDING); query.setFetchLimit(1); query.setFetchOffset(1); query.setDistinct(true); @@ -385,9 +380,7 @@ public class SelectQueryTest extends Ser SelectQuery query = new SelectQuery(Artist.class); Expression qual = Expression.fromString("artistName in $list"); query.setQualifier(qual); - query = query.queryWithParameters(Collections.singletonMap("list", new Object[] { - "artist1", "artist2" - })); + query = query.queryWithParameters(Collections.singletonMap("list", new Object[] { "artist1", "artist2" })); List<?> objects = context.performQuery(query); assertEquals(2, objects.size()); } @@ -397,9 +390,7 @@ public class SelectQueryTest extends Ser SelectQuery query = new SelectQuery(Artist.class); Expression qual = Expression.fromString("artistName in $list"); query.setQualifier(qual); - query = query.queryWithParameters(Collections.singletonMap( - "list", - new Object[] {})); + query = query.queryWithParameters(Collections.singletonMap("list", new Object[] {})); List<?> objects = context.performQuery(query); assertEquals(0, objects.size()); } @@ -409,9 +400,7 @@ public class SelectQueryTest extends Ser SelectQuery query = new SelectQuery(Artist.class); Expression qual = Expression.fromString("artistName not in $list"); query.setQualifier(qual); - query = query.queryWithParameters(Collections.singletonMap( - "list", - new Object[] {})); + query = query.queryWithParameters(Collections.singletonMap("list", new Object[] {})); List<?> objects = context.performQuery(query); assertEquals(20, objects.size()); } @@ -453,8 +442,7 @@ public class SelectQueryTest extends Ser createNumericsDataSet(); // to simplify result checking, do double NOT - Expression left = new ASTBitwiseNot(new ASTBitwiseNot(new ASTObjPath( - ReturnTypesMap1.INTEGER_COLUMN_PROPERTY))); + Expression left = new ASTBitwiseNot(new ASTBitwiseNot(new ASTObjPath(ReturnTypesMap1.INTEGER_COLUMN_PROPERTY))); Expression right = new ASTScalar(2); Expression greater = new ASTGreater(); greater.setOperand(0, left); @@ -476,8 +464,8 @@ public class SelectQueryTest extends Ser createNumericsDataSet(); // to simplify result checking, do double NOT - Expression left = new ASTBitwiseOr(new Object[] {new ASTObjPath( - ReturnTypesMap1.INTEGER_COLUMN_PROPERTY), new ASTScalar(1)}); + Expression left = new ASTBitwiseOr(new Object[] { new ASTObjPath(ReturnTypesMap1.INTEGER_COLUMN_PROPERTY), + new ASTScalar(1) }); Expression right = new ASTScalar(1); Expression equal = new ASTEqual(); equal.setOperand(0, left); @@ -499,8 +487,8 @@ public class SelectQueryTest extends Ser createNumericsDataSet(); // to simplify result checking, do double NOT - Expression left = new ASTBitwiseAnd(new Object[] {new ASTObjPath( - ReturnTypesMap1.INTEGER_COLUMN_PROPERTY), new ASTScalar(1)}); + Expression left = new ASTBitwiseAnd(new Object[] { new ASTObjPath(ReturnTypesMap1.INTEGER_COLUMN_PROPERTY), + new ASTScalar(1) }); Expression right = new ASTScalar(0); Expression equal = new ASTEqual(); equal.setOperand(0, left); @@ -522,8 +510,8 @@ public class SelectQueryTest extends Ser createNumericsDataSet(); // to simplify result checking, do double NOT - Expression left = new ASTBitwiseXor(new Object[] {new ASTObjPath( - ReturnTypesMap1.INTEGER_COLUMN_PROPERTY), new ASTScalar(1)}); + Expression left = new ASTBitwiseXor(new Object[] { new ASTObjPath(ReturnTypesMap1.INTEGER_COLUMN_PROPERTY), + new ASTScalar(1) }); Expression right = new ASTScalar(5); Expression equal = new ASTEqual(); equal.setOperand(0, left); @@ -569,16 +557,14 @@ public class SelectQueryTest extends Ser } /** - * Tests that all queries specified in prefetch are executed in a more complex - * prefetch scenario. + * Tests that all queries specified in prefetch are executed in a more + * complex prefetch scenario. */ public void testRouteWithPrefetches() { EntityResolver resolver = context.getEntityResolver(); MockQueryRouter router = new MockQueryRouter(); - SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp( - "artistName", - "a")); + SelectQuery q = new SelectQuery(Artist.class, ExpressionFactory.matchExp("artistName", "a")); q.route(router, resolver, null); assertEquals(1, router.getQueryCount()); @@ -605,26 +591,23 @@ public class SelectQueryTest extends Ser } /** - * Tests that all queries specified in prefetch are executed in a more complex - * prefetch scenario with no reverse obj relationships. + * Tests that all queries specified in prefetch are executed in a more + * complex prefetch scenario with no reverse obj relationships. */ public void testRouteQueryWithPrefetchesNoReverse() { EntityResolver resolver = context.getEntityResolver(); - ObjEntity paintingEntity = resolver.lookupObjEntity(Painting.class); - ObjEntity galleryEntity = resolver.lookupObjEntity(Gallery.class); - ObjEntity artistExhibitEntity = resolver.lookupObjEntity(ArtistExhibit.class); - ObjEntity exhibitEntity = resolver.lookupObjEntity(Exhibit.class); - ObjRelationship paintingToArtistRel = (ObjRelationship) paintingEntity - .getRelationship("toArtist"); + ObjEntity paintingEntity = resolver.getObjEntity(Painting.class); + ObjEntity galleryEntity = resolver.getObjEntity(Gallery.class); + ObjEntity artistExhibitEntity = resolver.getObjEntity(ArtistExhibit.class); + ObjEntity exhibitEntity = resolver.getObjEntity(Exhibit.class); + ObjRelationship paintingToArtistRel = (ObjRelationship) paintingEntity.getRelationship("toArtist"); paintingEntity.removeRelationship("toArtist"); - ObjRelationship galleryToPaintingRel = (ObjRelationship) galleryEntity - .getRelationship("paintingArray"); + ObjRelationship galleryToPaintingRel = (ObjRelationship) galleryEntity.getRelationship("paintingArray"); galleryEntity.removeRelationship("paintingArray"); - ObjRelationship artistExhibitToArtistRel = (ObjRelationship) artistExhibitEntity - .getRelationship("toArtist"); + ObjRelationship artistExhibitToArtistRel = (ObjRelationship) artistExhibitEntity.getRelationship("toArtist"); artistExhibitEntity.removeRelationship("toArtist"); ObjRelationship exhibitToArtistExhibitRel = (ObjRelationship) exhibitEntity @@ -641,8 +624,7 @@ public class SelectQueryTest extends Ser MockQueryRouter router = new MockQueryRouter(); q.route(router, resolver, null); assertEquals(4, router.getQueryCount()); - } - finally { + } finally { paintingEntity.addRelationship(paintingToArtistRel); galleryEntity.addRelationship(galleryToPaintingRel); artistExhibitEntity.addRelationship(artistExhibitToArtistRel); @@ -651,18 +633,21 @@ public class SelectQueryTest extends Ser } /** - * Test prefetching with qualifier on the root query being the path to the prefetch. + * Test prefetching with qualifier on the root query being the path to the + * prefetch. */ public void testRouteQueryWithPrefetchesPrefetchExpressionPath() { - // find the painting not matching the artist (this is the case where such prefetch + // find the painting not matching the artist (this is the case where + // such prefetch // at least makes sense) Expression exp = ExpressionFactory.noMatchExp("toArtist", new Object()); SelectQuery q = new SelectQuery(Painting.class, exp); q.addPrefetch("toArtist"); - // test how prefetches are resolved in this case - this was a stumbling block for + // test how prefetches are resolved in this case - this was a stumbling + // block for // a while EntityResolver resolver = context.getEntityResolver(); MockQueryRouter router = new MockQueryRouter(); @@ -672,18 +657,14 @@ public class SelectQueryTest extends Ser public void testLeftJoinAndPrefetchToMany() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class, ExpressionFactory.matchExp( - "paintingArray+.toGallery", - null)); + SelectQuery query = new SelectQuery(Artist.class, ExpressionFactory.matchExp("paintingArray+.toGallery", null)); query.addPrefetch("artistExhibitArray"); context.performQuery(query); } public void testLeftJoinAndPrefetchToOne() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Painting.class, ExpressionFactory.matchExp( - "toArtist+.artistName", - null)); + SelectQuery query = new SelectQuery(Painting.class, ExpressionFactory.matchExp("toArtist+.artistName", null)); query.addPrefetch("toGallery"); context.performQuery(query); } @@ -701,7 +682,8 @@ public class SelectQueryTest extends Ser SelectQuery query = new SelectQuery(Artist.class); query.setQualifier(ExpressionFactory.matchExp(a2)); - Object res = Cayenne.objectForQuery(context, query);// exception if >1 result + Object res = Cayenne.objectForQuery(context, query);// exception if >1 + // result assertSame(res, a2); assertTrue(query.getQualifier().match(res)); @@ -714,9 +696,7 @@ public class SelectQueryTest extends Ser assertTrue(query.getQualifier().match(a1)); assertTrue(query.getQualifier().match(a3)); - assertEquals( - query.getQualifier(), - ExpressionFactory.matchAnyExp(Arrays.asList(a1, a3))); + assertEquals(query.getQualifier(), ExpressionFactory.matchAnyExp(Arrays.asList(a1, a3))); } public void testSelect_WithOrdering() { @@ -743,16 +723,15 @@ public class SelectQueryTest extends Ser * Tests INs with more than 1000 elements */ public void testSelectLongIn() { - // not all adapters strip INs, so we just make sure query with such qualifier + // not all adapters strip INs, so we just make sure query with such + // qualifier // fires OK Object[] numbers = new String[2009]; for (int i = 0; i < numbers.length; i++) { numbers[i] = "" + i; } - SelectQuery query = new SelectQuery(Artist.class, ExpressionFactory.inExp( - "artistName", - numbers)); + SelectQuery query = new SelectQuery(Artist.class, ExpressionFactory.inExp("artistName", numbers)); context.performQuery(query); }
