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 ar...@apache.org on 2003/01/14 12:16:23 UTC

cvs commit: jakarta-ojb/src/test/org/apache/ojb/broker/sequence SequenceManagerTest.java

arminw      2003/01/14 03:16:21

  Modified:    src/test/org/apache/ojb repository_database.xml
               src/test/org/apache/ojb/odmg OQLOrOnForeignKeyTest.java
                        OneToManyTest.java OdmgExamples.java
                        MultiDBUsageTest.java
               src/test/org/apache/ojb/faraway-db OJB_FarAway.script
               src/test/org/apache/ojb/broker QueryTest.java
                        ProxyExamples.java LogServiceTest.java
                        GraphTest.java AutomaticForeignKeys.java
               src/test/org/apache/ojb/broker/sequence
                        SequenceManagerTest.java
  Log:
  update, fix test cases
  - no longer use deprecated Identity constructor
  
  Revision  Changes    Path
  1.7       +1 -1      jakarta-ojb/src/test/org/apache/ojb/repository_database.xml
  
  Index: repository_database.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/repository_database.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- repository_database.xml	10 Jan 2003 11:35:27 -0000	1.6
  +++ repository_database.xml	14 Jan 2003 11:16:19 -0000	1.7
  @@ -33,7 +33,7 @@
               maxActive="21"
               validationQuery="" />
   
  -        <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
  +        <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerInMemoryImpl">
               <attribute attribute-name="grabSize" attribute-value="20"/>
           </sequence-manager>
      </jdbc-connection-descriptor>
  
  
  
  1.4       +10 -2     jakarta-ojb/src/test/org/apache/ojb/odmg/OQLOrOnForeignKeyTest.java
  
  Index: OQLOrOnForeignKeyTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/odmg/OQLOrOnForeignKeyTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OQLOrOnForeignKeyTest.java	10 Jan 2003 17:04:34 -0000	1.3
  +++ OQLOrOnForeignKeyTest.java	14 Jan 2003 11:16:20 -0000	1.4
  @@ -169,9 +169,9 @@
   
   
   		Implementation odmg = OJB.getInstance();
  -
   		Database db = odmg.newDatabase();
   		db.open(databaseName, Database.OPEN_READ_WRITE);
  +
   		Transaction tx = odmg.newTransaction();
   		tx.begin();
   		db.makePersistent(father);
  @@ -188,9 +188,10 @@
   		query.bind(new Integer(motherID));
   		query.bind(new Integer(fatherID));
   		List persons = (List) query.execute();
  -		assertEquals(2, persons.size());
  +        assertEquals(2, persons.size());
   		tx.commit();
   
  +
   	}
   
   	public void testOrReferenceOnDifferentTables() throws Exception
  @@ -239,4 +240,11 @@
   		tx.commit();
   
   	}
  +
  +    public static void main(String[] args)
  +    {
  +        String[] arr = {OQLOrOnForeignKeyTest.class.getName()};
  +        junit.textui.TestRunner.main(arr);
  +    }
  +
   }
  
  
  
  1.5       +2 -1      jakarta-ojb/src/test/org/apache/ojb/odmg/OneToManyTest.java
  
  Index: OneToManyTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/odmg/OneToManyTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OneToManyTest.java	9 Jan 2003 17:25:19 -0000	1.4
  +++ OneToManyTest.java	14 Jan 2003 11:16:20 -0000	1.5
  @@ -130,6 +130,7 @@
           Database db = odmg.newDatabase();
           db.open(databaseName, Database.OPEN_READ_WRITE);
           Transaction tx = odmg.newTransaction();
  +        tx.begin();
           /**
            * 1. get all articles from groups and add a new article.
            */
  @@ -141,7 +142,7 @@
           /**
            * to each productgroup add an article with a pre-determined name.
            */
  -        tx.begin();
  +
           int i = 2300;
           while (it.hasNext())
           {
  
  
  
  1.10      +11 -9     jakarta-ojb/src/test/org/apache/ojb/odmg/OdmgExamples.java
  
  Index: OdmgExamples.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/odmg/OdmgExamples.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- OdmgExamples.java	9 Jan 2003 18:38:34 -0000	1.9
  +++ OdmgExamples.java	14 Jan 2003 11:16:20 -0000	1.10
  @@ -180,7 +180,7 @@
               // 1. get OID
               Article example = new Article();
               example.setArticleId(60);
  -            Identity oid = new Identity(example);
  +            Identity oid = new Identity(example, ((TransactionImpl) tx).getBroker());
               // 2. lookup object by OID
               PersistenceBroker broker = ((TransactionImpl) tx).getBroker();
               broker.clearCache();
  @@ -224,19 +224,21 @@
           }
           Transaction tx = odmg.newTransaction();
   
  -        //perform transaction
  -
  +        // perform transaction
           tx.begin();
   
           OQLQuery query = odmg.newOQLQuery();
  +        // use 'like' instead of '=' when perform query with wildcards
           query.create(
  -                "select anArticle from " + Article.class.getName() + " where productGroup.groupName=\"Frui*\"");
  +                "select anArticle from " + Article.class.getName() + " where productGroup.groupName like \"Fruit*\"");
           List results = (List) query.execute();
   
           // crosscheck
           query = odmg.newOQLQuery();
  -        query.create("select aPG from " + ProductGroup.class.getName() + " where groupName=\"Fruit?\"");
  +        query.create("select aPG from " + ProductGroup.class.getName() + " where groupName like \"Fruit*\"");
           List check = (List) query.execute();
  +        if(check.size() < 1) fail("Could not found ProductGroup's for: "+
  +                "select aPG from " + ProductGroup.class.getName() + " where groupName like \"Fruit*\"");
           ProductGroup pg = (ProductGroup) check.get(0);
   
           assertEquals(pg.getAllArticlesInGroup().size(), results.size());
  @@ -349,7 +351,7 @@
               // 1. get OID
               Article example = new Article();
               example.setArticleId(30);
  -            Identity oid = new Identity(example);
  +            Identity oid = new Identity(example,((TransactionImpl) tx).getBroker());
   
               // 2. lookup object by OID
               PersistenceBroker broker = ((TransactionImpl) tx).getBroker();
  @@ -379,7 +381,7 @@
           }
       }
   
  -    public void tesOQLQueryOnCollections() throws Exception
  +    public void YYYtestOQLQueryOnCollections() throws Exception
       {
           // get facade instance
           Implementation odmg = OJB.getInstance();
  @@ -419,7 +421,7 @@
       }
   
       /**try to open non-existing db*/
  -    public void tesWrongDbName()
  +    public void YYYtestWrongDbName()
       {
           // get facade instance
           Implementation objectserver = OJB.getInstance();
  @@ -439,7 +441,7 @@
       }
   
       /**try to crash odmg and broker tx*/
  -    public void tesBrokerCrash()
  +    public void YYYtestBrokerCrash()
       {
           // get facade instance
           Implementation odmg = OJB.getInstance();
  
  
  
  1.5       +2 -6      jakarta-ojb/src/test/org/apache/ojb/odmg/MultiDBUsageTest.java
  
  Index: MultiDBUsageTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/odmg/MultiDBUsageTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MultiDBUsageTest.java	9 Jan 2003 17:25:18 -0000	1.4
  +++ MultiDBUsageTest.java	14 Jan 2003 11:16:20 -0000	1.5
  @@ -28,8 +28,6 @@
    */
   public class MultiDBUsageTest extends TestCase
   {
  -    private static String databaseName_2;
  -    private String databaseName_1;
       private Implementation odmg_1;
       private Database db_1;
       private Implementation odmg_2;
  @@ -43,16 +41,14 @@
       public void setUp() throws Exception
       {
           super.setUp();
  -        databaseName_1 = TestHelper.DEF_DATABASE_NAME;
  -        databaseName_2 = TestHelper.FAR_AWAY_DATABASE_NAME;
   
           odmg_1 = OJB.getInstance();
           db_1 = odmg_1.newDatabase();
  -        db_1.open(databaseName_1, Database.OPEN_READ_WRITE);
  +        db_1.open(TestHelper.DEF_DATABASE_NAME, Database.OPEN_READ_WRITE);
   
           odmg_2 = OJB.getInstance();
           db_2 = odmg_2.newDatabase();
  -        db_2.open(databaseName_2, Database.OPEN_READ_WRITE);
  +        db_2.open(TestHelper.FAR_AWAY_DATABASE_NAME, Database.OPEN_READ_WRITE);
       }
   
       protected void tearDown() throws Exception
  
  
  
  1.4       +9 -1      jakarta-ojb/src/test/org/apache/ojb/faraway-db/OJB_FarAway.script
  
  Index: OJB_FarAway.script
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/faraway-db/OJB_FarAway.script,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OJB_FarAway.script	9 Jan 2003 17:25:17 -0000	1.3
  +++ OJB_FarAway.script	14 Jan 2003 11:16:20 -0000	1.4
  @@ -1,6 +1,14 @@
   CREATE TABLE FAR_AWAY(ID INTEGER PRIMARY KEY,NAME VARCHAR(50),DESCRIPTION VARCHAR(250), REFERENCE_ID INTEGER)
   CREATE TABLE FAR_AWAY_REFERENCE(ID INTEGER PRIMARY KEY,NAME VARCHAR(50))
  -CREATE TABLE OJB_HL_SEQ(TABLENAME VARCHAR(175) NOT NULL,FIELDNAME VARCHAR(70) NOT NULL,MAX_KEY INTEGER,GRAB_SIZE INTEGER,CONSTRAINT SYS_PK_OJB_HL_SEQ PRIMARY KEY(TABLENAME,FIELDNAME))
  +CREATE TABLE OJB_HL_SEQ(TABLENAME VARCHAR(175) NOT NULL,FIELDNAME VARCHAR(70) NOT NULL,MAX_KEY INTEGER,GRAB_SIZE INTEGER,CONSTRAINT SYS_PK_OJB_HL_SEQ PRIMARY KEY(TABLENAME,FIELDNAME))
  +CREATE TABLE OJB_LOCKENTRY(OID_ VARCHAR(250) NOT NULL,TX_ID VARCHAR(50) NOT NULL,TIMESTAMP_ TIMESTAMP,ISOLATIONLEVEL INTEGER,LOCKTYPE INTEGER,CONSTRAINT SYS_PK_OJB_LOCKENTRY PRIMARY KEY(OID_,TX_ID))
  +CREATE TABLE OJB_NRM(NAME VARCHAR(250) NOT NULL PRIMARY KEY,OID_ LONGVARBINARY)
  +CREATE TABLE OJB_DLIST(ID INTEGER NOT NULL PRIMARY KEY,SIZE_ INTEGER)
  +CREATE TABLE OJB_DLIST_ENTRIES(ID INTEGER NOT NULL PRIMARY KEY,DLIST_ID INTEGER,POSITION_ INTEGER,OID_ LONGVARBINARY)
  +CREATE TABLE OJB_DSET(ID INTEGER NOT NULL PRIMARY KEY,SIZE_ INTEGER)
  +CREATE TABLE OJB_DSET_ENTRIES(ID INTEGER NOT NULL PRIMARY KEY,DLIST_ID INTEGER,POSITION_ INTEGER,OID_ LONGVARBINARY)
  +CREATE TABLE OJB_DMAP(ID INTEGER NOT NULL PRIMARY KEY,SIZE_ INTEGER)
  +CREATE TABLE OJB_DMAP_ENTRIES(ID INTEGER NOT NULL PRIMARY KEY,DMAP_ID INTEGER,KEY_OID LONGVARBINARY,VALUE_OID LONGVARBINARY)
   GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC
   GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
   CREATE USER SA PASSWORD "" ADMIN
  
  
  
  1.18      +88 -3     jakarta-ojb/src/test/org/apache/ojb/broker/QueryTest.java
  
  Index: QueryTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/broker/QueryTest.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- QueryTest.java	24 Dec 2002 14:06:45 -0000	1.17
  +++ QueryTest.java	14 Jan 2003 11:16:20 -0000	1.18
  @@ -1,3 +1,4 @@
  +
   package org.apache.ojb.broker;
   
   import junit.framework.TestCase;
  @@ -86,8 +87,20 @@
   	public void testSubQuery2()
   	{
   		Collection results = null;
  +        String stamp = ""+System.currentTimeMillis();
  +        int loops = 10;
  +        // create ProductGroups without article
  +        broker.beginTransaction();
  +        for (int i=0; i<loops;i++)
  +        {
  +            ProductGroup pg = new ProductGroup();
  +            pg.setGroupName("test group "+stamp);
  +            pg.setDescription("build by QueryTest#testSubQuery2");
  +            broker.store(pg);
  +        }
  +        broker.commitTransaction();
   
  -		ReportQueryByCriteria subQuery;
  +        ReportQueryByCriteria subQuery;
   		Criteria subCrit = new Criteria();
   		Criteria crit = new Criteria();
   
  @@ -95,13 +108,14 @@
   		subQuery.setColumns(new String[]{"productGroupId"});
   		subQuery.setDistinct(true);
   
  +		crit.addEqualTo("groupName", "test group "+stamp);
   		crit.addNotIn("groupId", subQuery);
   		Query q = QueryFactory.newQuery(ProductGroup.class, crit);
   
   		results = broker.getCollectionByQuery(q);
   		assertNotNull(results);
   		System.out.println("*** Found " + results.size() + " empty ProductGroups ***");
  -//			assertTrue(results.size() == 6);
  +        assertEquals("Result of the query with sub-query does not match", loops, results.size());
   
   	}
   
  @@ -699,4 +713,75 @@
   
   	}
   
  -}
  \ No newline at end of file
  +    /**
  +     * Run a query range test that includes one record less than the
  +     * total number of records that exist.
  +     */
  +    public void testQueryRangeOneLessThanTotal() {
  +        this.runQueryRangeTest(-1);
  +    }
  +
  +    /**
  +     * Run a query range test that includes all of the records that exist.
  +     */
  +    public void testQueryRangeAllRecords() {
  +        this.runQueryRangeTest(0);
  +    }
  +
  +    /**
  +     * Run a query range test that includes one record more than the
  +     * total number of records that exist.
  +     */
  +    public void testQueryRangeOneMoreThanTotal() {
  +        this.runQueryRangeTest(+1);
  +    }
  +
  +    /**
  +     * Run a query range test.
  +     *
  +     * @param delta the amount to add to the existing record count when
  +     *      setting the start/end index for the query that we'll use.
  +     */
  +    private void runQueryRangeTest(int delta) {
  +
  +        // How many records are there in the table?
  +        Query countQuery =
  +            QueryFactory.newQuery(ProductGroup.class,
  +                                  null,
  +                                  false);
  +
  +        // Get the existing record count
  +        int recordCount =
  +            broker.getCollectionByQuery(countQuery)
  +                  .toArray()
  +                  .length;
  +
  +        // Build a query that will get the range we're looking for.
  +        Query listQuery =
  +            QueryFactory.newQuery(ProductGroup.class,
  +                                  null,
  +                                  false);
  +        listQuery.setStartAtIndex(0);
  +        listQuery.setEndAtIndex(recordCount + delta);
  +
  +        // Get the list.
  +        Object[] theObjects =
  +            broker.getCollectionByQuery(listQuery)
  +                  .toArray();
  +
  +        // Verify the record count
  +        if (delta <= 0) {
  +            this.assertEquals("record count",
  +                              (recordCount + delta),
  +                              theObjects.length);
  +        } else {
  +            this.assertEquals("record count",
  +                              recordCount,
  +                              theObjects.length);
  +        }
  +
  +        // Verify the query size
  +        this.assertEquals("Query size",recordCount,listQuery.fullSize());
  +    }
  +
  +}
  
  
  
  1.8       +3 -3      jakarta-ojb/src/test/org/apache/ojb/broker/ProxyExamples.java
  
  Index: ProxyExamples.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/broker/ProxyExamples.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ProxyExamples.java	24 Dec 2002 14:06:45 -0000	1.7
  +++ ProxyExamples.java	14 Jan 2003 11:16:20 -0000	1.8
  @@ -253,7 +253,7 @@
   		{
   			ProductGroupWithCollectionProxy pg = new ProductGroupWithCollectionProxy();
   			pg.setId(7);
  -			Identity pgOID = new Identity(pg);
  +			Identity pgOID = new Identity(pg, broker);
   
   			pg = (ProductGroupWithCollectionProxy) broker.getObjectByIdentity(pgOID);
   			assertEquals(7, pg.getId());
  @@ -282,7 +282,7 @@
   		{
   			ProductGroupWithCollectionProxy pg = new ProductGroupWithCollectionProxy();
   			pg.setId(5);
  -			Identity pgOID = new Identity(pg);
  +			Identity pgOID = new Identity(pg, broker);
   
   			pg = (ProductGroupWithCollectionProxy) broker.getObjectByIdentity(pgOID);
   			assertEquals(5, pg.getId());
  @@ -370,7 +370,7 @@
   			// Default the JDBC transaction isolationlevel is READ_COMMITTED.
   			// So the program will wait until the inserted articles are committed.
   			Collection articles = pg.getAllArticlesInGroup();
  -			assertTrue(articles.size() == 2);
  +			assertEquals(2, articles.size());
   
   			// Commit
   			broker.commitTransaction();
  
  
  
  1.3       +12 -11    jakarta-ojb/src/test/org/apache/ojb/broker/LogServiceTest.java
  
  Index: LogServiceTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/broker/LogServiceTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogServiceTest.java	22 Jun 2002 17:23:24 -0000	1.2
  +++ LogServiceTest.java	14 Jan 2003 11:16:20 -0000	1.3
  @@ -1,7 +1,7 @@
   package org.apache.ojb.broker;
   
   //JUNIT
  -import junit.framework.*; 
  +import junit.framework.*;
   
   //OJB
   import org.apache.ojb.broker.util.logging.Logger;
  @@ -11,18 +11,18 @@
   
   
   /**
  - * This TestCase contains the OJB performance benchmarks for the 
  + * This TestCase contains the OJB performance benchmarks for the
    * PersistenceBroker API.
    * @author: Thomas Mahler
    */
  -public class LogServiceTest 
  +public class LogServiceTest
       extends TestCase
   {
   
   //     PersistenceBroker broker;
   
       public  LogServiceTest(String name)
  -    
  +
       {
           super(name);
       }
  @@ -35,9 +35,10 @@
           return new TestSuite(LogServiceTest.class);
       }
   
  -    
  +
       public void testLogggers()
       {
  +        String prefix = "testLogggers: ";
           Logger pbroker = LoggerFactory.getLogger(PersistenceBrokerImpl.class);
           Logger rsiterator = LoggerFactory.getLogger(RsIterator.class);
           Logger boot = LoggerFactory.getBootLogger();
  @@ -45,14 +46,14 @@
           pbroker = LoggerFactory.getLogger(PersistenceBrokerImpl.class);
           rsiterator = LoggerFactory.getLogger(RsIterator.class);
   
  -        pbroker.debug("This should NOT be logged BROKER");
  -        pbroker.warn("This should be logged BROKER");
  +        pbroker.debug(prefix + "This should NOT be logged BROKER");
  +        pbroker.warn(prefix + "This should be logged BROKER");
   
  -        rsiterator.debug("This should NOT be logged RSIT");
  -        rsiterator.warn("This should be logged RSIT");
  +        rsiterator.debug(prefix + "This should NOT be logged RSIT");
  +        rsiterator.warn(prefix + "This should be logged RSIT");
   
  -        boot.debug("This should NOT be logged BOOT");
  -        boot.warn("This should be logged BOOT");
  +        boot.debug(prefix + "This should NOT be logged BOOT");
  +        boot.warn(prefix + "This should be logged BOOT");
   
       }
   
  
  
  
  1.7       +4 -1      jakarta-ojb/src/test/org/apache/ojb/broker/GraphTest.java
  
  Index: GraphTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/broker/GraphTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GraphTest.java	12 Jan 2003 16:50:58 -0000	1.6
  +++ GraphTest.java	14 Jan 2003 11:16:20 -0000	1.7
  @@ -35,6 +35,7 @@
   		}
   		catch (PBFactoryException e)
   		{
  +            e.printStackTrace();
   		}
   	}
   
  @@ -47,6 +48,7 @@
   		}
   		catch (PersistenceBrokerException e)
   		{
  +            e.printStackTrace();
   		}
   	}
   
  @@ -80,7 +82,7 @@
   		GraphNode a = new GraphNode("A");
   		GraphNode b = new GraphNode("B");
   		GraphNode c = new GraphNode("C");
  -		Identity oid = new Identity(a);
  +		Identity oid = new Identity(a, broker);
   		new Identity(b, broker);
   		new Identity(c, broker);
   
  @@ -114,6 +116,7 @@
   		broker.store(c);
   
   		broker.clearCache();
  +
   		GraphNode retrieved = (GraphNode) broker.getObjectByIdentity(oid);
   		assertEquals("check graph structure", "A [(A -> A), (A -> B [(B -> C [])]), (A -> C [])]", retrieved.toString());
   	}
  
  
  
  1.4       +9 -9      jakarta-ojb/src/test/org/apache/ojb/broker/AutomaticForeignKeys.java
  
  Index: AutomaticForeignKeys.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/broker/AutomaticForeignKeys.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AutomaticForeignKeys.java	8 Nov 2002 13:55:47 -0000	1.3
  +++ AutomaticForeignKeys.java	14 Jan 2003 11:16:20 -0000	1.4
  @@ -3,7 +3,7 @@
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
   
  -/** 
  +/**
    * This TestClass tests OJB facilities to work with polymorphism.
    */
   public class AutomaticForeignKeys extends TestCase
  @@ -21,7 +21,7 @@
   	 * Creation date: (24.12.2000 00:33:40)
   	 */
   	public AutomaticForeignKeys(String name)
  -	
  +
   	{
   		super(name);
   	}
  @@ -44,7 +44,7 @@
   	 * Creation date: (06.12.2000 21:59:14)
   	 */
   	public void tearDown()
  -	
  +
   	{
   		try
   		{
  @@ -66,8 +66,8 @@
   			ProductGroup pg = new ProductGroup();
   			pg.setName("Software");
   			art.setProductGroup(pg);
  -			Identity artOID = new Identity(art);
  -			Identity pgOID = new Identity(pg);
  +			Identity artOID = new Identity(art, broker);
  +			Identity pgOID = new Identity(pg, broker);
   			broker.beginTransaction();
   			broker.store(art);
   			broker.store(pg);
  @@ -102,10 +102,10 @@
   			pg.add(art1);
   			pg.add(art2);
   			pg.add(art3);
  -			Identity a1OID = new Identity(art1);
  -			Identity a2OID = new Identity(art2);
  -			Identity a3OID = new Identity(art3);
  -			Identity pgOID = new Identity(pg);
  +			Identity a1OID = new Identity(art1, broker);
  +			Identity a2OID = new Identity(art2, broker);
  +			Identity a3OID = new Identity(art3, broker);
  +			Identity pgOID = new Identity(pg, broker);
   			broker.store(pg);
   			broker.clearCache();
   			InterfaceProductGroup readInPG =
  
  
  
  1.14      +7 -4      jakarta-ojb/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java
  
  Index: SequenceManagerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SequenceManagerTest.java	9 Jan 2003 17:20:15 -0000	1.13
  +++ SequenceManagerTest.java	14 Jan 2003 11:16:21 -0000	1.14
  @@ -83,6 +83,8 @@
           if (generatedKeys == null) generatedKeys = new ArrayList();
           if (generatedKeys.size() > 1)
               return;
  +
  +
           else
           {
   
  @@ -500,18 +502,18 @@
                       brokers[i], targetClass, loops);
               new Thread(threadGroup, handle).start();
           }
  -        while (threadGroup.activeCount() > 1)
  +        while (threadGroup.activeCount() > 0)
           {
               try
               {
  -                Thread.sleep(100);
  +                Thread.sleep(300);
                   //System.out.print(".");
               }
               catch (InterruptedException e)
               {
               }
           }
  -        System.out.println("Generate keys: " + (generatedKeys != null ? "" + generatedKeys.size() : "no keys generated"));
  +        System.out.println("Generated keys: " + (generatedKeys != null ? "" + generatedKeys.size() : "no keys generated"));
       }
   
       private void analyseUniqueness(ArrayList results)
  @@ -539,6 +541,7 @@
   
       protected static synchronized void addResultList(List resultList)
       {
  +        System.out.println("add "+ resultList.size() +"generated Keys");
           if (resultList == null) return;
           generatedKeys.addAll(resultList);
       }