[portal-commits] JBoss Portal SVN: r8808 - in branches/JBoss_Portal_Branch_2_6/wsrp: src/main/org/jboss/portal/test/wsrp and 6 other directories.

Wednesday, 31 October 2007

Author: chris.laprun(a)jboss.com
Date: 2007-10-31 18:52:11 -0400 (Wed, 31 Oct 2007)
New Revision: 8808

Modified:
   branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPProducerBaseTest.java
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-markup-sar/META-INF/jboss-service.xml
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-portletmanagement-sar/META-INF/jboss-service.xml
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-registration-sar/META-INF/jboss-service.xml
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
  
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-servicedescription-sar/META-INF/jboss-service.xml
Log:
- Fixed tests to use non-unmarshalled versions of exceptions (this addresses
JBPORTAL-1712).
- Removed need to set ServiceFactory for the tests.
- Make tests use WSDL, this could be used to check our expectations against other
producers.

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================

--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml	2007-10-31 12:29:22 UTC (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml	2007-10-31 22:52:11 UTC (rev 8808)
@@ -382,8 +382,8 @@
    </target>
 
    <target name="deploy" description="Deploy WSRP"
depends="output">
-       <require file="${jboss.deploy.dir}"/>
-      <copy file="./output/lib/portal-wsrp.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>      
+      <require file="${jboss.deploy.dir}"/>
+      <copy file="./output/lib/portal-wsrp.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
    </target>
 
    <target name="undeploy" description="Undeploy WSRP"
depends="init">

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPProducerBaseTest.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPProducerBaseTest.java	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPProducerBaseTest.java	2007-10-31
22:52:11 UTC (rev 8808)
@@ -25,6 +25,7 @@
 
 import org.jboss.portal.wsrp.WSRPProducer;
 import org.jboss.portal.wsrp.services.ServiceFactory;
+import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw
Dawidowicz</a>
@@ -36,8 +37,8 @@
    /** . */
    protected WSRPProducer producer;
 
-   /** . */
-   protected ServiceFactory serviceFactory;
+   private ServiceFactory serviceFactory;
+   private String wsdlURL;
 
    protected WSRPProducerBaseTest(String name) throws Exception
    {
@@ -56,11 +57,29 @@
 
    public ServiceFactory getServiceFactory()
    {
+      if (serviceFactory == null)
+      {
+         serviceFactory = new RemoteSOAPInvokerServiceFactory();
+         try
+         {
+           
((RemoteSOAPInvokerServiceFactory)serviceFactory).setWsdlDefinitionURL(wsdlURL);
+         }
+         catch (Exception e)
+         {
+            throw new RuntimeException("Couldn't retrieve WSDL
definition!", e);
+         }
+      }
+
       return serviceFactory;
    }
 
-   public void setServiceFactory(ServiceFactory serviceFactory)
+   public String getWsdlURL()
    {
-      this.serviceFactory = serviceFactory;
+      return wsdlURL;
    }
+
+   public void setWsdlURL(String wsdlURL)
+   {
+      this.wsdlURL = wsdlURL;
+   }
 }

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.java	2007-10-31
22:52:11 UTC (rev 8808)
@@ -26,6 +26,7 @@
 import org.jboss.portal.common.junit.ExtendedAssert;
 import org.jboss.portal.wsrp.WSRPConstants;
 import org.jboss.portal.wsrp.WSRPTypeFactory;
+import org.jboss.portal.wsrp.WSRPExceptionFactory;
 import org.jboss.portal.wsrp.core.ClonePortlet;
 import org.jboss.portal.wsrp.core.DestroyFailed;
 import org.jboss.portal.wsrp.core.DestroyPortlets;
@@ -46,6 +47,7 @@
 
 import javax.xml.soap.SOAPElement;
 import java.util.Arrays;
+import java.rmi.RemoteException;
 
 /**
  * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
@@ -197,9 +199,15 @@
          response = portletManagementService.setPortletProperties(setPortletProperties);
          ExtendedAssert.fail("Setting properties on Producer-Offered Portlet should
fail...");
       }
-      catch (InconsistentParametersFault expected)
+      catch (RemoteException e)
       {
+         //expected
+         checkException(e, WSRPExceptionFactory.INCONSISTENT_PARAMETERS);
       }
+      // reactivate check for exception once tests go through WS stack see:
JBPORTAL-1712
+      // catch (InconsistentParametersFault expected)
+      {
+      }
    }
 
    private Property[] checkGetPropertiesResponse(PropertyList response, Property[]
expected)

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java	2007-10-31
22:52:11 UTC (rev 8808)
@@ -84,11 +84,18 @@
          registrationService.register(regData);
          ExtendedAssert.fail("Trying to register with an invalid consumer agent
String should fail.");
       }
-      catch (OperationFailedFault operationFailedFault)
+      catch (RemoteException e)
       {
          // expected
+         checkException(e, WSRPExceptionFactory.OPERATION_FAILED);
       }
+      // reactivate check for exception once tests go through WS stack see:
JBPORTAL-1712
+      // catch (OperationFailedFault operationFailedFault)
+      {
+         // expected
+      }
 
+
       regData.setConsumerAgent(WSRPConstants.CONSUMER_AGENT);
       registrationService.register(regData);
    }

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java	2007-10-31
22:52:11 UTC (rev 8808)
@@ -79,15 +79,19 @@
    {
       super.setUp();
 
-      //
-      serviceDescriptionService =
(WSRP_v1_ServiceDescription_PortType)serviceFactory.getService(WSRP_v1_ServiceDescription_PortType.class);
-      markupService =
(WSRP_v1_Markup_PortType)serviceFactory.getService(WSRP_v1_Markup_PortType.class);
-      registrationService =
(WSRP_v1_Registration_PortType)serviceFactory.getService(WSRP_v1_Registration_PortType.class);
-      portletManagementService =
(WSRP_v1_PortletManagement_PortType)serviceFactory.getService(WSRP_v1_PortletManagement_PortType.class);
+      serviceDescriptionService = getService(WSRP_v1_ServiceDescription_PortType.class);
+      markupService = getService(WSRP_v1_Markup_PortType.class);
+      registrationService = getService(WSRP_v1_Registration_PortType.class);
+      portletManagementService = getService(WSRP_v1_PortletManagement_PortType.class);
 
       resetRegistrationInfo();
    }
 
+   private <T> T getService(Class<T> serviceClass) throws Exception
+   {
+      return (T)getServiceFactory().getService(serviceClass);
+   }
+
    public void tearDown() throws Exception
    {
       resetRegistrationInfo();

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-markup-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-markup-sar/META-INF/jboss-service.xml	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-markup-sar/META-INF/jboss-service.xml	2007-10-31
22:52:11 UTC (rev 8808)
@@ -29,10 +29,9 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute
name="WsdlURL">http://localhost:8080/test-wsrp-producer/MarkupService?wsdl</attribute>
       <depends optional-attribute-name="TestDriverRegistry"
               
proxy-type="attribute">portal.test:service=TestDriverServer</depends>
-      <depends optional-attribute-name="ServiceFactory"
-              
proxy-type="attribute">portal.wsrp:service=CachingServiceFactory</depends>
       <depends optional-attribute-name="Producer"
proxy-type="attribute">portal.wsrp:service=WSRPProducer</depends>
    </mbean>
    <mbean
@@ -41,10 +40,9 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute
name="WsdlURL">http://localhost:8080/test-wsrp-producer/MarkupService?wsdl</attribute>
       <depends optional-attribute-name="TestDriverRegistry"
               
proxy-type="attribute">portal.test:service=TestDriverServer</depends>
-      <depends optional-attribute-name="ServiceFactory"
-              
proxy-type="attribute">portal.wsrp:service=CachingServiceFactory</depends>
       <depends optional-attribute-name="Producer"
proxy-type="attribute">portal.wsrp:service=WSRPProducer</depends>
    </mbean>
 </server>

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-portletmanagement-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-portletmanagement-sar/META-INF/jboss-service.xml	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-portletmanagement-sar/META-INF/jboss-service.xml	2007-10-31
22:52:11 UTC (rev 8808)
@@ -29,10 +29,9 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute
name="WsdlURL">http://localhost:8080/test-wsrp-producer/MarkupService?wsdl</attribute>
       <depends optional-attribute-name="TestDriverRegistry"
               
proxy-type="attribute">portal.test:service=TestDriverServer</depends>
-      <depends optional-attribute-name="ServiceFactory"
-              
proxy-type="attribute">portal.wsrp:service=CachingServiceFactory</depends>
       <depends optional-attribute-name="Producer"
proxy-type="attribute">portal.wsrp:service=WSRPProducer</depends>
    </mbean>
 </server>

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-registration-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-registration-sar/META-INF/jboss-service.xml	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-registration-sar/META-INF/jboss-service.xml	2007-10-31
22:52:11 UTC (rev 8808)
@@ -29,10 +29,9 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute
name="WsdlURL">http://localhost:8080/test-wsrp-producer/MarkupService?wsdl</attribute>
       <depends optional-attribute-name="TestDriverRegistry"
               
proxy-type="attribute">portal.test:service=TestDriverServer</depends>
-      <depends optional-attribute-name="ServiceFactory"
-              
proxy-type="attribute">portal.wsrp:service=CachingServiceFactory</depends>
       <depends optional-attribute-name="Producer"
proxy-type="attribute">portal.wsrp:service=WSRPProducer</depends>
    </mbean>
 </server>

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml	2007-10-31
22:52:11 UTC (rev 8808)
@@ -31,9 +31,7 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends
-         optional-attribute-name="Agent"
-         proxy-type="attribute">portal.test:service=Agent</depends>
+      <depends optional-attribute-name="Agent"
proxy-type="attribute">portal.test:service=Agent</depends>
    </mbean>
 
    <!-- Webapp registry -->
@@ -53,14 +51,11 @@
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends
-         optional-attribute-name="Deployer"
-        
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+         optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
       <depends
-         optional-attribute-name="WebAppRegistry"
-        
proxy-type="attribute">portal:service=WebAppRegistry</depends>
+         optional-attribute-name="WebAppRegistry"
proxy-type="attribute">portal:service=WebAppRegistry</depends>
       <depends
-         optional-attribute-name="Config"
-         proxy-type="attribute">portal:service=ServerConfig</depends>
+         optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
    </mbean>
 
    <!-- Portlet container stack -->
@@ -142,11 +137,9 @@
          optional-attribute-name="PortletInvoker"
         
proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
       <depends
-         optional-attribute-name="PersistenceManager"
-        
proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
+         optional-attribute-name="PersistenceManager"
proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends>
       <depends
-         optional-attribute-name="StateManagementPolicy"
-        
proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
+         optional-attribute-name="StateManagementPolicy"
proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends>
       <depends
          optional-attribute-name="StateConverter"
         
proxy-type="attribute">portal:service=StateConverter,type=Producer</depends>
@@ -215,40 +208,4 @@
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
    </mbean>
-
-   <!--  -->
-   <mbean
-     
code="org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory"
-      name="portal.wsrp:service=ServiceFactory"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute
-        
name="ServiceDescriptionURL">http://localhost:8080/test-wsrp-producer/ServiceDescriptionService</attribute>
-      <attribute
name="MarkupURL">http://localhost:8080/test-wsrp-producer/MarkupService</attribute>
-      <attribute
name="RegistrationURL">http://localhost:8080/test-wsrp-producer/RegistrationService</attribute>
-      <attribute
-        
name="PortletManagementURL">http://localhost:8080/test-wsrp-producer/PortletManagementService</attribute>
-      <attribute name="Env">
-         java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-         java.naming.provider.url=jnp://localhost:1099
-         java.naming.factory.url.pkgs=org.jboss.naming.client
-         j2ee.clientName=wsrp-client
-      </attribute>
-      <attribute name="PortJNDIMapping">
-        
org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType=java:comp/env/service/ServiceDescriptionService
-        
org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType=java:comp/env/service/MarkupService
-        
org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType=java:comp/env/service/RegistrationService
-        
org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType=java:comp/env/service/PortletManagementService
-      </attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.wsrp.services.CachingServiceFactory"
-      name="portal.wsrp:service=CachingServiceFactory"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Delegate"
proxy-type="attribute">portal.wsrp:service=ServiceFactory</depends>
-   </mbean>
-
 </server>

Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-servicedescription-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-servicedescription-sar/META-INF/jboss-service.xml	2007-10-31
12:29:22 UTC (rev 8807)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-producer-servicedescription-sar/META-INF/jboss-service.xml	2007-10-31
22:52:11 UTC (rev 8808)
@@ -29,10 +29,9 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
+      <attribute
name="WsdlURL">http://localhost:8080/test-wsrp-producer/MarkupService?wsdl</attribute>
       <depends optional-attribute-name="TestDriverRegistry"
               
proxy-type="attribute">portal.test:service=TestDriverServer</depends>
-      <depends optional-attribute-name="ServiceFactory"
-              
proxy-type="attribute">portal.wsrp:service=CachingServiceFactory</depends>
       <depends optional-attribute-name="Producer"
proxy-type="attribute">portal.wsrp:service=WSRPProducer</depends>
    </mbean>
 </server>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r8808 - in branches/JBoss_Portal_Branch_2_6/wsrp: src/main/org/jboss/portal/test/wsrp and 6 other directories.