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 br...@apache.org on 2003/02/05 21:03:44 UTC

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

brj         2003/02/05 12:03:43

  Modified:    src/test/org/apache/ojb/broker OptimisticLockingTest.java
                        PerformanceTest.java MetaDataSerializationTest.java
                        TransactionDemarcationTest.java MultipleDBTest.java
                        RsIteratorTest.java TreeTest.java
                        ConvertedKeyReferenceTest.java BrokerExamples.java
                        IdentityPerformanceTest.java
                        PersistenceBrokerTest.java PolymorphicExtents.java
                        TypedCollectionsTest.java
                        PerformanceJdbcReferenceTest.java
                        OneToManyTest.java PBAwareTest.java
               src/test/org/apache/ojb/broker/metadata
                        RepositoryPersistorTest.java
                        RuntimeConfigurationTest.java
               src/test/org/apache/ojb/broker/sequence
                        SequenceManagerTest.java
  Log:
  fixed deprecated Identity constructor
  removed unused imports
  
  Revision  Changes    Path
  1.5       +4 -4      db-ojb/src/test/org/apache/ojb/broker/OptimisticLockingTest.java
  
  Index: OptimisticLockingTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/OptimisticLockingTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OptimisticLockingTest.java	20 Sep 2002 17:31:29 -0000	1.4
  +++ OptimisticLockingTest.java	5 Feb 2003 20:03:41 -0000	1.5
  @@ -60,7 +60,7 @@
   		{
   		    LockedByVersion obj = new LockedByVersion();
   		    obj.setValue("original");
  -		    Identity oid = new Identity(obj);		    
  +		    Identity oid = new Identity(obj, broker);		    
   		    broker.store(obj);		    
   		    
   		    broker.clearCache();
  @@ -104,7 +104,7 @@
   		{
   		    LockedByVersion obj = new LockedByVersion();
   		    obj.setValue("original");
  -		    Identity oid = new Identity(obj);
  +		    Identity oid = new Identity(obj, broker);
   		    
   		    broker.store(obj);
   		    
  @@ -130,7 +130,7 @@
   		        
   		        // get a synchronized instance
   		        broker.removeFromCache(conflictingObject);
  -		        Object syncronizedObject = broker.getObjectByIdentity(new Identity(conflictingObject));
  +		        Object syncronizedObject = broker.getObjectByIdentity(new Identity(conflictingObject, broker));
   		        
   		        // modify synchronized copy and call store again without trouble
   		        ((LockedByVersion) syncronizedObject).setValue("copy 3");
  @@ -156,7 +156,7 @@
   		{
   		    LockedByTimestamp obj = new LockedByTimestamp();
   		    obj.setValue("original");
  -		    Identity oid = new Identity(obj);
  +		    Identity oid = new Identity(obj, broker);
   		    
   		    broker.store(obj);
   		    
  
  
  
  1.7       +0 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PerformanceTest.java	21 Dec 2002 16:34:30 -0000	1.6
  +++ PerformanceTest.java	5 Feb 2003 20:03:41 -0000	1.7
  @@ -257,7 +257,6 @@
       {
           try
           {
  -            long start, elapsed;
               for (int i = 0; i < iterations; i++)
               {
                   logger.info("");
  
  
  
  1.7       +1 -1      db-ojb/src/test/org/apache/ojb/broker/MetaDataSerializationTest.java
  
  Index: MetaDataSerializationTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/MetaDataSerializationTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MetaDataSerializationTest.java	1 Feb 2003 15:38:33 -0000	1.6
  +++ MetaDataSerializationTest.java	5 Feb 2003 20:03:41 -0000	1.7
  @@ -163,7 +163,7 @@
                   try
                   {
                       o = c.newInstance();
  -                    Identity oid = new Identity(o);
  +                    Identity oid = new Identity(o, broker);
                       //System.out.println(oid.toString());
                   }
                   catch (InstantiationException e)
  
  
  
  1.5       +0 -1      db-ojb/src/test/org/apache/ojb/broker/TransactionDemarcationTest.java
  
  Index: TransactionDemarcationTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/TransactionDemarcationTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TransactionDemarcationTest.java	24 Dec 2002 14:06:45 -0000	1.4
  +++ TransactionDemarcationTest.java	5 Feb 2003 20:03:41 -0000	1.5
  @@ -1,7 +1,6 @@
   package org.apache.ojb.broker;
   
   import junit.framework.TestCase;
  -import org.apache.ojb.broker.singlevm.PersistenceBrokerConfiguration;
   import org.apache.ojb.broker.query.Criteria;
   import org.apache.ojb.broker.query.Query;
   import org.apache.ojb.broker.query.QueryByCriteria;
  
  
  
  1.7       +0 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MultipleDBTest.java	24 Dec 2002 14:06:45 -0000	1.6
  +++ MultipleDBTest.java	5 Feb 2003 20:03:41 -0000	1.7
  @@ -2,7 +2,6 @@
   
   import junit.framework.Assert;
   import junit.framework.TestCase;
  -import org.apache.ojb.broker.singlevm.PersistenceBrokerConfiguration;
   import org.apache.ojb.broker.util.logging.LoggingHelper;
   import org.apache.ojb.broker.query.QueryByCriteria;
   import org.apache.ojb.broker.query.Criteria;
  
  
  
  1.2       +1 -1      db-ojb/src/test/org/apache/ojb/broker/RsIteratorTest.java
  
  Index: RsIteratorTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/RsIteratorTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RsIteratorTest.java	25 Oct 2002 05:50:10 -0000	1.1
  +++ RsIteratorTest.java	5 Feb 2003 20:03:42 -0000	1.2
  @@ -56,7 +56,7 @@
               // this code runs against Oracle, it fails with a null pointer
               // exception.
           } catch ( Exception e ) {
  -            this.fail(e.toString());
  +            fail(e.toString());
               e.printStackTrace();
               throw e;
           } finally {
  
  
  
  1.6       +4 -4      db-ojb/src/test/org/apache/ojb/broker/TreeTest.java
  
  Index: TreeTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/TreeTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TreeTest.java	24 Dec 2002 14:06:45 -0000	1.5
  +++ TreeTest.java	5 Feb 2003 20:03:42 -0000	1.6
  @@ -139,7 +139,7 @@
   
   			broker.store(root);
   
  -			Identity oid = new Identity(root);
  +			Identity oid = new Identity(root, broker);
   
   			broker.clearCache();
   
  @@ -201,7 +201,7 @@
   			broker.store(green);
   			broker.store(red);
   
  -			Identity oid = new Identity(root);
  +			Identity oid = new Identity(root, broker);
   
   			broker.clearCache();
   
  @@ -213,7 +213,7 @@
   				root.size(),
   				root_r.size());
   
  -			oid = new Identity(green);
  +			oid = new Identity(green, broker);
   			TreeGroup green_r = (TreeGroup) broker.getObjectByIdentity(oid);
   			//System.out.println("tree after reading from db:");
   			//System.out.println(green_r);
  @@ -222,7 +222,7 @@
   				green.size(),
   				green_r.size());
   
  -			oid = new Identity(red);
  +			oid = new Identity(red, broker);
   			TreeGroup red_r = (TreeGroup) broker.getObjectByIdentity(oid);
   			//System.out.println("tree after reading from db:");
   			//System.out.println(red_r);
  
  
  
  1.3       +1 -1      db-ojb/src/test/org/apache/ojb/broker/ConvertedKeyReferenceTest.java
  
  Index: ConvertedKeyReferenceTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ConvertedKeyReferenceTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConvertedKeyReferenceTest.java	12 Oct 2002 09:41:52 -0000	1.2
  +++ ConvertedKeyReferenceTest.java	5 Feb 2003 20:03:42 -0000	1.3
  @@ -83,7 +83,7 @@
   		// store the object
   		broker.store(cref);
   		// save id for recapturing object
  -		Identity id = new Identity(cref);
  +		Identity id = new Identity(cref, broker);
   		cref = (ConversionReferrer) broker.getObjectByIdentity(id);
   		assertEquals("Stored reference ID should match refed object pk", crefed.getPk1(), cref.getRef1());
   
  
  
  
  1.11      +5 -5      db-ojb/src/test/org/apache/ojb/broker/BrokerExamples.java
  
  Index: BrokerExamples.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/BrokerExamples.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- BrokerExamples.java	24 Dec 2002 14:06:45 -0000	1.10
  +++ BrokerExamples.java	5 Feb 2003 20:03:42 -0000	1.11
  @@ -53,7 +53,7 @@
           a.setUnit("bottle");
           ProductGroup tmpPG = new ProductGroup();
           tmpPG.setId(1);
  -        Identity pgID = new Identity(tmpPG);
  +        Identity pgID = new Identity(tmpPG, broker);
           ProductGroupProxy pgProxy = new ProductGroupProxy(broker.getPBKey(), pgID);
           a.setProductGroup(pgProxy);
           return a;
  @@ -166,7 +166,7 @@
           if (!config.isRunningInServerMode())
           {
               Article tmpArticle = createArticle(testId);
  -            Identity tmpOID = new Identity(tmpArticle);
  +            Identity tmpOID = new Identity(tmpArticle, broker);
               broker.store(tmpArticle);
               broker.clearCache();
               Article cached =
  @@ -227,7 +227,7 @@
               {
                   // ensure there is an item to find
                   Article tmpArticle = createArticle(testId);
  -                Identity tmpOID = new Identity(tmpArticle);
  +                Identity tmpOID = new Identity(tmpArticle, broker);
                   broker.store(tmpArticle);
                   broker.clearCache();
   
  @@ -285,7 +285,7 @@
               {
                   // ensure there is an item to find
                   Article tmpArticle = createArticle(testId);
  -                Identity tmpOID = new Identity(tmpArticle);
  +                Identity tmpOID = new Identity(tmpArticle, broker);
                   broker.store(tmpArticle);
                   broker.clearCache();
   
  @@ -346,7 +346,7 @@
               {
                   // ensure there is an item to find
                   Article tmpArticle = createArticle(testId);
  -                Identity tmpOID = new Identity(tmpArticle);
  +                Identity tmpOID = new Identity(tmpArticle, broker);
                   broker.store(tmpArticle);
                   broker.clearCache();
   
  
  
  
  1.4       +4 -3      db-ojb/src/test/org/apache/ojb/broker/IdentityPerformanceTest.java
  
  Index: IdentityPerformanceTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/IdentityPerformanceTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IdentityPerformanceTest.java	24 Dec 2002 14:06:45 -0000	1.3
  +++ IdentityPerformanceTest.java	5 Feb 2003 20:03:42 -0000	1.4
  @@ -36,11 +36,11 @@
           pg.setName("Software");
           art.setProductGroup(pg);
           // prime the pump.
  -        Identity artOID = new Identity(art);
  +        Identity artOID = new Identity(art,broker);
           long start = System.currentTimeMillis();
           for (int i = 0; i < ITERATIONS; i++)
           {
  -            artOID = new Identity(art);
  +            artOID = new Identity(art,broker);
           }
           long stop = System.currentTimeMillis();
           System.out.println("total time to build " + ITERATIONS + " identities " + (stop - start) + " ms.");
  @@ -49,7 +49,8 @@
       public void testMapIterations()
       {
           long start = System.currentTimeMillis();
  -        Map temp = null;
  +        Map temp;
  +
           for (int i = 0; i < ITERATIONS; i++)
           {
               temp = new HashMap();
  
  
  
  1.22      +7 -7      db-ojb/src/test/org/apache/ojb/broker/PersistenceBrokerTest.java
  
  Index: PersistenceBrokerTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PersistenceBrokerTest.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- PersistenceBrokerTest.java	2 Jan 2003 09:39:46 -0000	1.21
  +++ PersistenceBrokerTest.java	5 Feb 2003 20:03:42 -0000	1.22
  @@ -137,7 +137,7 @@
   
           Article a = new Article();
           a.setArticleId(id);
  -        Identity oid = new Identity(a);
  +        Identity oid = new Identity(a, broker);
   
           return (Article) broker.getObjectByIdentity(oid);
   
  @@ -371,12 +371,12 @@
           }
   
           C c1 = new C();
  -        Identity iC1 = new Identity(c1);
  +        Identity iC1 = new Identity(c1, broker);
           C c2 = new C();
  -        Identity iC2 = new Identity(c2);
  +        Identity iC2 = new Identity(c2, broker);
   
           D d1 = new D();
  -        Identity iD1 = new Identity(d1);
  +        Identity iD1 = new Identity(d1, broker);
   
           broker.store(c1);
           broker.store(c2);
  @@ -439,7 +439,7 @@
           broker.store(gte);
           broker.clearCache();
   
  -        GuidTestEntity gte1 = (GuidTestEntity) broker.getObjectByIdentity(new Identity(gte));
  +        GuidTestEntity gte1 = (GuidTestEntity) broker.getObjectByIdentity(new Identity(gte, broker));
   
           assertEquals(gte, gte1);
       }
  @@ -761,9 +761,9 @@
       {
           // create new items for a class with autoincrement PK
           ProductGroup pg1 = new ProductGroup();
  -        Identity id1 = new Identity(pg1);
  +        Identity id1 = new Identity(pg1, broker);
           ProductGroup pg2 = new ProductGroup();
  -        Identity id2 = new Identity(pg2);
  +        Identity id2 = new Identity(pg2, broker);
           pg1.setName("AutoIncGroup1");
           pg2.setName("AutoIncGroup2");
   
  
  
  
  1.11      +4 -4      db-ojb/src/test/org/apache/ojb/broker/PolymorphicExtents.java
  
  Index: PolymorphicExtents.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PolymorphicExtents.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PolymorphicExtents.java	24 Dec 2002 14:06:45 -0000	1.10
  +++ PolymorphicExtents.java	5 Feb 2003 20:03:42 -0000	1.11
  @@ -55,7 +55,7 @@
   		a.setUnit("bottle");
   		ProductGroup tmpPG = new ProductGroup();
   		tmpPG.setId(1);
  -		Identity pgID = new Identity(tmpPG);
  +		Identity pgID = new Identity(tmpPG, broker);
   		ProductGroupProxy pgProxy = new ProductGroupProxy(broker.getPBKey(),pgID);
   		a.setProductGroup(pgProxy);
   		return a;
  @@ -164,7 +164,7 @@
   			Article example = new Article();
   			example.setArticleId(200);
   			// id not present in table ARTICLES but int table CDS
  -			Identity oid = new Identity(example);
  +			Identity oid = new Identity(example, broker);
   
   			InterfaceArticle result = (InterfaceArticle) broker.getObjectByIdentity(oid);
   
  @@ -174,7 +174,7 @@
   			example = new Article();
   			example.setArticleId(100);
   			// id not present in table ARTICLES but int table CDS
  -			oid = new Identity(example);
  +			oid = new Identity(example, broker);
   
   			result = (InterfaceArticle) broker.getObjectByIdentity(oid);
   
  @@ -199,7 +199,7 @@
   			{
   				OrderPosition tmp = new OrderPosition();
   				tmp.setId(i);
  -				Identity oid = new Identity(tmp);
  +				Identity oid = new Identity(tmp, broker);
   				OrderPosition pos = (OrderPosition) broker.getObjectByIdentity(oid);
   				//System.out.println(pos);
   			}
  
  
  
  1.6       +1 -1      db-ojb/src/test/org/apache/ojb/broker/TypedCollectionsTest.java
  
  Index: TypedCollectionsTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/TypedCollectionsTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TypedCollectionsTest.java	3 Oct 2002 15:20:01 -0000	1.5
  +++ TypedCollectionsTest.java	5 Feb 2003 20:03:42 -0000	1.6
  @@ -47,7 +47,7 @@
   		a.setUnit("bottle");
   		ProductGroup tmpPG = new ProductGroup();
   		tmpPG.setId(1);
  -		Identity pgID = new Identity(tmpPG);
  +		Identity pgID = new Identity(tmpPG, broker);
   		ProductGroupProxy pgProxy = new ProductGroupProxy(broker.getPBKey(), pgID);
   		a.setProductGroup(pgProxy);
   		return a;
  
  
  
  1.10      +0 -2      db-ojb/src/test/org/apache/ojb/broker/PerformanceJdbcReferenceTest.java
  
  Index: PerformanceJdbcReferenceTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PerformanceJdbcReferenceTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PerformanceJdbcReferenceTest.java	15 Jan 2003 10:43:30 -0000	1.9
  +++ PerformanceJdbcReferenceTest.java	5 Feb 2003 20:03:42 -0000	1.10
  @@ -3,7 +3,6 @@
   import junit.framework.TestCase;
   import org.apache.ojb.broker.accesslayer.ConnectionFactory;
   import org.apache.ojb.broker.accesslayer.ConnectionFactoryFactory;
  -import org.apache.ojb.broker.accesslayer.sql.SqlGeneratorFactory;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.JdbcConnectionDescriptor;
   import org.apache.ojb.broker.metadata.MetadataManager;
  @@ -436,7 +435,6 @@
       {
           try
           {
  -            long start, elapsed;
               for (int i = 0; i < iterations; i++)
               {
                   logger.info("");
  
  
  
  1.5       +1 -1      db-ojb/src/test/org/apache/ojb/broker/OneToManyTest.java
  
  Index: OneToManyTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/OneToManyTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OneToManyTest.java	14 Aug 2002 13:22:28 -0000	1.4
  +++ OneToManyTest.java	5 Feb 2003 20:03:42 -0000	1.5
  @@ -50,7 +50,7 @@
       public void testPolymorphOneToMany()
       {
           Zoo myZoo = new Zoo("London");
  -        Identity id = new Identity(myZoo);
  +        Identity id = new Identity(myZoo, broker);
           
           Mammal elephant = new Mammal(37,"Jumbo",4);
           Mammal cat = new Mammal(11,"Silvester",4);
  
  
  
  1.6       +1 -1      db-ojb/src/test/org/apache/ojb/broker/PBAwareTest.java
  
  Index: PBAwareTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PBAwareTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PBAwareTest.java	29 Nov 2002 13:54:36 -0000	1.5
  +++ PBAwareTest.java	5 Feb 2003 20:03:42 -0000	1.6
  @@ -110,7 +110,7 @@
           {
   
               PBAwareEntity obj = new PBAwareEntity();
  -            Identity oid = new Identity(obj);
  +            Identity oid = new Identity(obj, broker);
               broker.store(obj);
               assertEquals(false, obj.getCalledAfterLookup());
   
  
  
  
  1.9       +0 -1      db-ojb/src/test/org/apache/ojb/broker/metadata/RepositoryPersistorTest.java
  
  Index: RepositoryPersistorTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/metadata/RepositoryPersistorTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RepositoryPersistorTest.java	31 Jan 2003 17:50:07 -0000	1.8
  +++ RepositoryPersistorTest.java	5 Feb 2003 20:03:43 -0000	1.9
  @@ -4,7 +4,6 @@
   import java.io.FileOutputStream;
   
   import junit.framework.TestCase;
  -import org.apache.ojb.broker.TestHelper;
   
   /**
    * This TestClass tests the RepositoryPersitors facilities for
  
  
  
  1.2       +2 -5      db-ojb/src/test/org/apache/ojb/broker/metadata/RuntimeConfigurationTest.java
  
  Index: RuntimeConfigurationTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/metadata/RuntimeConfigurationTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RuntimeConfigurationTest.java	31 Jan 2003 17:50:07 -0000	1.1
  +++ RuntimeConfigurationTest.java	5 Feb 2003 20:03:43 -0000	1.2
  @@ -2,11 +2,8 @@
   
   import junit.framework.TestCase;
   import org.apache.ojb.broker.A;
  -import org.apache.ojb.broker.PersistenceBrokerFactory;
   import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.query.QueryFactory;
  -import org.apache.ojb.broker.query.Query;
  -import org.apache.ojb.broker.query.Criteria;
  +import org.apache.ojb.broker.PersistenceBrokerFactory;
   
   /**
    * Test used to check if it is possible to start OJB
  
  
  
  1.15      +9 -10     db-ojb/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java
  
  Index: SequenceManagerTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SequenceManagerTest.java	14 Jan 2003 11:16:21 -0000	1.14
  +++ SequenceManagerTest.java	5 Feb 2003 20:03:43 -0000	1.15
  @@ -1,5 +1,10 @@
   package org.apache.ojb.broker.sequence;
   
  +import java.util.ArrayList;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.TreeSet;
  +
   import junit.framework.TestCase;
   import org.apache.ojb.broker.*;
   import org.apache.ojb.broker.metadata.FieldDescriptor;
  @@ -7,20 +12,14 @@
   import org.apache.ojb.broker.query.Criteria;
   import org.apache.ojb.broker.query.Query;
   import org.apache.ojb.broker.query.QueryByCriteria;
  -import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
   import org.apache.ojb.broker.util.sequence.SequenceManager;
   import org.apache.ojb.broker.util.sequence.SequenceManagerException;
   import org.apache.ojb.broker.util.sequence.SequenceManagerFactory;
   import org.apache.ojb.broker.util.sequence.SequenceManagerHelper;
  -import org.apache.ojb.broker.util.sequence.SequenceManagerNextValImpl;
   import org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl;
  +import org.apache.ojb.broker.util.sequence.SequenceManagerNextValImpl;
   import org.apache.ojb.broker.util.sequence.SequenceManagerSeqHiLoImpl;
   
  -import java.util.ArrayList;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.TreeSet;
  -
   /**
    * Tests to verify SequenceManager implementations - All sequence
    * manager implementations have to pass these tests without failures.
  @@ -265,7 +264,7 @@
           field = broker.getClassDescriptor(B1.class).getAutoIncrementField();
           result[4] = SequenceManagerHelper.getMaxForExtent(broker, field);
           broker.close();
  -        boolean bool = false;
  +
           for (int i = 0; i < result.length; i++)
           {
               for (int k = 0; k < result.length; k++)
  @@ -297,7 +296,7 @@
           field = broker.getClassDescriptor(CdArticle.class).getAutoIncrementField();
           result[4] = SequenceManagerHelper.getMaxForExtent(broker, field);
           broker.close();
  -        boolean bool = false;
  +
           for (int i = 0; i < result.length; i++)
           {
               for (int k = 0; k < result.length; k++)