You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by th...@apache.org on 2003/06/02 17:18:00 UTC
cvs commit: db-ojb/src/test/org/apache/ojb/odmg UserTestCases.java
thma 2003/06/02 08:18:00
Modified: src/test/org/apache/ojb/broker PerformanceTest.java
ProxyExamples.java MultipleDBTest.java
ObjectCacheTest.java
src/test/org/apache/ojb/odmg UserTestCases.java
Log:
eliminate calls to deprecated API
Revision Changes Path
1.10 +1 -1 db-ojb/src/test/org/apache/ojb/broker/PerformanceTest.java
Index: PerformanceTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PerformanceTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PerformanceTest.java 8 Apr 2003 20:19:27 -0000 1.9
+++ PerformanceTest.java 2 Jun 2003 15:18:00 -0000 1.10
@@ -168,7 +168,7 @@
for (int i = 0; i < articleCount; i++)
{
Object[] pks = {new Integer(offsetId + i)};
- Identity oid = new Identity(PerformanceArticle.class, pks);
+ Identity oid = new Identity(PerformanceArticle.class, PerformanceArticle.class,pks);
PerformanceArticle a = (PerformanceArticle) broker.getObjectByIdentity(oid);
}
1.9 +3 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProxyExamples.java 14 Jan 2003 11:16:20 -0000 1.8
+++ ProxyExamples.java 2 Jun 2003 15:18:00 -0000 1.9
@@ -122,7 +122,7 @@
{
Object[] pkvals = new Object[1];
pkvals[0] = new Integer(i);
- Identity id = new Identity(Article.class, pkvals);
+ Identity id = new Identity(Article.class, InterfaceArticle.class, pkvals);
InterfaceArticle A = (InterfaceArticle) VirtualProxy.createProxy(broker.getPBKey(), ArticleProxy.class, id);
myArticles.add(A);
//System.out.println(A);
@@ -149,7 +149,7 @@
//System.out.println("now playing with product group no. 2");
Object[] pkvals = new Object[1];
pkvals[0] = new Integer(2);
- Identity id = new Identity(ProductGroup.class, pkvals);
+ Identity id = new Identity(ProductGroup.class, ProductGroup.class, pkvals);
InterfaceProductGroup group2 = null;
try
{
@@ -216,7 +216,7 @@
{
Object[] pkvals = new Object[1];
pkvals[0] = new Integer(i);
- Identity id = new Identity(Article.class, pkvals);
+ Identity id = new Identity(Article.class, InterfaceArticle.class, pkvals);
InterfaceArticle A =
(InterfaceArticle) VirtualProxy.createProxy(broker.getPBKey(), getDynamicProxyClass(Article.class), id);
myArticles.add(A);
1.12 +6 -6 db-ojb/src/test/org/apache/ojb/broker/MultipleDBTest.java
Index: MultipleDBTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/MultipleDBTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MultipleDBTest.java 2 Jun 2003 12:52:28 -0000 1.11
+++ MultipleDBTest.java 2 Jun 2003 15:18:00 -0000 1.12
@@ -109,7 +109,7 @@
secPB = PersistenceBrokerFactory.createPersistenceBroker(secKey);
secPB.clearCache();
Object[] pks = {new Integer(fa.getId())};
- Identity oid = new Identity(FarAwayClass.class, pks);
+ Identity oid = new Identity(FarAwayClass.class, FarAwayClass.class, pks);
FarAwayClass fa2 = (FarAwayClass) secPB.getObjectByIdentity(oid);
Assert.assertNotNull("Lookup for article in second DB failed", fa2);
Assert.assertEquals(fa.toString(), fa2.toString());
@@ -118,7 +118,7 @@
defPB = PersistenceBrokerFactory.defaultPersistenceBroker();
defPB.clearCache();
Object[] pks2 = {new Integer(article.getArticleId())};
- Identity oid2 = new Identity(PerformanceArticle.class, pks2);
+ Identity oid2 = new Identity(PerformanceArticle.class, PerformanceArticle.class, pks2);
PerformanceArticle article2 = (PerformanceArticle) defPB.getObjectByIdentity(oid2);
Assert.assertNotNull("Lookup for article in default DB failed", article2);
defPB.close();
@@ -162,7 +162,7 @@
farAwayPB = PersistenceBrokerFactory.createPersistenceBroker(secKey);
farAwayPB.clearCache();
Object[] pks = {new Integer(fa.getId())};
- Identity oid = new Identity(FarAwayClass.class, pks);
+ Identity oid = new Identity(FarAwayClass.class, FarAwayClass.class, pks);
FarAwayClass fa2 = (FarAwayClass) farAwayPB.getObjectByIdentity(oid);
Assert.assertNotNull("Lookup for article in second DB failed", fa2);
Assert.assertEquals(fa.toString(), fa2.toString());
@@ -171,7 +171,7 @@
defaultPB = PersistenceBrokerFactory.defaultPersistenceBroker();
defaultPB.clearCache();
Object[] pks2 = {new Integer(article.getArticleId())};
- Identity oid2 = new Identity(PerformanceArticle.class, pks2);
+ Identity oid2 = new Identity(PerformanceArticle.class, PerformanceArticle.class, pks2);
PerformanceArticle article2 = (PerformanceArticle) defaultPB.getObjectByIdentity(oid2);
Assert.assertNotNull("Lookup for article in default DB failed", article2);
defaultPB.close();
@@ -214,7 +214,7 @@
farAwayPB = PersistenceBrokerFactory.createPersistenceBroker(secKey);
Object[] pks = {new Integer(fa.getId())};
- Identity oid = new Identity(FarAwayClass.class, pks);
+ Identity oid = new Identity(FarAwayClass.class, FarAwayClass.class, pks);
FarAwayClass fa2 = (FarAwayClass) farAwayPB.getObjectByIdentity(oid);
Assert.assertNotNull("Lookup for article in second DB failed", fa2);
Assert.assertEquals(fa.toString(), fa2.toString());
@@ -222,7 +222,7 @@
defaultPB = PersistenceBrokerFactory.defaultPersistenceBroker();
Object[] pks2 = {new Integer(article.getArticleId())};
- Identity oid2 = new Identity(PerformanceArticle.class, pks2);
+ Identity oid2 = new Identity(PerformanceArticle.class, PerformanceArticle.class, pks2);
PerformanceArticle article2 = (PerformanceArticle) defaultPB.getObjectByIdentity(oid2);
Assert.assertNotNull("Lookup for article in default DB failed", article2);
defaultPB.close();
1.4 +2 -2 db-ojb/src/test/org/apache/ojb/broker/ObjectCacheTest.java
Index: ObjectCacheTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ObjectCacheTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ObjectCacheTest.java 30 Mar 2003 15:02:04 -0000 1.3
+++ ObjectCacheTest.java 2 Jun 2003 15:18:00 -0000 1.4
@@ -152,7 +152,7 @@
public void XXXtestCacheIsolation() throws Exception
{
Object[] pk = new Object[] { new Long(42)};
- Identity oid = new Identity(Article.class, pk);
+ Identity oid = new Identity(Article.class, InterfaceArticle.class, pk);
GUID guid = new GUID();
1.11 +3 -3 db-ojb/src/test/org/apache/ojb/odmg/UserTestCases.java
Index: UserTestCases.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/UserTestCases.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UserTestCases.java 14 Mar 2003 10:46:19 -0000 1.10
+++ UserTestCases.java 2 Jun 2003 15:18:00 -0000 1.11
@@ -288,7 +288,7 @@
fail("ODMGException: " + ex.getMessage());
}
// construct an id that does not exist in the database
- Identity id = new Identity(PersonImpl.class, new Integer[]{new Integer(-1)});
+ Identity id = new Identity(PersonImpl.class, Person.class, new Integer[]{new Integer(-1)});
TransactionImpl txn = (TransactionImpl)odmg.newTransaction();
txn.begin();
txn.getObjectByIdentity(id);
@@ -317,7 +317,7 @@
fail("ODMGException: " + ex.getMessage());
}
// construct an id that does not exist in the database
- Identity id = new Identity(Person.class, new Integer[]{new Integer(-1)});
+ Identity id = new Identity(Person.class, Person.class, new Integer[]{new Integer(-1)});
TransactionImpl txn = (TransactionImpl)odmg.newTransaction();
try
{