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 2011/05/14 12:42:47 UTC
svn commit: r1103017 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java
Author: aadamchik
Date: Sat May 14 10:42:47 2011
New Revision: 1103017
URL: http://svn.apache.org/viewvc?rev=1103017&view=rev
Log:
CAY-1564 CayenneCase unit tests conversion(4)
patch by Dzmitry Kazimirchyk - DbEntityTest
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java?rev=1103017&r1=1103016&r2=1103017&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java Sat May 14 10:42:47 2011
@@ -21,12 +21,19 @@ package org.apache.cayenne.map;
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.CayenneCase;
+import org.apache.cayenne.unit.di.server.ServerCase;
+import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.Util;
-public class DbEntityTest extends CayenneCase {
+@UseServerRuntime(ServerCase.TESTMAP_PROJECT)
+public class DbEntityTest extends ServerCase {
+
+ @Inject
+ private ServerRuntime runtime;
public void testSerializability() throws Exception {
DbEntity entity = new DbEntity("entity");
@@ -39,7 +46,7 @@ public class DbEntityTest extends Cayenn
generated.setGenerated(true);
entity.addAttribute(generated);
- DbEntity d2 = (DbEntity) Util.cloneViaSerialization(entity);
+ DbEntity d2 = Util.cloneViaSerialization(entity);
assertNotNull(d2.getPrimaryKeys());
assertEquals(entity.getPrimaryKeys().size(), d2.getPrimaryKeys().size());
@@ -230,7 +237,8 @@ public class DbEntityTest extends Cayenn
}
public void testTranslateToRelatedEntityIndependentPath() {
- DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
+ DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity(
+ "ARTIST");
Expression e1 = Expression.fromString("db:paintingArray");
Expression translated = artistE
@@ -240,7 +248,8 @@ public class DbEntityTest extends Cayenn
}
public void testTranslateToRelatedEntityTrimmedPath() {
- DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
+ DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity(
+ "ARTIST");
Expression e1 = Expression.fromString("db:artistExhibitArray.toExhibit");
Expression translated = artistE
@@ -250,7 +259,8 @@ public class DbEntityTest extends Cayenn
}
public void testTranslateToRelatedEntitySplitHalfWay() {
- DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
+ DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity(
+ "ARTIST");
Expression e1 = Expression
.fromString("db:paintingArray.toPaintingInfo.TEXT_REVIEW");
@@ -265,19 +275,24 @@ public class DbEntityTest extends Cayenn
}
public void testTranslateToRelatedEntityMatchingPath() {
- DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
+ DbEntity artistE = runtime.getDataDomain().getEntityResolver().getDbEntity(
+ "ARTIST");
Expression e1 = Expression.fromString("db:artistExhibitArray.toExhibit");
Expression translated = artistE.translateToRelatedEntity(
e1,
"artistExhibitArray.toExhibit");
- assertEquals("failure: " + translated, Expression
- .fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"), translated);
+ assertEquals(
+ "failure: " + translated,
+ Expression
+ .fromString("db:artistExhibitArray.toArtist.artistExhibitArray.toExhibit"),
+ translated);
}
public void testTranslateToRelatedEntityToOne() {
- DbEntity paintingE = getDomain().getEntityResolver().getDbEntity("PAINTING");
+ DbEntity paintingE = runtime.getDataDomain().getEntityResolver().getDbEntity(
+ "PAINTING");
Expression e1 = Expression.fromString("db:toArtist.ARTIST_NAME = 'aa'");
Expression translated = paintingE.translateToRelatedEntity(e1, "toArtist");