[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/test/core/model/instance ...

[Julien Viet]

  User: julien  
  Date: 06/07/31 15:29:51

  Modified:    core/src/main/org/jboss/portal/test/core/model/instance  
                        InstanceContainerTestCase.java
                        SimpleActionContext.java
  Log:
  - moved the portal api in the api module in order to have a standalone jar
  - JBPORTAL-631 : Try to move org.jboss.portlet package to the api module
  - IPC support in 2.4 (only for local portlets)
  
  Revision  Changes    Path
  1.14      +18 -4     jboss-portal/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InstanceContainerTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- InstanceContainerTestCase.java	30 Jul 2006 15:49:45 -0000	1.13
  +++ InstanceContainerTestCase.java	31 Jul 2006 19:29:51 -0000	1.14
  @@ -22,7 +22,7 @@
   import org.jboss.portal.portlet.state.producer.StatefulPortletInvoker;
   import org.jboss.portal.portlet.state.AbstractPropertyContext;
   import org.jboss.portal.portlet.state.PropertyChange;
  -import org.jboss.portal.portlet.Mode;
  +import org.jboss.portal.Mode;
   import org.jboss.portal.portlet.NoSuchPortletException;
   import org.jboss.portal.portlet.invocation.ActionInvocation;
   import org.jboss.portal.portlet.invocation.PortletInvocation;
  @@ -59,7 +59,7 @@
    *
    * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    * @since Apr 4, 2006
    */
   public class InstanceContainerTestCase extends TestCase
  @@ -475,8 +475,22 @@
   
         //
         TransactionAssert.beginTransaction();
  -      assertNull(statefulPortletInvoker.getPortlet(userPortletRefId));
  -      assertNull(statefulPortletInvoker.getPortlet(instancePortletRefId));
  +      try
  +      {
  +         statefulPortletInvoker.getPortlet(userPortletRefId);
  +         fail("Was expecting a NoSuchPortletException");
  +      }
  +      catch (NoSuchPortletException expected)
  +      {
  +      }
  +      try
  +      {
  +         statefulPortletInvoker.getPortlet(instancePortletRefId);
  +         fail("Was expecting a NoSuchPortletException");
  +      }
  +      catch (NoSuchPortletException expected)
  +      {
  +      }
         TransactionAssert.commitTransaction();
      }
   
  
  
  
  1.2       +1 -1      jboss-portal/core/src/main/org/jboss/portal/test/core/model/instance/SimpleActionContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SimpleActionContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/test/core/model/instance/SimpleActionContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SimpleActionContext.java	30 Jul 2006 12:36:21 -0000	1.1
  +++ SimpleActionContext.java	31 Jul 2006 19:29:51 -0000	1.2
  @@ -22,11 +22,11 @@
   package org.jboss.portal.test.core.model.instance;
   
   import org.jboss.portal.portlet.support.spi.ActionContextSupport;
  -import org.jboss.portal.portlet.Mode;
  +import org.jboss.portal.Mode;
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class SimpleActionContext extends ActionContextSupport
   {