brj 2005/03/28 12:16:17
Modified: src/test/org/apache/ojb/broker AnonymousFieldsTest.java
ProxyExamples.java
Log:
replaced deprecated method QueryFactory#newQuery
Revision Changes Path
1.18 +21 -21
db-ojb/src/test/org/apache/ojb/broker/AnonymousFieldsTest.java
Index: AnonymousFieldsTest.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/test/org/apache/ojb/broker/AnonymousFieldsTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AnonymousFieldsTest.java 25 Mar 2005 19:06:28 -0000 1.17
+++ AnonymousFieldsTest.java 28 Mar 2005 20:16:17 -0000 1.18
@@ -58,10 +58,10 @@
broker.commitTransaction();
broker.clearCache();
- Query query = QueryFactory.newQuery(parent);
+ Query query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
- Query groupQuery = QueryFactory.newQuery(group);
+ Query groupQuery = QueryFactory.newQueryByIdentity(group);
ObjectRepository.Group lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(parent);
@@ -81,7 +81,7 @@
broker.commitTransaction();
broker.clearCache();
- query = QueryFactory.newQuery(parent);
+ query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
assertNotNull(parent);
@@ -99,7 +99,7 @@
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
assertNull(parent);
- groupQuery = QueryFactory.newQuery(group);
+ groupQuery = QueryFactory.newQueryByIdentity(group);
lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(lookedUpGroup);
}
@@ -142,10 +142,10 @@
broker.commitTransaction();
broker.clearCache();
- Query query = QueryFactory.newQuery(comp);
+ Query query = QueryFactory.newQueryByIdentity(comp);
comp = (ObjectRepository.ComponentIF) broker.getObjectByQuery(query);
- Query groupQuery = QueryFactory.newQuery(group);
+ Query groupQuery = QueryFactory.newQueryByIdentity(group);
ObjectRepository.Group lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(comp);
@@ -167,7 +167,7 @@
broker.commitTransaction();
broker.clearCache();
- query = QueryFactory.newQuery(comp);
+ query = QueryFactory.newQueryByIdentity(comp);
comp = (ObjectRepository.ComponentIF) broker.getObjectByQuery(query);
assertNotNull(comp);
@@ -189,7 +189,7 @@
comp = (ObjectRepository.ComponentIF) broker.getObjectByQuery(query);
assertNull(comp);
- groupQuery = QueryFactory.newQuery(group);
+ groupQuery = QueryFactory.newQueryByIdentity(group);
lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(lookedUpGroup);
}
@@ -228,10 +228,10 @@
broker.commitTransaction();
broker.clearCache();
- Query query = QueryFactory.newQuery(parent);
+ Query query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
- Query groupQuery = QueryFactory.newQuery(group);
+ Query groupQuery = QueryFactory.newQueryByIdentity(group);
ObjectRepository.Group lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(parent);
@@ -254,7 +254,7 @@
broker.commitTransaction();
//**************************************************
- query = QueryFactory.newQuery(parent);
+ query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
assertNotNull(parent);
@@ -267,7 +267,7 @@
// same with cleared cache
broker.clearCache();
- query = QueryFactory.newQuery(parent);
+ query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
assertNotNull(parent);
@@ -285,7 +285,7 @@
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
assertNull(parent);
- groupQuery = QueryFactory.newQuery(group);
+ groupQuery = QueryFactory.newQueryByIdentity(group);
lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(lookedUpGroup);
}
@@ -323,10 +323,10 @@
broker.commitTransaction();
broker.clearCache();
- Query query = QueryFactory.newQuery(parent);
+ Query query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
- Query groupQuery = QueryFactory.newQuery(group);
+ Query groupQuery = QueryFactory.newQueryByIdentity(group);
ObjectRepository.Group lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(parent);
@@ -368,9 +368,9 @@
// now nothing should happen, because we don't make any changes
broker.clearCache();
- query = QueryFactory.newQuery(parent);
+ query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
- groupQuery = QueryFactory.newQuery(group);
+ groupQuery = QueryFactory.newQueryByIdentity(group);
lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(parent);
assertNotNull(parent.getGroup());
@@ -425,10 +425,10 @@
broker.commitTransaction();
broker.clearCache();
- Query query = QueryFactory.newQuery(parent);
+ Query query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
- Query groupQuery = QueryFactory.newQuery(group);
+ Query groupQuery = QueryFactory.newQueryByIdentity(group);
ObjectRepository.Group lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(parent);
@@ -470,9 +470,9 @@
// now nothing should happen, because we don't make any changes
broker.clearCache();
- query = QueryFactory.newQuery(parent);
+ query = QueryFactory.newQueryByIdentity(parent);
parent = (ObjectRepository.ComponentIF)
broker.getObjectByQuery(query);
- groupQuery = QueryFactory.newQuery(group);
+ groupQuery = QueryFactory.newQueryByIdentity(group);
lookedUpGroup = (ObjectRepository.Group)
broker.getObjectByQuery(groupQuery);
assertNotNull(parent);
assertNotNull(parent.getGroup());
1.21 +2 -2 db-ojb/src/test/org/apache/ojb/broker/ProxyExamples.java
Index: ProxyExamples.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ProxyExamples.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ProxyExamples.java 18 Dec 2004 14:01:16 -0000 1.20
+++ ProxyExamples.java 28 Mar 2005 20:16:17 -0000 1.21
@@ -231,7 +231,7 @@
// a.setArticleId(8888);
a.setArticleName("ProxyExamples.testReferenceProxy article");
- Query q = QueryFactory.newQuery(a);
+ Query q = QueryFactory.newQueryByIdentity(a);
ProductGroup pg = new ProductGroup();
// pg.setId(10);
@@ -326,7 +326,7 @@
// Reload the productgroup
broker.clearCache();
- pg = (ProductGroupWithCollectionProxy)
broker.getObjectByQuery(QueryFactory.newQuery(pg));
+ pg = (ProductGroupWithCollectionProxy)
broker.getObjectByQuery(QueryFactory.newQueryByIdentity(pg));
assertTrue(pg != null);
// Try to load the articles
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
