Author: arminw
Date: Wed Oct 4 04:12:43 2006
New Revision: 452833
URL: http://svn.apache.org/viewvc?view=rev&rev=452833
Log:
use IdentityFactory
Modified:
db/ojb/trunk/src/test/org/apache/ojb/broker/M2NGraphTest.java
db/ojb/trunk/src/test/org/apache/ojb/broker/MtoNTest.java
Modified: db/ojb/trunk/src/test/org/apache/ojb/broker/M2NGraphTest.java
URL:
http://svn.apache.org/viewvc/db/ojb/trunk/src/test/org/apache/ojb/broker/M2NGraphTest.java?view=diff&rev=452833&r1=452832&r2=452833
==============================================================================
--- db/ojb/trunk/src/test/org/apache/ojb/broker/M2NGraphTest.java (original)
+++ db/ojb/trunk/src/test/org/apache/ojb/broker/M2NGraphTest.java Wed Oct 4
04:12:43 2006
@@ -74,9 +74,9 @@
broker.commitTransaction();
//===============================================
- Identity oidA = new Identity(nodeA, broker);
- Identity oidB = new Identity(nodeB, broker);
- Identity oidC = new Identity(nodeC, broker);
+ Identity oidA = broker.serviceIdentity().buildIdentity(nodeA);
+ Identity oidB = broker.serviceIdentity().buildIdentity(nodeB);
+ Identity oidC = broker.serviceIdentity().buildIdentity(nodeC);
broker.clearCache();
@@ -168,9 +168,9 @@
broker.commitTransaction();
//===============================================
- Identity oidA = new Identity(nodeA, broker);
- Identity oidB = new Identity(nodeB, broker);
- Identity oidC = new Identity(nodeC, broker);
+ Identity oidA = broker.serviceIdentity().buildIdentity(nodeA);
+ Identity oidB = broker.serviceIdentity().buildIdentity(nodeB);
+ Identity oidC = broker.serviceIdentity().buildIdentity(nodeC);
broker.clearCache();
@@ -259,8 +259,8 @@
broker.commitTransaction();
//===============================================
- Identity oidA = new Identity(nodeA, broker);
- Identity oidB = new Identity(nodeB, broker);
+ Identity oidA = broker.serviceIdentity().buildIdentity(nodeA);
+ Identity oidB = broker.serviceIdentity().buildIdentity(nodeB);
broker.clearCache();
Modified: db/ojb/trunk/src/test/org/apache/ojb/broker/MtoNTest.java
URL:
http://svn.apache.org/viewvc/db/ojb/trunk/src/test/org/apache/ojb/broker/MtoNTest.java?view=diff&rev=452833&r1=452832&r2=452833
==============================================================================
--- db/ojb/trunk/src/test/org/apache/ojb/broker/MtoNTest.java (original)
+++ db/ojb/trunk/src/test/org/apache/ojb/broker/MtoNTest.java Wed Oct 4
04:12:43 2006
@@ -49,9 +49,9 @@
broker.store(qual1);
broker.store(qual2);
broker.store(paper);
- Identity paperId = new Identity(paper, broker);
broker.commitTransaction();
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
// sanity check
broker.clearCache();
broker.beginTransaction();
@@ -89,9 +89,9 @@
// store paper and set indirection table, ignore new Qualifier
// object. Will cause Key Constraint Exception when constraint are
set
broker.store(paper);
- Identity paperId = new Identity(paper, broker);
broker.commitTransaction();
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
broker.clearCache();
broker.beginTransaction();
Paper retPaper = (Paper) broker.getObjectByIdentity(paperId);
@@ -165,9 +165,9 @@
paper.setQualifiers(Arrays.asList(new Qualifier[] { qual }));
broker.beginTransaction();
broker.store(paper); // store Paper, intermediary and
Qualifier
- Identity paperId = new Identity(paper, broker);
broker.commitTransaction();
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
broker.clearCache();
broker.beginTransaction();
Paper retPaper = (Paper) broker.getObjectByIdentity(paperId);
@@ -193,7 +193,7 @@
try
{
Paper paper = createPaper();
- Identity paperId = new Identity(paper, broker);
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
List qualifiers = paper.getQualifiers();
Qualifier qual1 = (Qualifier) qualifiers.get(0);
Qualifier qual2 = (Qualifier) qualifiers.get(1);
@@ -210,8 +210,8 @@
assertEquals(1, retPaper.getQualifiers().size());
// target object qual1 should NOT be deleted
- Qualifier retQual1 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual1, broker));
- Qualifier retQual2 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual2, broker));
+ Qualifier retQual1 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual1));
+ Qualifier retQual2 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual2));
assertNotNull(retQual1);
assertNotNull(retQual2);
@@ -240,7 +240,7 @@
List qualifiers = paper.getQualifiers();
Qualifier qual1 = (Qualifier) qualifiers.get(0);
Qualifier qual2 = (Qualifier) qualifiers.get(1);
- Identity paperId = new Identity(paper, broker);
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
// remove first object
qualifiers.remove(0);
@@ -254,8 +254,8 @@
assertEquals(1, retPaper.getQualifiers().size());
// target object qual1 should be deleted
- Qualifier retQual1 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual1, broker));
- Qualifier retQual2 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual2, broker));
+ Qualifier retQual1 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual1));
+ Qualifier retQual2 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual2));
assertNull(retQual1);
assertNotNull(retQual2);
@@ -271,7 +271,7 @@
public void testDeletionFromIntermediaryTableWithNullList()
{
Paper paper = createPaper();
- Identity paperId = new Identity(paper, broker);
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
List qualifiers = paper.getQualifiers();
Qualifier qual1 = (Qualifier) qualifiers.get(0);
Qualifier qual2 = (Qualifier) qualifiers.get(1);
@@ -288,8 +288,8 @@
assertEquals(0, retPaper.getQualifiers().size());
// target objects should NOT be deleted
- Qualifier retQual1 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual1, broker));
- Qualifier retQual2 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual2, broker));
+ Qualifier retQual1 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual1));
+ Qualifier retQual2 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual2));
assertNotNull(retQual1);
assertNotNull(retQual2);
@@ -300,7 +300,7 @@
public void testDeletionWithClearedList()
{
Paper paper = createPaper();
- Identity paperId = new Identity(paper, broker);
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
List qualifiers = paper.getQualifiers();
Qualifier qual1 = (Qualifier) qualifiers.get(0);
Qualifier qual2 = (Qualifier) qualifiers.get(1);
@@ -317,8 +317,8 @@
assertEquals(0, retPaper.getQualifiers().size());
// target objects should NOT be deleted
- Qualifier retQual1 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual1, broker));
- Qualifier retQual2 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual2, broker));
+ Qualifier retQual1 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual1));
+ Qualifier retQual2 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual2));
assertNotNull(retQual1);
assertNotNull(retQual2);
@@ -329,7 +329,7 @@
public void testDeletionFromIntermediaryTableWithEmptyList()
{
Paper paper = createPaper();
- Identity paperId = new Identity(paper, broker);
+ Identity paperId = broker.serviceIdentity().buildIdentity(paper);
List qualifiers = paper.getQualifiers();
Qualifier qual1 = (Qualifier) qualifiers.get(0);
Qualifier qual2 = (Qualifier) qualifiers.get(1);
@@ -346,8 +346,8 @@
assertEquals(0, retPaper.getQualifiers().size());
// target objects should NOT be deleted
- Qualifier retQual1 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual1, broker));
- Qualifier retQual2 = (Qualifier) broker.getObjectByIdentity(new
Identity(qual2, broker));
+ Qualifier retQual1 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual1));
+ Qualifier retQual2 = (Qualifier)
broker.getObjectByIdentity(broker.serviceIdentity().buildIdentity(qual2));
assertNotNull(retQual1);
assertNotNull(retQual2);
@@ -356,48 +356,47 @@
}
- public void testDeleteMtoNImplementor()
- throws Exception
- {
- News newsId2 = new News(2);
- Identity id = new Identity(newsId2,broker);
- News newNews = (News) broker.getObjectByIdentity(id);
- int size = newNews.getQualifiers().size();
-
- Category categoryId1 = new Category(1);
-
- broker.beginTransaction();
- MtoNImplementor m2n = new MtoNImplementor(broker, "qualifiers",
newsId2, categoryId1);
- broker.deleteMtoNImplementor(m2n);
- broker.commitTransaction();
-
- broker.clearCache();
- newNews = (News) broker.getObjectByIdentity(id);
-
- assertEquals(size - 1,newNews.getQualifiers().size());
- }
-
- public void testStoreMtoNImplementor()
- throws Exception
- {
- News newsId2 = new News(2);
- Category categoryId2 = new Category(2);
-
- Identity id = new Identity(newsId2,broker);
- News newNews = (News) broker.getObjectByIdentity(id);
- int size = newNews.getQualifiers().size();
-
- MtoNImplementor m2n = new MtoNImplementor(broker, "qualifiers",
newsId2,categoryId2);
- broker.beginTransaction();
- broker.addMtoNImplementor(m2n);
- broker.commitTransaction();
-
- broker.clearCache();
- newNews = (News) broker.getObjectByIdentity(id);
-
- assertEquals(size + 1,newNews.getQualifiers().size());
-
- }
+// public void testDeleteMtoNImplementor()
+// throws Exception
+// {
+//
+// Identity id =
broker.serviceIdentity().buildIdentity(News.class, new Integer(2));
+// News newNews = (News) broker.getObjectByIdentity(id);
+// int size = newNews.getQualifiers().size();
+//
+// Category categoryId1 = new Category(1);
+//
+// broker.beginTransaction();
+// MtoNImplementor m2n = new MtoNImplementor(broker, "qualifiers",
newNews, categoryId1);
+// broker.deleteMtoNImplementor(m2n);
+// broker.commitTransaction();
+//
+// broker.clearCache();
+// newNews = (News) broker.getObjectByIdentity(id);
+//
+// assertEquals(size - 1,newNews.getQualifiers().size());
+// }
+//
+// public void testStoreMtoNImplementor()
+// throws Exception
+// {
+// Category categoryId2 = new Category(2);
+//
+// Identity id =
broker.serviceIdentity().buildIdentity(News.class, new Integer(2));
+// News newNews = (News) broker.getObjectByIdentity(id);
+// int size = newNews.getQualifiers().size();
+//
+// MtoNImplementor m2n = new MtoNImplementor(broker, "qualifiers",
newNews,categoryId2);
+// broker.beginTransaction();
+// broker.addMtoNImplementor(m2n);
+// broker.commitTransaction();
+//
+// broker.clearCache();
+// newNews = (News) broker.getObjectByIdentity(id);
+//
+// assertEquals(size + 1,newNews.getQualifiers().size());
+//
+// }
// Bidirectional m:n relationship using Collection
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
