@@ -104,6 +105,9 @@

1.10 +107 -4 db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataMultithreadedTest.java Index: MetadataMultithreadedTest.java =================================================================== RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataMultithreadedTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- MetadataMultithreadedTest.java 5 Dec 2004 19:55:11 -0000 1.9 +++ MetadataMultithreadedTest.java 11 Mar 2005 17:31:10 -0000 1.10 @@ -2,6 +2,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.Collection; +import java.util.Iterator; import org.apache.commons.lang.ClassUtils; import org.apache.ojb.broker.OJBRuntimeException; @@ -10,8 +12,12 @@ import org.apache.ojb.broker.Person; import org.apache.ojb.broker.Project; import org.apache.ojb.broker.Role; +import org.apache.ojb.broker.Article; +import org.apache.ojb.broker.ProductGroupWithCollectionProxy; +import org.apache.ojb.broker.accesslayer.OJBIterator; import org.apache.ojb.broker.query.Query; import org.apache.ojb.broker.query.QueryByCriteria; +import org.apache.ojb.broker.query.QueryFactory; import org.apache.ojb.broker.sequence.Repository; import org.apache.ojb.broker.util.ClassHelper; import org.apache.ojb.junit.JUnitExtensions; @@ -52,6 +58,10 @@ protected void setUp() throws Exception { super.setUp(); + MetadataManager mm = ojb.getMetadataManager(); + // enable the per thread changes of metadata + mm.setEnablePerThreadChanges(true); + defaultRepository = mm.copyOfGlobalRepository(); } protected void tearDown() throws Exception @@ -65,6 +75,70 @@ return oldTestObjectString; } + public void testProxiedLoading() throws Exception + { + PersistenceBroker broker = null; + try + { + MetadataManager mm = ojb.getMetadataManager(); + // Store the current repository mappings under a profile key + DescriptorRepository repository = mm.getRepository(); + String profileKey = "TestMappings"; + mm.addProfile(profileKey, repository); + + // "Destroy" this thread's mappings + mm.setDescriptor(defaultRepository); + + ProductGroupWithCollectionProxy pgTemplate = new ProductGroupWithCollectionProxy(); + pgTemplate.setGroupId(new Integer(6)); + Query query = QueryFactory.newQueryByExample(pgTemplate); + + broker = ojb.lookupBroker(); + Collection groups; + OJBIterator groupIter; + ProductGroupWithCollectionProxy pg; + + assertNotNull(groupIter = broker.getIteratorByQuery(query)); + assertTrue(groupIter.hasNext()); + + // We have not named any OJB profiles, so using dynamic proxies at this stage is not + // supported + Throwable expectedThrowable = null; + try { + System.err.println("------ The following exception is part of the tests..."); + groupIter.next(); + } catch (Throwable t) { + expectedThrowable = t; + System.err.println("------"); + } + assertNotNull("Should get metadata exception from proxy", expectedThrowable); + groupIter.releaseDbResources(); + + // Load the repository profile and re-try loading. + Iterator proxyIter; + broker.clearCache(); + mm.loadProfile(profileKey); + assertNotNull(groups = broker.getCollectionByQuery(query)); + assertEquals(1, groups.size()); + assertNotNull(proxyIter = groups.iterator()); + assertTrue(proxyIter.hasNext()); + assertNotNull(pg = (ProductGroupWithCollectionProxy) proxyIter.next()); + assertFalse(proxyIter.hasNext()); + assertEquals(pgTemplate.getGroupId(), pg.getGroupId()); + Collection articles; + assertNotNull(articles = pg.getAllArticlesInGroup()); + assertEquals(6, articles.size()); + + TestCaseRunnable tct [] = new TestCaseRunnable[]{new LazyLoading(articles)}; + runTestCaseRunnables(tct); + } + finally + { + if (broker != null) broker.close(); + } + + } + public void testRuntimeMetadataChanges() throws Exception { int loops = 7; @@ -77,9 +151,6 @@ try { MetadataManager mm = ojb.getMetadataManager(); - // enable the per thread changes of metadata - mm.setEnablePerThreadChanges(true); - defaultRepository = mm.copyOfGlobalRepository(); mm.setDescriptor(defaultRepository); ClassDescriptor cld; @@ -378,4 +449,36 @@ } } } + + /** + * Inner test class for lazy materialization of CollectionProxy in different thread. + */ + protected class LazyLoading extends JUnitExtensions.MultiThreadedTestCase.TestCaseRunnable + { + private Collection articles; + + public LazyLoading(Collection articles) + { + assertNotNull(this.articles = articles); + } + + public void runTestCase() throws Throwable + { + // Explicitly clear descriptor repository in this thread (similar to loading + // profile with unrelated class-mappings). + DescriptorRepository dr = new DescriptorRepository(); + MetadataManager.getInstance().setDescriptor(dr); + Article article; + int numArticles = 0; + for (Iterator iterator = articles.iterator(); iterator.hasNext();) + { + assertNotNull(article = (Article) iterator.next()); + assertNotNull(article.getArticleId()); + assertFalse(new Integer(0).equals(article.getArticleId())); + numArticles++; + } + assertEquals(6, numArticles); + } + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org