arminw 2005/09/26 09:49:36
Modified: src/test/org/apache/ojb/broker Tag: OJB_1_0_RELEASE
AnonymousFieldsTest.java
Log:
merge with HEAD
Revision Changes Path
No revision
No revision
1.14.2.3 +87 -4
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.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- AnonymousFieldsTest.java 18 Sep 2005 13:08:52 -0000 1.14.2.2
+++ AnonymousFieldsTest.java 26 Sep 2005 16:49:36 -0000 1.14.2.3
@@ -672,7 +672,23 @@
/**
* Query Attribute of Super class E-F
*/
- public void testQuerySuperField()
+ public void testQuerySuperField_WithCache()
+ {
+ doTestQuerySuperField(false);
+ }
+
+ /**
+ * Query Attribute of Super class E-F
+ */
+ public void testQuerySuperField_ClearedCache()
+ {
+ doTestQuerySuperField(true);
+ }
+
+ /**
+ * Query Attribute of Super class E-F
+ */
+ public void doTestQuerySuperField(boolean clearCache)
{
int data1 = (int) (Math.random() * Integer.MAX_VALUE);
int data2 = (int) (Math.random() * Integer.MAX_VALUE);
@@ -696,7 +712,8 @@
broker.commitTransaction();
- broker.clearCache();
+ if(clearCache) broker.clearCache();
+
Criteria c = new Criteria();
c.addEqualTo("someSuperValue", new Integer(data2));
Query q = QueryFactory.newQuery(ObjectRepository.F.class, c);
@@ -710,7 +727,23 @@
/**
* Query Attribute of Super class E-F-G
*/
- public void testQuerySuperField2()
+ public void testQuerySuperField_2_WithCache()
+ {
+ doTestQuerySuperField_2(false);
+ }
+
+ /**
+ * Query Attribute of Super class E-F-G
+ */
+ public void testQuerySuperField_2_ClearedCache()
+ {
+ doTestQuerySuperField_2(true);
+ }
+
+ /**
+ * Query Attribute of Super class E-F-G
+ */
+ public void doTestQuerySuperField_2(boolean clearCache)
{
int data1 = (int) (Math.random() * Integer.MAX_VALUE);
int data2 = (int) (Math.random() * Integer.MAX_VALUE);
@@ -735,7 +768,7 @@
broker.store(g3);
broker.commitTransaction();
- broker.clearCache();
+ if(clearCache) broker.clearCache();
Criteria c = new Criteria();
c.addEqualTo("someSuperValue", new Integer(data2));
Query q = QueryFactory.newQuery(ObjectRepository.G.class, c);
@@ -755,6 +788,7 @@
broker.beginTransaction();
broker.store(entry);
broker.commitTransaction();
+
Integer id = entry.getId();
broker.clearCache();
entry = (F1) findById(ObjectRepository.F1.class, id.intValue());
@@ -763,6 +797,55 @@
assertEquals(2, entry.getSomeValue());
}
+ public void testMultipleJoinedInheritanceAndExtentsWithCache()
+ {
+ ObjectRepository.F1 entry = new ObjectRepository.F1();
+ entry.setSomeSuperValue(1);
+ entry.setSomeValue(2);
+ broker.beginTransaction();
+ broker.store(entry);
+ broker.commitTransaction();
+
+ Integer id = entry.getId();
+ entry = (F1) findById(ObjectRepository.F1.class, id.intValue());
+ assertEquals(id, entry.getId());
+ assertEquals(1, entry.getSomeSuperValue());
+ assertEquals(2, entry.getSomeValue());
+ }
+
+ public void testMultipleJoinedInheritanceAndExtents_2()
+ {
+ ObjectRepository.F1 entry = new ObjectRepository.F1();
+ entry.setSomeSuperValue(1);
+ entry.setSomeValue(2);
+ broker.beginTransaction();
+ broker.store(entry);
+ broker.commitTransaction();
+
+ Integer id = entry.getId();
+ broker.clearCache();
+ entry = (F1) findById(ObjectRepository.E.class, id.intValue());
+ assertEquals(id, entry.getId());
+ assertEquals(1, entry.getSomeSuperValue());
+ assertEquals(2, entry.getSomeValue());
+ }
+
+ public void testMultipleJoinedInheritanceAndExtents_2_WithCache()
+ {
+ ObjectRepository.F1 entry = new ObjectRepository.F1();
+ entry.setSomeSuperValue(1);
+ entry.setSomeValue(2);
+ broker.beginTransaction();
+ broker.store(entry);
+ broker.commitTransaction();
+
+ Integer id = entry.getId();
+ entry = (F1) findById(ObjectRepository.E.class, id.intValue());
+ assertEquals(id, entry.getId());
+ assertEquals(1, entry.getSomeSuperValue());
+ assertEquals(2, entry.getSomeValue());
+ }
+
//
--------------------------------------------------------------------------------------
// Utiltity methods.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
