gdamour     2005/06/22 07:27:18

  Modified:    modules/itests/src/itest/org/openejb/test/entity/cmp2
                        Cmp2TestSuite.java
  Added:       modules/itests/src/itest/org/openejb/test/entity/cmp2
                        PrefetchTests.java
  Log:

  GERONIMO-665, checkpoint.
  
  Prefetching works for finders, selects and CMR.
  
  For CMR, it works as expected only if the entity is already defined by the
  transactional cache.
  
  Proper prefetching capabilities for CMR and CMP still need to be implemented.
  
  Revision  Changes    Path
  1.3       +4 -2      
openejb/modules/itests/src/itest/org/openejb/test/entity/cmp2/Cmp2TestSuite.java
  
  Index: Cmp2TestSuite.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/itests/src/itest/org/openejb/test/entity/cmp2/Cmp2TestSuite.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Cmp2TestSuite.java        2 Mar 2005 11:43:19 -0000       1.2
  +++ Cmp2TestSuite.java        22 Jun 2005 11:27:18 -0000      1.3
  @@ -68,7 +68,7 @@
           this.addTest(new Cmp2AllowedOperationsTests());
           this.addTest(new Cmp2JndiEncTests());
           this.addTest(new Cmp2RmiIiopTests());
  -
  +        this.addTest(new PrefetchTests());
       }
   
       public static junit.framework.Test suite() {
  @@ -88,6 +88,7 @@
           /*[2] Create database table */
           TestManager.getDatabase().createEntityTable();
           TestManager.getDatabase().createEntityExplicitePKTable();
  +        TestManager.getDatabase().createCMP2Model();
       }
   
       /**
  @@ -98,5 +99,6 @@
           /*[1] Drop database table */
           TestManager.getDatabase().dropEntityTable();
           TestManager.getDatabase().dropEntityExplicitePKTable();
  +        TestManager.getDatabase().dropCMP2Model();
       }
   }
  
  
  
  1.1                  
openejb/modules/itests/src/itest/org/openejb/test/entity/cmp2/PrefetchTests.java
  
  Index: PrefetchTests.java
  ===================================================================
  /* ====================================================================
   * Redistribution and use of this software and associated documentation
   * ("Software"), with or without modification, are permitted provided
   * that the following conditions are met:
   *
   * 1. Redistributions of source code must retain copyright
   *    statements and notices.  Redistributions must also contain a
   *    copy of this document.
   *
   * 2. Redistributions in binary form must reproduce this list of
   *    conditions and the following disclaimer in the documentation
   *    and/or other materials provided with the distribution.
   *
   * 3. The name "OpenEJB" must not be used to endorse or promote
   *    products derived from this Software without prior written
   *    permission of The OpenEJB Group.  For written permission,
   *    please contact [EMAIL PROTECTED]
   *
   * 4. Products derived from this Software may not be called "OpenEJB"
   *    nor may "OpenEJB" appear in their names without prior written
   *    permission of The OpenEJB Group. OpenEJB is a registered
   *    trademark of The OpenEJB Group.
   *
   * 5. Due credit should be given to the OpenEJB Project
   *    (http://openejb.org/).
   *
   * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
   * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
   * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
   * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
   * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
   * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
   * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the OpenEJB Project.  For more information
   * please see <http://openejb.org/>.
   *
   * ====================================================================
   */
  package org.openejb.test.entity.cmp2;
  
  import java.util.Properties;
  
  import javax.naming.Context;
  import javax.naming.InitialContext;
  
  import org.openejb.test.NamedTestCase;
  import org.openejb.test.TestManager;
  import org.openejb.test.entity.cmp2.prefetch.PrefetchFacadeHome;
  import org.openejb.test.entity.cmp2.prefetch.PrefetchFacadeObject;
  
  
  /**
   * @version $Revision: 1.1 $ $Date: 2005/06/22 11:27:18 $
   */
  public class PrefetchTests extends NamedTestCase {
      private InitialContext initialContext;
      private PrefetchFacadeHome ejbHome;
  
      public PrefetchTests() {
          super("PrefetchTests.");
      }
  
      public void testInvokeOrderLocalHomeFindPrefetchAll() {
          try {
              ejbHome = (PrefetchFacadeHome) 
javax.rmi.PortableRemoteObject.narrow(initialContext.lookup("cmp2/Prefetch/PrefetchFacade"),
 PrefetchFacadeHome.class);
              PrefetchFacadeObject prefetchFacade = ejbHome.create();
              prefetchFacade.invokeOrderLocalHomeFindPrefetchAll();
          } catch (Exception e) {
              fail("Received Exception " + e.getClass() + " : " + 
e.getMessage());
          }
      }
  
      protected void setUp() throws Exception {
          Properties properties = 
TestManager.getServer().getContextEnvironment();
          properties.put(Context.SECURITY_PRINCIPAL, "ENTITY_TEST_CLIENT");
          properties.put(Context.SECURITY_CREDENTIALS, "ENTITY_TEST_CLIENT");
  
          initialContext = new InitialContext(properties);
      }
  
      protected void tearDown() throws Exception {
      }
  }
  
  
  

Reply via email to