svn commit: r432623 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src: main/java/org/apache/cayenne/query/RefreshQuery.java test/java/org/apache/cayenne/query/RefreshQueryTst.java

[aadamchik]

Author: aadamchik
Date: Fri Aug 18 08:53:45 2006
New Revision: 432623

URL: http://svn.apache.org/viewvc?rev=432623&view=rev
Log:
CAY-632 - extra tests; query code cleanup

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/query/RefreshQuery.java
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/query/RefreshQueryTst.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/query/RefreshQuery.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/query/RefreshQuery.java?rev=432623&r1=432622&r2=432623&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/query/RefreshQuery.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/query/RefreshQuery.java
 Fri Aug 18 08:53:45 2006
@@ -64,7 +64,7 @@
     }
 
     public QueryMetadata getMetaData(EntityResolver resolver) {
-        return null;
+        return new BaseQueryMetadata();
     }
 
     public String getName() {
@@ -72,6 +72,7 @@
     }
 
     public void route(QueryRouter router, EntityResolver resolver, Query 
substitutedQuery) {
+        // noop
     }
 
     public SQLAction createSQLAction(SQLActionVisitor visitor) {

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/query/RefreshQueryTst.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/query/RefreshQueryTst.java?rev=432623&r1=432622&r2=432623&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/query/RefreshQueryTst.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/query/RefreshQueryTst.java
 Fri Aug 18 08:53:45 2006
@@ -25,6 +25,8 @@
 
 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 RefreshQueryTst extends TestCase {
 
@@ -80,5 +82,17 @@
         assertNull(q.getObjects());
         assertNull(q.getQuery());
         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);
     }
 }