db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/test/org/apache/ojb/odmg ObjectImageTest.java CollectionsTest.java OneToManyTest.java ImageHelperTest.java
Date Sat, 04 Dec 2004 14:36:21 GMT
arminw      2004/12/04 06:36:21

  Modified:    src/test/org/apache/ojb/broker Tag: OJB_1_0_RELEASE
                        ArticleProxy.java ProductGroupProxy.java
                        ProxyExamples.java
               src/test/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
                        CollectionsTest.java OneToManyTest.java
  Added:       src/test/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
                        ObjectImageTest.java
  Removed:     src/test/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
                        ImageHelperTest.java
  Log:
  refactor test cases, get rid of primitive Integer id field in Article and ProductGroup
  fix import statements for preprocess
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.5.2.2   +2 -3      db-ojb/src/test/org/apache/ojb/broker/ArticleProxy.java
  
  Index: ArticleProxy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ArticleProxy.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- ArticleProxy.java	4 Dec 2004 14:01:07 -0000	1.5.2.1
  +++ ArticleProxy.java	4 Dec 2004 14:36:21 -0000	1.5.2.2
  @@ -1,14 +1,13 @@
   package org.apache.ojb.broker;
   
  -
  +//#ifdef JDK13
   import java.lang.reflect.InvocationHandler;
  -
  -import org.apache.ojb.broker.core.proxy.VirtualProxy;
   //#else
   /*
   import com.develop.java.lang.reflect.InvocationHandler;
   */
   //#endif
  +import org.apache.ojb.broker.core.proxy.VirtualProxy;
   
   /**
    * Proxy class to class Article. Implements interface InterfaceArticle.
  
  
  
  1.5.2.2   +6 -4      db-ojb/src/test/org/apache/ojb/broker/ProductGroupProxy.java
  
  Index: ProductGroupProxy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ProductGroupProxy.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- ProductGroupProxy.java	4 Dec 2004 14:01:07 -0000	1.5.2.1
  +++ ProductGroupProxy.java	4 Dec 2004 14:36:21 -0000	1.5.2.2
  @@ -1,15 +1,17 @@
   package org.apache.ojb.broker;
   
  -import java.io.Serializable;
  +//#ifdef JDK13
   import java.lang.reflect.InvocationHandler;
  -import java.util.List;
  -
  -import org.apache.ojb.broker.core.proxy.VirtualProxy;
   //#else
   /*
   import com.develop.java.lang.reflect.InvocationHandler;
   */
   //#endif
  +import java.io.Serializable;
  +import java.util.List;
  +
  +import org.apache.ojb.broker.core.proxy.VirtualProxy;
  +
   
   /**
    * Proxy class for ProductGroup.
  
  
  
  1.12.2.2  +6 -5      db-ojb/src/test/org/apache/ojb/broker/ProxyExamples.java
  
  Index: ProxyExamples.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ProxyExamples.java,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- ProxyExamples.java	4 Dec 2004 14:01:07 -0000	1.12.2.1
  +++ ProxyExamples.java	4 Dec 2004 14:36:21 -0000	1.12.2.2
  @@ -1,6 +1,12 @@
   package org.apache.ojb.broker;
   
  +//#ifdef JDK13
   import java.lang.reflect.Proxy;
  +//#else
  +/*
  +import com.develop.java.lang.reflect.Proxy;
  +*/
  +//#endif
   import java.util.Collection;
   import java.util.Iterator;
   import java.util.Vector;
  @@ -9,11 +15,6 @@
   import org.apache.ojb.broker.query.Query;
   import org.apache.ojb.broker.query.QueryFactory;
   import org.apache.ojb.junit.PBTestCase;
  -//#else
  -/*
  -import com.develop.java.lang.reflect.Proxy;
  -*/
  -//#endif
   
   /**
    * Demo Application that shows basic concepts for Applications using the PersistenceBroker
  
  
  
  No                   revision
  No                   revision
  1.13.2.4  +2 -2      db-ojb/src/test/org/apache/ojb/odmg/CollectionsTest.java
  
  Index: CollectionsTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/CollectionsTest.java,v
  retrieving revision 1.13.2.3
  retrieving revision 1.13.2.4
  diff -u -r1.13.2.3 -r1.13.2.4
  --- CollectionsTest.java	4 Dec 2004 14:01:08 -0000	1.13.2.3
  +++ CollectionsTest.java	4 Dec 2004 14:36:21 -0000	1.13.2.4
  @@ -295,7 +295,7 @@
           //*************************************
           tx.lock(fetchedGat, Transaction.WRITE);
           // we want automatic delete of removed collection objects
  -        tx.autoDeleteRemovedCollectionReferences(true);
  +        //tx.autoDeleteRemovedCollectionReferences(true);
           // alternative do explicit call Database#deletePersistent for removed objects
           fetchedGat.getCollectiblesA().remove(0);
           fetchedGat.getCollectiblesB().remove(0);
  
  
  
  1.10.2.2  +1 -1      db-ojb/src/test/org/apache/ojb/odmg/OneToManyTest.java
  
  Index: OneToManyTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/OneToManyTest.java,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- OneToManyTest.java	4 Dec 2004 14:01:08 -0000	1.10.2.1
  +++ OneToManyTest.java	4 Dec 2004 14:36:21 -0000	1.10.2.2
  @@ -94,7 +94,7 @@
           tx.commit();
           Iterator it = results.iterator();
           assertTrue(it.hasNext());
  -        ProductGroup pg = (ProductGroup) it.next();
  +        InterfaceProductGroup pg = (InterfaceProductGroup) it.next();
           assertFalse(it.hasNext());
           assertNotNull(pg.getAllArticles());
           assertEquals(COUNT, pg.getAllArticles().size());
  
  
  
  No                   revision
  
  Index: OneToManyTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/OneToManyTest.java,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- OneToManyTest.java	4 Dec 2004 14:01:08 -0000	1.10.2.1
  +++ OneToManyTest.java	4 Dec 2004 14:36:21 -0000	1.10.2.2
  @@ -94,7 +94,7 @@
           tx.commit();
           Iterator it = results.iterator();
           assertTrue(it.hasNext());
  -        ProductGroup pg = (ProductGroup) it.next();
  +        InterfaceProductGroup pg = (InterfaceProductGroup) it.next();
           assertFalse(it.hasNext());
           assertNotNull(pg.getAllArticles());
           assertEquals(COUNT, pg.getAllArticles().size());
  
  
  
  No                   revision
  
  Index: OneToManyTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/OneToManyTest.java,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- OneToManyTest.java	4 Dec 2004 14:01:08 -0000	1.10.2.1
  +++ OneToManyTest.java	4 Dec 2004 14:36:21 -0000	1.10.2.2
  @@ -94,7 +94,7 @@
           tx.commit();
           Iterator it = results.iterator();
           assertTrue(it.hasNext());
  -        ProductGroup pg = (ProductGroup) it.next();
  +        InterfaceProductGroup pg = (InterfaceProductGroup) it.next();
           assertFalse(it.hasNext());
           assertNotNull(pg.getAllArticles());
           assertEquals(COUNT, pg.getAllArticles().size());
  
  
  
  1.1.2.1   +1480 -0   db-ojb/src/test/org/apache/ojb/odmg/Attic/ObjectImageTest.java
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message